update: merge

src/App.vue

@@ -22,6 +22,8 @@ export default {
       getUserLogin().then(res => {
         if (res.errorCode === 0) {
           this.userId = res.result && res.result.userId;
+          const wxaLinkFlag = res.result && res.result.wxaLinkFlag;
+          localStorage.setItem('wxaLinkFlag', wxaLinkFlag);
         }
       });
     },

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/activity/history-list.vue

@@ -28,7 +28,7 @@
 import talbeMethods from '@/mixins/tableMethods.js';
 import { activityList, delActivity } from '@/service/api/activityApi.js';
 import { formatDateTimeByType } from '@/utils/index.js';
-// import { enableAccessControl, confirmInfo } from '@/utils/auth.js';
+
 export default {
   name: 'activity-list',
   data() {

src/views/activity/list.vue

@@ -33,7 +33,7 @@
 import talbeMethods from '@/mixins/tableMethods.js';
 import { activityList, delActivity, stopActivity } from '@/service/api/activityApi.js';
 import { formatDateTimeByType } from '@/utils/index.js';
-// import { enableAccessControl, confirmInfo } from '@/utils/auth.js';
+
 export default {
   name: 'activity-list',
   data() {

src/views/ecm/form.js

@@ -772,6 +772,11 @@ export default {
         this.$message({ type: 'warning', message: str });
         return;
       }
+      // 时效类型为【单次 】或【重复】不支持文本插入变量
+      if ((this.form.effectType == 2 || this.form.effectType == 1) && this.$refs.marketingEvent.textEventsHaveVariables()) {
+        this.$tips({ type: 'warning', message: '时效类型为【单次 】或【重复】不支持文本插入变量' });
+        return;
+      }
 
       if (this.form.effectType == 2) {
         // 单次

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 = {};

src/views/message/addTemp.vue

@@ -67,7 +67,7 @@
                     </ul>
                   </div>
                 </el-popover>
-                <template v-if="userData.wxaLinkFlag == 1">
+                <template v-if="wxaLinkFlag == 1">
                   <span class="line"></span>
                   <el-button type="text" @click="transferLink.show = true">插入小程序链接</el-button>
                   <!-- <el-button type="text" @click="reduceLink.show = true">压缩H5链接</el-button> -->
@@ -178,7 +178,7 @@
 import linktools from '@/components/linktools-fulls/index';
 import { _debounce } from '@/utils/index';
 import { saveTempService, LoadTempInfo, checkSmsContext, hmList, hmLink } from '@/service/api/messageApi.js';
-import { compressLink, getTransferLink, getUserLogin, getSign, getEntepriseList } from '@/service/api/commonApi.js';
+import { compressLink, getTransferLink, getSign, getEntepriseList } from '@/service/api/commonApi.js';
 export default {
   name: 'add-temp',
   components: { linktools },
@@ -248,7 +248,7 @@ export default {
         remark: { required: true, message: '请输入申请说明', trigger: 'blur' }
       },
       editFlag: this.$route.meta.type === 'edit',
-      userData: {},
+      wxaLinkFlag: JSON.parse(localStorage.getItem('wxaLinkFlag')),
       // 压缩链接
       reduceLink: {
         show: false,
@@ -339,7 +339,8 @@ export default {
       const sign = await getSign();
       this.form.sign = sign.result.signText ? `【${sign.result.signText}】` : '';
     }
-    this.getUserData();
+  },
+  mounted() {
     this.getEntepriseList();
   },
   methods: {
@@ -420,11 +421,6 @@ export default {
       };
       this.loading = false;
     },
-    getUserData() {
-      getUserLogin().then(res => {
-        this.userData = res.result || {};
-      });
-    },
     // 生成短连接
     onReduceLink() {
       if (!this.reduceLink.link) {