update: dist

src/components/wx-text/index.vue

@@ -5,7 +5,7 @@
     </div>
     <div class="wx-text__opt clearfix">
       <el-popover placement="top" trigger="hover" width="680" v-if="isSupportVar">
-        <p>1.支持插入会员信息变量，如下表所示，{数字}为可插入变量，注意变量值长度，以免超过300字文本上限。</p>
+        <p>1.支持插入会员信息变量，如下表所示，{数字}为可插入变量，注意变量值长度，以免超过300字文本上限。aaaa</p>
         <p>2.支持换行；不支持富文本格式。</p>
         <p>会员信息变量表：</p>
         <div class="clearfix">

src/views/ecm/form.js

@@ -800,6 +800,11 @@ export default {
           this.$tips({ type: 'warning', message: '请填写执行时间' });
           return;
         }
+        // 时效为：单次时，文本事件，不支持文本插入变量
+        if (this.$refs.marketingEvent.textEventsHaveVariables()) {
+          this.$tips({ type: 'warning', message: '时效为：单次,不支持文本插入变量' });
+          return;
+        }
       }
 
       if (this.form.expireType && (!this.form.beginDate || !this.form.endDate)) {

src/views/ecm/marketing-event/index.vue

@@ -68,7 +68,7 @@ import libIntegral from './components/lib-integral.vue';
 import libGrade from './components/lib-grade';
 import libQywx from './components/lib-qywx';
 import libQfxx from './components/lib-qfxx';
-
+import customerVariables from '@/components/wx-text/options.js';
 // 全部的操作项
 // eslint-disable-next-line
 let allOptions = [{ name: '企微任务', value: 'qywx', key: 10, img: require('./assets/img/qywx.svg'), hoverImg: require('./assets/img/qywx-1.svg'), show: true }, { name: '群发任务', value: 'qfxx', key: 11, img: require('./assets/img/qfxx.svg'), hoverImg: require('./assets/img/qfxx-1.svg'), disabledImg: require('./assets/img/qfxx-2.svg'), show: false, disabled: false }, { name: '图文', value: 'teletext', key: 1, img: require('./assets/img/teletext.svg'), hoverImg: require('./assets/img/teletext-1.svg'), show: true }, { name: '文本', value: 'text', key: 2, img: require('./assets/img/text.svg'), hoverImg: require('./assets/img/text-1.svg'), show: true }, { name: '小程序', value: 'wxa', key: 3, img: require('./assets/img/wxa.svg'), hoverImg: require('./assets/img/wxa-1.svg'), show: true }, { name: '图片', value: 'image', key: 4, img: require('./assets/img/image.svg'), hoverImg: require('./assets/img/image-1.svg'), show: true }, { name: '卡券', value: 'card', key: 5, img: require('./assets/img/card.svg'), hoverImg: require('./assets/img/card-1.svg'), show: true }, { name: '短信', value: 'message', key: 6, img: require('./assets/img/message.svg'), hoverImg: require('./assets/img/message-1.svg'), show: true }, { name: '话务', value: 'teltask', key: 7, img: require('./assets/img/teltask.svg'), hoverImg: require('./assets/img/teltask-1.svg'), show: true }, { name: '积分', value: 'integral', key: 8, img: require('./assets/img/integral.svg'), hoverImg: require('./assets/img/integral-1.svg'), show: true },{ name: '会员卡升级', value: 'grade', key: 9, img: require('./assets/img/grade.svg'), hoverImg: require('./assets/img/grade-1.svg'), disabledImg: require('./assets/img/grade-2.svg'), show: false, disabled: false }];
@@ -174,7 +174,8 @@ export default {
       currentItem: {},
       optShow: false,
       optTopShow: true,
-      resourceStatus: 0
+      resourceStatus: 0,
+      customerVariables
     };
   },
   created() {
@@ -667,6 +668,20 @@ export default {
         return i > 3;
       }
     },
+    textEventsHaveVariables() {
+      const textEvents = this.list.filter(item => item.name == '文本').map(val => val.item.content);
+      let arr = [];
+      if (textEvents.length) {
+        const numberArr = customerVariables.map(item => item.number);
+        numberArr.forEach(item => {
+          let a = textEvents.filter(val => val.includes(item));
+          if (a.length) {
+            arr.push(a[0]);
+          }
+        });
+      }
+      return arr.length;
+    },
     //判断营销列表里是否有卡券 提供给父级使用
     hasReturnCard() {
       let item = {};