最新代码

src/views/business/businessList/index.vue

@@ -38,14 +38,14 @@
             <template slot-scope="scope">{{ scope.row.shopName }}</template>
           </el-table-column>
           <el-table-column prop="shopCode" label="店铺编码" />
-          <el-table-column label="是否支持交易金">
+          <el-table-column label="是否支持消费金">
             <template slot-scope="scope">
               <span v-if="scope.row.isBeeCoin === 1">支持</span>
               <span v-else-if="scope.row.isBeeCoin === 2">不支持</span>
               <span v-else>--</span>
             </template>
           </el-table-column>
-					<!-- <el-table-column align="center" min-width="120" label="商家交易金提现比例" prop="beecoinRatio">
+					<!-- <el-table-column align="center" min-width="120" label="商家消费金提现比例" prop="beecoinRatio">
 						<template slot-scope="{ row }">
 							<span v-if="row.beeCoinRatio">{{ row.beeCoinRatio }}：1</span>
 							<span v-else>--</span>
@@ -103,7 +103,7 @@
                 <el-form-item label="店铺名称" prop="shopName">
                   <el-input v-model="ruleForm.shopName" maxlength="20" :disabled="disabled" />
                 </el-form-item>
-                <el-form-item label="是否支持交易金" prop="isBeeCoin">
+                <el-form-item label="是否支持消费金" prop="isBeeCoin">
                   <el-radio-group v-model="ruleForm.isBeeCoin">
                     <el-radio :disabled="disabled" :label="1">
                       支持
@@ -113,14 +113,14 @@
                     </el-radio>
                   </el-radio-group>
                 </el-form-item>
-                <el-form-item label="商家交易金提现比例" prop="beeCoinRatio">
-                  <!-- <el-input v-model="ruleForm.beeCoinRatio" type="text" :disabled="disabled" placeholder="商家交易金提现比例"
+                <el-form-item label="商家消费金提现比例" prop="beeCoinRatio">
+                  <!-- <el-input v-model="ruleForm.beeCoinRatio" type="text" :disabled="disabled" placeholder="商家消费金提现比例"
                     style="width: 50%" /> -->
                     <el-input-number v-model="ruleForm.beeCoinRatio" :precision="2" :step="0.01" :max="1"></el-input-number>
                   <span style="margin-left: 10px;">比例*100</span>
                   </el-form-item>
-                <el-form-item v-if="ruleForm.isBeeCoin === 1" label="商家交易金提现比例" prop="beeCoinRatio">
-                  <el-input v-model="ruleForm.beeCoinRatio" type="text" :disabled="disabled" placeholder="商家交易金提现比例"
+                <el-form-item v-if="ruleForm.isBeeCoin === 1" label="商家消费金提现比例" prop="beeCoinRatio">
+                  <el-input v-model="ruleForm.beeCoinRatio" type="text" :disabled="disabled" placeholder="商家消费金提现比例"
                     style="width: 50%" />
                   <span style="margin-left: 10px;">：1</span>
                 </el-form-item>
@@ -374,8 +374,8 @@ export default {
       disabled: false,
       ruleForm: {
         shopName: '', // 店铺名称
-        isBeeCoin: '', // 是否支持交易金
-        beeCoinRatio: '', // 商家交易金提现比例
+        isBeeCoin: '', // 是否支持消费金
+        beeCoinRatio: '', // 商家消费金提现比例
         chargePersonName: '', // 店铺负责人
         chargePersonPhone: '', // 负责人电话
         shopType: 2, // 店铺类型 1商城 2本地
@@ -407,7 +407,7 @@ export default {
 
       rulesInfo: {
         beeCoinRatio: [
-          { required: true, message: '请输入商家交易金提现比例', trigger: 'blur' },
+          { required: true, message: '请输入商家消费金提现比例', trigger: 'blur' },
           
         ],
         effectiveYear: [
@@ -420,10 +420,10 @@ export default {
           { required: true, message: '请输入店铺负责人', trigger: 'blur' }
         ],
         isBeeCoin: [
-          { required: true, message: '请选择是否支持交易金', trigger: 'blur' }
+          { required: true, message: '请选择是否支持消费金', trigger: 'blur' }
         ],
-        isBeeCoin: [ { required: true, message: '请选择是否支持交易金', trigger: 'change' } ],
-        // beeCoinRatio: [ { required: true, message: '请输入商家交易金提现比例', trigger: 'blur' }],
+        isBeeCoin: [ { required: true, message: '请选择是否支持消费金', trigger: 'change' } ],
+        // beeCoinRatio: [ { required: true, message: '请输入商家消费金提现比例', trigger: 'blur' }],
         effectiveYear: [ { required: true, message: '请输入生效时限', trigger: 'blur' } ],
         shopName: [ { required: true, message: '请输入店铺名称', trigger: 'blur' } ],
         chargePersonName: [ { required: true, message: '请输入店铺负责人', trigger: 'blur' } ],
@@ -522,8 +522,8 @@ export default {
       this.personPhone = ''
       this.ruleForm = {
         shopName: '', // 店铺名称
-        isBeeCoin: '', // 是否支持交易金
-        beeCoinRatio: '', // 商家交易金提现比例
+        isBeeCoin: '', // 是否支持消费金
+        beeCoinRatio: '', // 商家消费金提现比例
         chargePersonName: '', // 店铺负责人
         chargePersonPhone: '', // 负责人电话
         shopAdress: '', // 地址
@@ -585,11 +585,11 @@ export default {
           }
           if (!(typeof submitData.isBeeCoin === 'number')) {
 						console.log(submitData)
-            this.$message.error('请选择是否支持交易金')
+            this.$message.error('请选择是否支持消费金')
             return
           }
           if ((submitData.isBeeCoin === 1) && !submitData.beeCoinRatio) {
-            this.$message.error('请输入商家交易金提现比例')
+            this.$message.error('请输入商家消费金提现比例')
             return
           }
           if (submitData.effectiveYear === '') {

src/views/commissionAllocation/gradeCommission/index.vue

@@ -9,7 +9,7 @@
         <el-option label="499" :value="1" />
         <el-option label="商圈" :value="2" />
         <el-option label="爆品" :value="3" />
-        <el-option label="交易金" :value="4" />
+        <el-option label="消费金" :value="4" />
       </el-select>
       <el-button
         size="mini" class="filter-item" type="primary" icon="el-icon-search"
@@ -41,7 +41,7 @@
             <el-tag v-if="row.activityType === 1" effect="plain">499</el-tag>
             <el-tag v-else-if="row.activityType === 2" effect="plain">商圈</el-tag>
             <el-tag v-else-if="row.activityType === 3" effect="plain">爆品</el-tag>
-            <el-tag v-else-if="row.activityType === 4" effect="plain">交易金</el-tag>
+            <el-tag v-else-if="row.activityType === 4" effect="plain">消费金</el-tag>
             <span v-else>--</span>
           </template>
         </el-table-column>
@@ -67,7 +67,7 @@
           <template slot-scope="{ row }">
             <el-tag v-if="row.sourceType === 1">订单金额</el-tag>
             <el-tag v-else-if="row.sourceType === 2">赠送代金券</el-tag>
-            <el-tag v-else-if="row.sourceType === 3">交易金</el-tag>
+            <el-tag v-else-if="row.sourceType === 3">消费金</el-tag>
             <span v-else>--</span>
           </template>
         </el-table-column>