1231233

src/views/cai/account/add-account-dialog.vue

@@ -1,12 +1,18 @@
 <template>
   <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
-    <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-form-item label="调整账户" prop="rechargeType">
         <el-radio-group v-model="form.rechargeType">
           <el-radio :label="1">余额调整</el-radio>
           <el-radio :label="2">收益调整</el-radio>
         </el-radio-group>
       </el-form-item>
+      <el-form-item label="是否执行分销" prop="distribution">
+        <el-radio-group v-model="form.distribution">
+          <el-radio :label="false">不执行</el-radio>
+          <el-radio :label="true">执行</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item label="调整金额" prop="rechargeCoin">
         <el-input v-model="form.rechargeCoin" placeholder="请输入" />
       </el-form-item>
@@ -58,12 +64,16 @@ export default {
         usercode: undefined,
         rechargeType: undefined,
         rechargeCoin: undefined,
-        remark: undefined
+        remark: undefined,
+        distribution: false
       },
       info:{
       },
       // 表单校验
       rules: {
+        distribution: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
         usercode: [
           { required: true, message: "数据不能为空", trigger: "blur" }
         ],

src/views/cai/goods/goods-add-or-update-dialog.vue

@@ -1,14 +1,17 @@
 <template>
   <el-dialog :title="title" :close-on-click-modal="false" :visible.sync="open" width="700px" append-to-body>
-    <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+    <el-form ref="form" :model="form" :rules="rules" label-width="120px">
       <el-form-item label="名称" prop="name">
         <el-input v-model="form.name" placeholder="请输入标题" />
       </el-form-item>
       <el-form-item label="充值金额" prop="price">
         <el-input v-model="form.price" placeholder="请输入充值金额" />
       </el-form-item>
-      <el-form-item label="云贝数量" prop="amount">
-        <el-input v-model="form.amount" placeholder="请输入云贝数量" />
+      <el-form-item label="支付宝云贝数量" prop="amount">
+        <el-input v-model="form.amount" placeholder="请输入支付宝云贝数量" />
+      </el-form-item>
+      <el-form-item label="微信云贝数量" prop="wxAmount">
+        <el-input v-model="form.wxAmount" placeholder="请输入微信云贝数量" />
       </el-form-item>
       <el-form-item label="说明" prop="remark">
         <el-input v-model="form.remark" placeholder="请输入说明" type="textarea" :rows="2"/>
@@ -38,6 +41,7 @@ export default {
         name: undefined,
         price: undefined,
         amount: undefined,
+        wxAmount: undefined,
         remark: undefined,
       },
       // 表单校验
@@ -45,6 +49,9 @@ export default {
         amount: [
           { required: true, message: "数据不能为空", trigger: "blur" }
         ],
+        wxAmount: [
+          { required: true, message: "数据不能为空", trigger: "blur" }
+        ],
         price: [
           { required: true, message: "数据不能为空", trigger: "blur" }
         ],

src/views/cai/goods/index.vue

@@ -33,7 +33,13 @@
       <el-table-column label="ID" align="center" prop="id"/>
       <el-table-column label="名称" align="center" prop="name" />
       <el-table-column label="充值金额" align="center" prop="price" />
-      <el-table-column label="云贝数量" align="center" prop="amount" />
+      <el-table-column label="支付宝云贝数量" align="center" prop="amount" />
+      <el-table-column label="微信云贝数量" align="center" prop="wxAmount" />
+      <el-table-column label="支付宝多的数量" align="center" prop="diff" >
+        <template v-slot="scope">
+          {{scope.row.amount - scope.row.wxAmount}}
+        </template>
+      </el-table-column>
       <el-table-column label="状态" align="center" prop="status" >
         <template v-slot="scope">
           <el-switch

src/views/cai/rechargeOrder/index.vue

@@ -109,12 +109,13 @@
         </template>
       </el-table-column>
       <el-table-column label="链路号" align="center" prop="traceId" show-overflow-tooltip/>
+      <el-table-column label="备注" align="center" prop="remark" show-overflow-tooltip/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="270">
         <template v-slot="scope">
           <el-button
               size="mini"
               type="text"
-              v-if="scope.row.traceId && scope.row.admin===false"
+              v-if="(scope.row.traceId && scope.row.admin===false) || (scope.row.distribution && scope.row.admin===true)"
               @click="handleConsumerLog(scope.row)"
           >分销记录
           </el-button>