Merge branch 'bugfix/营销分析设置'

src/views/card/form.js

@@ -390,6 +390,13 @@ export default {
     }
   },
   methods: {
+    onChangeNumber(val) {
+      if (!val) {
+        this.$nextTick(() => {
+          this.form.cardCodeCount = 0;
+        });
+      }
+    },
     changeOnly(val) {
       this.form.useDescript = val ? '不可与其他卡券叠加使用，详询门店' : '可与部分卡券叠加使用，详询门店';
     },

src/views/card/form.vue

@@ -236,8 +236,8 @@
       </el-form-item>
 
       <el-form-item prop="cardCodeCount" :label="form.useCustomCode ? '默认数量' : '新建数量'">
-        <div v-show="!form.useCustomCode"><el-input-number controls-position="right" :min="0" :max="10000000" :disabled="isEdit || isInfo" class="w200" v-model="form.cardCodeCount"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量，如不填，则默认为100,000张</span></div>
-        <div v-show="form.useCustomCode"><el-input-number controls-position="right" :min="0" :max="100000" disabled class="w200" :value="form.customCodeEnd - form.customCodeBegin + 1"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量，如不填，则默认为100,000张</span></div>
+        <div v-show="!form.useCustomCode"><el-input-number controls-position="right" :min="0" :max="10000000" :disabled="isEdit || isInfo" class="w200" v-model="form.cardCodeCount" @change="onChangeNumber"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量默认为100,000张</span></div>
+        <div v-show="form.useCustomCode"><el-input-number controls-position="right" :min="0" :max="100000" disabled class="w200" :value="form.customCodeEnd - form.customCodeBegin + 1"></el-input-number> 张 <span class="fz13 gray">优惠券创建数量默认为100,000张</span></div>
       </el-form-item>
 
       <el-form-item class="is-required" prop="useCustomCode">

src/views/ecm/form.js

@@ -428,6 +428,17 @@ export default {
               this.checked = ['lastCost_day'];
             }
           }
+          if (result.analyseJson) {
+            this.analyseConfig = JSON.parse(result.analyseJson);
+          } else {
+            this.analyseConfig = {
+              open_flag: 0,
+              crowd_flag: 0,
+              crowd_send: 4,
+              crowd_no_send: 1,
+              marke_days: 14
+            };
+          }
         } else if (this.isInit) {
           this.ecmPlanId = res.result.templateEcmPlanId || '';
         }
@@ -494,9 +505,6 @@ export default {
           this.form.storedLowest = cost.lowest_cost;
           this.form.storedMax = cost.max_cost;
         }
-        if (this.xsxsFlag && result && result.analyseJson) {
-          this.analyseConfig = JSON.parse(result.analyseJson);
-        }
       }
       if (!this.form.templateUseEnable) return;
       let template = null;