Merge branch 'master' of http://159.75.201.17:3000/zwq/tuanfeng-pc-admin

src/api/commissionAllocation/gradeCommission.js

@@ -39,7 +39,7 @@ export function deleteIdPlatformBeeRule(data) {
 // 修改活动比例
 export function priceControlUpdatePlan(data) {
   return request({
-    url: '/platformBeeRule/save',
+    url: '/platformBeeRule/update',
     method: 'put',
     data
   })

src/views/commissionAllocation/gradeCommission/components/DetailModal.vue

@@ -11,7 +11,7 @@
       label-suffix=":"
       label-width="200px"
     >
-      <!-- 平台交易金活动分佣规则信息 -->
+      <!-- 平台消费金活动分佣规则信息 -->
       <el-form-item label="规则ID" prop="ruleId">
         {{ formData.ruleId || '--' }}
       </el-form-item>
@@ -25,7 +25,7 @@
         <span v-if="formData.activityType === 1">499</span>
         <span v-else-if="formData.activityType === 2">商圈</span>
         <span v-else-if="formData.activityType === 3">爆品</span>
-        <span v-else-if="formData.activityType === 4">交易金</span>
+        <span v-else-if="formData.activityType === 4">消费金</span>
         <span v-else>--</span>
       </el-form-item>
       <el-form-item label="团长规则" prop="leadersRule">
@@ -48,7 +48,7 @@
       <el-form-item label="分佣来源" prop="sourceType">
         <span v-if="formData.sourceType === 1">订单金额</span>
         <span v-else-if="formData.sourceType === 2">赠送代金券</span>
-        <span v-else-if="formData.sourceType === 3">交易金</span>
+        <span v-else-if="formData.sourceType === 3">消费金</span>
         <span v-else>--</span>
       </el-form-item>
       <el-form-item label="创建时间" prop="createTime">
@@ -71,7 +71,7 @@ export default {
       modalOptions: {
         closeOnClickModal: false,
         width: '800px',
-        title: '查看平台交易金活动分佣规则详情'
+        title: '查看平台消费金活动分佣规则详情'
       },
       visible: false,
       formData: {

src/views/commissionAllocation/gradeCommission/components/EditModal.vue

@@ -17,7 +17,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-form-item>
       <el-form-item label="团长规则" prop="leadersRule">
@@ -68,7 +68,7 @@
         <el-select v-model="formData.sourceType" size="mini" placeholder="请选择分佣来源">
           <el-option label="订单金额" :value="1" />
           <el-option label="赠送代金券" :value="2" />
-          <el-option label="交易金" :value="3" />
+          <el-option label="消费金" :value="3" />
         </el-select>
       </el-form-item>
     </el-form>
@@ -153,7 +153,20 @@ export default {
       this.activityList = res.data
     },
     handleOpen(params = {}) {
-      this.modalOptions.title = params.ruleId ? '编辑平台交易金活动分佣规则' : '添加平台交易金活动分佣规则'
+      this.modalOptions.title = params.ruleId ? '编辑平台消费金活动分佣规则' : '添加平台消费金活动分佣规则'
+      this.formData = Object.assign(this.$options.data().formData, params, {
+        ruleId: params.ruleId || '',
+        activityId: params.activityId || '',
+        activityName: params.activityName || '',
+        activityType: params.activityType || '',
+        leadersRule: params.leadersRule || '',
+        leadersMoney: (params.leadersRule === 1) && (typeof params.leadersMoney === 'number') ? params.leadersMoney * 100 : params.leadersMoney,
+        leadersInMoney: (params.leadersRule === 1) && (typeof params.leadersInMoney === 'number') ? params.leadersInMoney * 100 : params.leadersInMoney,
+        partnerRule: params.partnerRule || '',
+        partnerMoney: (params.partnerRule === 1) && (typeof params.partnerMoney === 'number') ? params.partnerMoney * 100 : params.partnerMoney,
+        partnerInMoney: (params.partnerRule === 1) && (typeof params.partnerInMoney === 'number') ? params.partnerInMoney * 100 : params.partnerInMoney,
+        sourceType: params.sourceType || ''
+      })
       this.visible = true
       this.initList()
       if (params.ruleId) {

src/views/finance/flowingWater/index.vue

@@ -54,7 +54,7 @@
 							<span v-else-if="scope.row.paymentMode === 5">平台余额支付</span>
 							<span v-else-if="scope.row.paymentMode === 6">商家余额支付</span>
 							<span v-else-if="scope.row.paymentMode === 7">佣金支付</span>
-							<span v-else-if="scope.row.paymentMode === 8">交易金支付</span>
+							<span v-else-if="scope.row.paymentMode === 8">消费金支付</span>
 							<span v-else-if="scope.row.paymentMode === 9">惠市宝支付</span>
 							<span v-else>--</span>
             </template>

src/views/finance/withdrawal/components/RelatedOrders.vue

@@ -35,7 +35,7 @@
             <span v-else-if="row.paymentMode === 5">平台余额支付</span>
             <span v-else-if="row.paymentMode === 6">商家余额支付</span>
             <span v-else-if="row.paymentMode === 7">佣金支付</span>
-            <span v-else-if="row.paymentMode === 8">交易金支付</span>
+            <span v-else-if="row.paymentMode === 8">消费金支付</span>
             <span v-else-if="row.paymentMode === 9">惠市宝支付</span>
             <span v-else>--</span>
           </template>

src/views/order/pending/pendDetails.vue

@@ -53,7 +53,7 @@
                 <span v-else-if="order.paymentMode === 5">平台余额支付</span>
                 <span v-else-if="order.paymentMode === 6">商家余额支付</span>
                 <span v-else-if="order.paymentMode === 7">佣金支付</span>
-                <span v-else-if="order.paymentMode === 8">交易金支付</span>
+                <span v-else-if="order.paymentMode === 8">消费金支付</span>
                 <span v-else-if="order.paymentMode === 9">惠市宝支付</span>
                 <span v-else>--</span>
               </p>

vue.config.js

@@ -31,6 +31,7 @@ module.exports = {
   // lintOnSave: process.env.NODE_ENV === 'development',
   lintOnSave: false,
   productionSourceMap: false,
+  parallel: false,
   devServer: {
     port,
     open: false,