update: dist

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) {
         // 单次
@@ -800,11 +805,6 @@ 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)) {