Merge branch 'master' of http://115.159.76.241/marketing-web/marketing into master

# Conflicts:
#	src/views/ecm/form.js

src/service/api/ecmApi.js

@@ -16,6 +16,9 @@ export const listEcmScanLogPage = params => requests(PREFIX + 'list-ecm-scan-log
 //智能营销--ECM营销引擎-- 删除
 export const deleteEcm = params => requests(PREFIX + 'delete-ecm', params);
 
+//智能营销--ECM营销引擎-- 支付方式查询
+export const gicPaymentList = params => requests(PREFIX + 'query-gic-payment-list', params);
+
 //智能营销--ECM营销引擎-- 新建/修改 回显智能引擎计划信息
 export const getEcmInfo = params => requests(PREFIX + 'get-ecm-info', params);
 

src/views/card/form.vue

@@ -14,7 +14,7 @@
         </el-select>
       </el-form-item>
       <el-form-item prop="cardName" label="卡券名称">
-        <dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="9"></dm-input>
+        <dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="30"></dm-input>
       </el-form-item>
 
       <el-form-item prop="subName" label="备注名">

src/views/ecm/form.js

 import { _debounce } from '@/utils/index';
-import { getEcmInfo, saveEcmInfo, getUseStoredFalg, getXsxsFalg } from '@/service/api/ecmApi.js';
+import { getEcmInfo, saveEcmInfo, getUseStoredFalg, getXsxsFalg, gicPaymentList } from '@/service/api/ecmApi.js';
 import { getCardManualSetting } from '@/service/api/cardApi.js';
 import { listTemplateVariables } from '@/service/api/msgApi.js';
 import { klflStrategy } from '@/service/api/gameApi.js'; // 会员等级列表接口
@@ -146,7 +146,8 @@ export default {
         store: false, // 门店
         cost: false, // 消费金额
         count: false, // 消费件数
-        good: false // 消费商品
+        good: false, // 消费商品
+        payment: false
       },
       storedChecked: false,
       discount_limit: { type: 1, count: undefined, flag: false }, // 适用商品折扣
@@ -158,7 +159,9 @@ export default {
         crowd_no_send: 1,
         marke_days: 14
       },
-      xsxsFlag: 0
+      xsxsFlag: 0,
+      paymentList: [],
+      checkList: []
     };
   },
   components: {
@@ -273,6 +276,12 @@ export default {
         console.log(err);
       }
     },
+    // 支付方式
+    gicPaymentList() {
+      gicPaymentList({ pageSize: 100 }).then(res => {
+        this.paymentList = res.result.result || [];
+      });
+    },
     // 获取商户卡券自动领取配置
     getCardManualSetting() {
       getCardManualSetting().then(res => {
@@ -368,7 +377,6 @@ export default {
           }
           this.consumeChecked.store = Boolean(consumTrigger.store_mode) || false; /** 门店类型: 0: 所有门店, 1: 部分(包含部分门店, 部分分组等) **/
           this.form.order_store = consumTrigger.order_store || ''; /** 消费门店key值 **/
-
           // 消费商品
           if (res.result.goodsEnable && consumTrigger.goods_filter_id) {
             this.xxSysp.goodsFilterId = consumTrigger.goods_filter_id || '';
@@ -402,6 +410,14 @@ export default {
               this.form[v] = consumTrigger[v];
             }
           });
+
+          // 支付方式回显
+          this.consumeChecked.payment = consumTrigger.gic_payment_flag ? true : false;
+          if (consumTrigger.gic_payment_flag) {
+            this.checkList = (consumTrigger.gic_payment_list && JSON.parse(consumTrigger.gic_payment_list)) || [];
+            this.checkList = this.checkList.map(i => i.payCode);
+            console.log(this.checkList);
+          }
         }
 
         if (this.form.effectAction === 'stored' && result.effectTriggerJson) {
@@ -642,6 +658,10 @@ export default {
           this.$tips({ type: 'warning', message: '适用商品折扣额度未填写' });
           return;
         }
+        if (this.consumeChecked.payment && !this.checkList.length) {
+          this.$tips({ type: 'warning', message: '请至少选择一种支付方式' });
+          return;
+        }
       }
       // 如果是储值触发
       if (this.form.effectAction === 'stored') {
@@ -747,6 +767,13 @@ export default {
               delete discount_limit.flag;
               consumeObj.discount_limit = JSON.stringify(discount_limit);
             }
+            // 支付方式
+            if (this.consumeChecked.payment) {
+              params.gic_payment_list = JSON.stringify(this.paymentList.filter(i => this.checkList.includes(i.payCode)));
+              params.gic_payment_flag = 1;
+            } else {
+              params.gic_payment_flag = 0;
+            }
             params = Object.assign(params, consumeObj); // 合并消费触发数据
           }
           if (this.form.effectAction === 'stored' && this.storedChecked) {
@@ -1071,6 +1098,7 @@ export default {
           <i class="el-icon-info"></i>营销对象为所有会员，包括微信会员、POS会员以及微信粉丝。
       </div>`
     );
+    this.gicPaymentList();
   },
   created() {
     getUseStoredFalg().then(res => {

src/views/ecm/form.vue

@@ -5,7 +5,7 @@
       <section class="dm-form__wrap">
         <h3 class="dm-title__label">计划内容设置</h3>
         <el-form-item label="计划名称" prop="ecmPlanName">
-          <dm-input class="w400" :maxlength="9" v-model="form.ecmPlanName" :disabled="!isAdd"></dm-input>
+          <dm-input class="w400" :maxlength="30" v-model="form.ecmPlanName" :disabled="!isAdd"></dm-input>
         </el-form-item>
         <el-form-item label="时效" class="is-required">
           <el-radio v-model="form.effectType" :label="0" :disabled="!isAdd" @change="onChangeEffectType">触点</el-radio>
@@ -153,9 +153,9 @@
                   <el-option label="小于等于" :value="5"></el-option>
                 </el-select>
                 <el-input-number controls-position="right" :disabled="!isAdd" v-model="discount_limit.count" :precision="2" :min="0" :max="10" class="w150"></el-input-number>&nbsp;&nbsp;折
+                <div class="fz12 gray">* 商品折扣 = 商品实付 / 吊牌价</div>
               </div>
               <span class="fz14 gray" v-else>不限制消费商品折扣</span>
-              <div v-if="discount_limit.flag" class="fz12 gray">* 商品折扣 = 商品实付 / 吊牌价</div>
             </div>
           </div>
         </el-form-item>
@@ -189,6 +189,20 @@
             </div>
           </div>
         </el-form-item>
+        <el-form-item>
+          <div class="no_label_form_label">
+            <el-checkbox class="el-form-item__label align-left" :disabled="!isAdd" v-model="consumeChecked.payment" v-if="paymentList.length">支付方式(包含)</el-checkbox>
+            <div>
+              <span class="fz14 gray" v-if="!consumeChecked.payment">任意支付方式</span>
+              <div class="sysp__content clearfix" v-else>
+                <el-checkbox-group v-model="checkList">
+                  <el-checkbox v-for="item in paymentList" :disabled="!isAdd" :label="item.payCode" :key="item.payCode">{{ item.payName || '--' }}</el-checkbox>
+                </el-checkbox-group>
+                <div class="fz12 gray">勾选具体支付方式后，只要订单包含所勾选任意一项即满足</div>
+              </div>
+            </div>
+          </div>
+        </el-form-item>
       </section>
       <!-- 会员卡升/降级触发设置 -->
       <section class="dm-form__wrap" v-if="form.effectType == 0 && (form.effectAction === 'degrade' || form.effectAction === 'upgrade')">
@@ -478,11 +492,14 @@ export default ecmForm;
   margin-left: -100px;
   label {
     display: inline-block;
-    width: 120px;
+    width: 140px;
   }
   > div {
     margin-left: 120px;
   }
+  /deep/ .el-checkbox {
+    margin-left: 16px;
+  }
 }
 .ecm-msg__edit {
   display: inline-block;

src/views/ewash/form.vue

@@ -17,7 +17,7 @@
         </el-select>
       </el-form-item> -->
       <el-form-item prop="cardName" label="卡券名称">
-        <dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="9"></dm-input>
+        <dm-input v-model="form.cardName" class="w400" placeholder="请输入卡券名称" :disabled="isEdit || isInfo" :byteType="1" :maxlength="30"></dm-input>
       </el-form-item>
 
       <el-form-item prop="subName" label="备注名">

src/views/sign/setting.vue

@@ -155,8 +155,9 @@ export default {
       date: [],
       time: [],
       prizeOptions: [
-        { name: '卡券', value: 'card', key: 1, img: require('./assets/img/card.svg') },
-        { name: '积分', value: 'integral', key: 2, img: require('./assets/img/integral.svg') }
+        // eslint-disable-next-line
+        { name: '卡券', value: 'card', key: 1, img: require('./assets/img/card.svg') }, // eslint-disable-next-line
+        { name: '积分', value: 'integral', key: 2, img: require('./assets/img/integral.svg') } 
       ],
       optTopShow: true,
       dialogCom: '', // 签到福利弹窗组件