init

src/views/cai/account/account-change-info.vue

@@ -34,7 +34,6 @@
     </el-row>
 
     <el-table v-loading="loading" :data="accountChangeLogList" >
-      <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="蜜瓜号" align="center" prop="usercode" />
       <el-table-column label="账户类型" align="center" prop="accountType" >
         <template v-slot="scope">
@@ -43,13 +42,19 @@
       </el-table-column>
       <el-table-column label="业务操作" align="center" prop="cateAdminName" />
       <el-table-column label="变动" align="center" prop="changeValue" />
-      <el-table-column label="说明" align="center" prop="remark" />
+      <el-table-column label="说明" align="center" prop="remark" min-width="200">
+        <template v-slot="scope">
+          <div class="context-avatar-center">
+            <span>{{scope.row.showMessage}}</span><image-preview v-if="scope.row.tarImg" :src="scope.row.tarImg" :width="32" :height="32"/>
+          </div>
+        </template>
+      </el-table-column>
       <el-table-column label="后台操作" align="center" prop="isAdmin" >
         <template v-slot="scope">
           <cai-dict-tag :options="yesOrNoList" :value="scope.row.isAdmin"/>
         </template>
       </el-table-column>
-      <el-table-column label="操作时间" align="center" prop="createTime" />
+      <el-table-column label="操作时间" align="center" prop="createTime" min-width="120" />
 <!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template v-slot="scope">
         </template>
@@ -137,3 +142,10 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+.context-avatar-center {
+  display: flex;
+  align-items: center; /* 垂直居中 */
+  justify-content: center; /* 水平居中 */
+}
+</style>

src/views/cai/anchor/index.vue

@@ -79,7 +79,7 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="是否被推荐" align="center" prop="recommendStatus" >
+      <el-table-column label="推荐" align="center" prop="recommendStatus" >
         <template v-slot="scope">
           <el-switch
               v-model="scope.row.recommendStatus"
@@ -241,7 +241,7 @@ export default {
       }).then(() => {
         this.$modal.msgSuccess(text + '成功')
       }).catch(function() {
-        row.openVideoStatus = row.openVideoStatus === 1 ? 1 : 0
+        row.openVideoStatus = row.openVideoStatus === 1 ? 0 : 1
       })
     },
     handleIndexDisplayChange(row){
@@ -255,7 +255,7 @@ export default {
       }).then(() => {
         this.$modal.msgSuccess(text + '成功')
       }).catch(function() {
-        row.indexDisplay = row.indexDisplay === 1 ? 1 : 0
+        row.indexDisplay = row.indexDisplay === 1 ? 0 : 1
       })
     },
     handleRecommendStatusChange(row){
@@ -269,7 +269,7 @@ export default {
       }).then(() => {
         this.$modal.msgSuccess(text + '成功')
       }).catch(function() {
-        row.recommendStatus = row.recommendStatus === 1 ? 1 : 0
+        row.recommendStatus = row.recommendStatus === 1 ? 0 : 1
       })
     },
     handleDelete(row) {

src/views/cai/consumeLog/index.vue

@@ -9,7 +9,7 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="接收方蜜瓜号" prop="targetUsercode">
+      <el-form-item label="主播蜜瓜号" prop="targetUsercode">
         <el-input
             v-model="queryParams.targetUsercode"
             placeholder="请输入蜜瓜号"
@@ -17,7 +17,7 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="邀请人蜜瓜号" prop="oneUsercode">
+      <el-form-item label="邀请方蜜瓜号" prop="oneUsercode">
         <el-input
             v-model="queryParams.oneUsercode"
             placeholder="请输入蜜瓜号"
@@ -33,6 +33,17 @@
             @keyup.enter.native="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="分销" prop="status">
+        <el-select v-model="queryParams.status" clearable size="small">
+          <el-option
+              v-for="dict in consumeLogStatusList"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+              @keyup.enter.native="handleQuery"
+          />
+        </el-select>
+      </el-form-item>
       <el-form-item label="链路号" prop="traceId">
         <el-input
             v-model="queryParams.traceId"
@@ -47,10 +58,6 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
     <el-table v-loading="loading" :data="consumeLogList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="类型" align="center" prop="type" width="50">
@@ -70,50 +77,62 @@
         </template>
       </el-table-column>
       <el-table-column label="发生金额" align="center" prop="amount" width="80" />
-      <el-table-column label="主播" align="center" prop="anchor" width="200" >
+      <el-table-column label="主播" align="center" prop="anchor" min-width="200" >
         <template v-slot="scope">
-          <span style="font-weight: bold">蜜瓜号:</span><span>{{scope.row.targetUsercode}}</span> <br>
+          <div v-if="scope.row.targetUsercode">
-          <span style="font-weight: bold">手机号:</span><span>{{scope.row.targetPhone}}</span><br>
+            <span style="font-weight: bold">主播:</span><span>{{scope.row.targetUsercode}}({{scope.row.targetPhone}})</span><br>
+            <span style="font-weight: bold">费率/金额:</span>
+            <span>
+              <span class="font-green">{{scope.row.targetRate}}</span>
+              /
+              <span class="font-red">{{scope.row.anchorAmount}}</span>
+            </span>
+            <br>
+          </div>
+          <span v-if="!scope.row.targetUsercode">-</span>
         </template>
       </el-table-column>
-      <el-table-column label="主播收益" align="center" prop="anchorIncome"width="120"  >
+      <el-table-column label="邀请方" align="center" prop="invite" min-width="200" >
         <template v-slot="scope">
-          <span style="font-weight: bold">费率:</span><span>{{scope.row.targetRate}}</span> <br>
+          <div v-if="scope.row.oneUsercode">
-          <span style="font-weight: bold">金额:</span><span>{{scope.row.anchorAmount}}</span><br>
+            <span style="font-weight: bold">邀请人:</span><span>{{scope.row.oneUsercode}}({{scope.row.onePhone}})</span> <br>
+            <span style="font-weight: bold">分销:</span><span :class="joinColor(scope.row.oneJoin)">{{scope.row.oneJoin ? '参与' : '不参与'}}</span><br>
+            <span style="font-weight: bold">费率/金额:</span>
+              <span>
+                <span class="font-green">{{scope.row.oneRate}}</span>
+              /
+              <span class="font-red">{{scope.row.oneAmount}}</span>
+              </span> <br>
+          </div>
+          <span v-if="!scope.row.oneUsercode">-</span>
         </template>
       </el-table-column>
-      <el-table-column label="邀请人" align="center" prop="one" width="200" >
+      <el-table-column label="工会" align="center" prop="union" min-width="200" >
         <template v-slot="scope">
-          <span style="font-weight: bold">蜜瓜号:</span><span>{{scope.row.oneUsercode}}</span> <br>
+          <div v-if="scope.row.unionUsercode">
-          <span style="font-weight: bold">手机号:</span><span>{{scope.row.onePhone}}</span><br>
+            <span style="font-weight: bold">会长:</span><span>{{scope.row.unionUsercode}}({{scope.row.unionPhone}})</span> <br>
+            <span style="font-weight: bold">分销:</span><span :class="joinColor(scope.row.oneJoin)">{{scope.row.unionJoin ? '参与' : '不参与'}}</span><br>
+            <span style="font-weight: bold">费率/金额:</span>
+            <span>
+              <span class="font-green">{{scope.row.unionRate}}</span>
+              /
+              <span class="font-red">{{scope.row.unionAmount}}</span>
+            </span> <br>
+          </div>
+          <span v-if="!scope.row.unionUsercode">-</span>
         </template>
       </el-table-column>
-      <el-table-column label="邀请人收益" align="center" prop="amount" width="200" >
+      <el-table-column label="是否计算" align="center" prop="calculateStatus">
-        <template v-slot="scope">
-          <span style="font-weight: bold">分销:</span><span>{{scope.row.oneJoin ? '参与' : '不参与'}}</span><br>
-          <span style="font-weight: bold">费率:</span><span>{{scope.row.oneRate}}</span> <br>
-          <span style="font-weight: bold">金额:</span><span>{{scope.row.oneAmount}}</span><br>
-        </template>
-      </el-table-column>
-      <el-table-column label="工会" align="center" prop="union" width="200" >
-        <template v-slot="scope">
-          <span style="font-weight: bold">蜜瓜号:</span><span>{{scope.row.unionUsercode}}</span> <br>
-          <span style="font-weight: bold">手机号:</span><span>{{scope.row.unionPhone}}</span><br>
-        </template>
-      </el-table-column>
-      <el-table-column label="工会收益" align="center" prop="amount" width="200" >
-        <template v-slot="scope">
-          <span style="font-weight: bold">分销:</span><span>{{scope.row.unionJoin ? '参与' : '不参与'}}</span><br>
-          <span style="font-weight: bold">费率:</span><span>{{scope.row.unionRate}}</span> <br>
-          <span style="font-weight: bold">金额:</span><span>{{scope.row.unionAmount}}</span><br>
-        </template>
-      </el-table-column>
-      <el-table-column label="是否计算" align="center" prop="calculateStatus" width="80">
         <template v-slot="scope">
           <cai-dict-tag :options="consumeLogCalculateStatusList" :value="scope.row.calculateStatus"/>
         </template>
       </el-table-column>
-      <el-table-column label="分销时间" align="center" prop="opCreate" width="180" />
+      <el-table-column label="创建/分销时间" align="center" prop="opCreate" width="180" >
+        <template v-slot="scope">
+          <span>{{scope.row.createTime}}</span><br/>
+          <span>{{scope.row.opCreate}}</span>
+        </template>
+      </el-table-column>
       <el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="80" fixed="right">
         <template v-slot="scope">
@@ -180,7 +199,8 @@ export default {
         oneUsercode: undefined,
         targetUsercode: undefined,
         sourceUsercode: undefined,
-        traceId: undefined
+        traceId: undefined,
+        status: undefined
       },
     };
   },
@@ -188,6 +208,9 @@ export default {
     this.getList();
   },
   methods: {
+    joinColor(join){
+      return join ? 'font-blue' : 'font-red'
+    },
     /** 查询分销记录列表 */
     getList() {
       this.loading = true;
@@ -235,3 +258,14 @@ export default {
   }
 };
 </script>
+<style lang="scss" scoped>
+.font-red {
+  color: red;
+}
+.font-green {
+  color: green;
+}
+.font-blue {
+  color: blue;
+}
+</style>

src/views/cai/userAlbum/index.vue

@@ -70,7 +70,7 @@
       </el-table-column>
       <el-table-column label="相册" align="center" prop="url">
         <template v-slot="scope">
-          <image-preview :src="scope.row.url" width="40px" height="40px"/>
+          <image-preview :src="scope.row.url" width="30px" height="30px"/>
         </template>
       </el-table-column>
       <el-table-column label="新增时间" align="center" prop="createTime" />

src/views/cai/userCameraAudit/index.vue

@@ -68,12 +68,12 @@
       </el-table-column>
       <el-table-column label="动作" align="center" prop="actionImage">
         <template v-slot="scope">
-          <image-preview :src="scope.row.actionImage" width="40px" height="40px"/>
+          <image-preview :src="scope.row.actionImage" width="33px" height="33px"/>
         </template>
       </el-table-column>
       <el-table-column label="审核照片" align="center" prop="photo" >
         <template v-slot="scope">
-          <image-preview :src="scope.row.photo" width="40px" height="40px"/>
+          <image-preview :src="scope.row.photo" width="33px" height="33px"/>
         </template>
       </el-table-column>
       <el-table-column label="审核次数" align="center" prop="auditCount" />