Merge branch 'master' of https://gitlab.ezijing.com/webapp/x-training-new

src/modules/market-tools/components/app/AppStepTwo.vue

@@ -56,14 +56,8 @@ export default {
     },
 
     handleStepTwo() {
-      if (this.showIndex === 0) {
-        this.activeIndexName = '单次触发'
-      } else {
-        this.activeIndexName = '条件触发'
-      }
       this.$emit('getShowIndex', this.showIndex)
       let flag = true
-      console.log(this.showIndex, 'index')
       if (this.showIndex === 0) {
         this.stepTwoList[0].form.triggerList.forEach(item => {
           if (item.startValue === '') {

src/modules/market-tools/components/mobileSms/SmsStepTwo.vue

@@ -255,15 +255,7 @@ export default {
     },
     // 进去下一步之前的判断
     handleStepTwo() {
-      if (this.showIndex === 0) {
-        this.showIndexName = '单次触发'
-      } else if (this.showIndex === 1) {
-        this.showIndexName = '周期触发'
-      } else {
-        this.showIndexName = '节日触发'
-      }
-      console.log(this.showIndexName, 'this.showIndexName')
-      this.$emit('getShowIndex', this.showIndexName)
+      this.$emit('getShowIndex', this.showIndex)
 
       const stepTwoData = {
         triggerDate: this.triggerDate,

src/modules/market-tools/views/App.vue

@@ -52,13 +52,13 @@ export default {
       stepTwoList: [],
       stepTwoList2: [],
       caseId: '',
-      activeIndexName: ''
+      showIndex: ''
     }
   },
 
   methods: {
-    getShowIndex(name) {
-      this.activeIndexName = name
+    getShowIndex(val) {
+      this.showIndex = val
     },
     // 上一步
     handlePrev() {

src/modules/market-tools/views/MobileSms.vue

@@ -18,9 +18,7 @@
           @getShowIndex="getShowIndex"
           :stepTwoData="stepTwoData"
         />
-        <SmsStepThree
-          v-if="activeStep === 2"
-        />
+        <SmsStepThree v-if="activeStep === 2" />
         <div class="main_content_btn">
           <div class="step_prev step_btn" @click="handlePrev" v-if="activeStep > 0">上一步</div>
           <div class="step_next step_btn" @click="handleNext" v-if="activeStep >= 0 && activeStep < 2">下一步</div>
@@ -63,14 +61,14 @@ export default {
         times_send: '',
         solarTermsList: [],
         festivalList: [],
-        activeName: ''
+        showIndex: ''
       }
     }
   },
 
   methods: {
-    getShowIndex(name) {
-      this.activeName = name
+    getShowIndex(val) {
+      this.showIndex = val
     },
     // 获取第二步时间
     getTime(val) {