update

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

@@ -286,7 +286,7 @@ export default {
     },
     // 进去下一步之前的判断
     handleStepTwo() {
-      if (this.data.index === 0 && (this.data.triggerDate === '' || this.data.triggerTime === '')) {
+      if (this.data.index === 0 && (this.data.triggerDate === '' || this.data.triggerDate === null || this.data.triggerTime === '' || this.data.triggerTime === null)) {
         this.$message.warning('请完善改步骤后才能进入下一步')
         return false
       } else if (

src/modules/market-tools/components/weChat/ChatStepFour.vue

@@ -33,7 +33,7 @@
     <div class="card">
       <div class="title">展示内容</div>
       <div class="right-box">
-        <div class="card-msg">
+        <div class="card-msg" v-if="data.stepTwo.index == 0">
           <div class="top">
             <div class="title">用户登录提醒</div>
             <div class="phone-content">
@@ -42,7 +42,7 @@
             </div>
             <div class="phone-content">
               <div class="lable">内容：</div>
-              <div class="value">{{data.stepThree.content  }}</div>
+              <div class="value">{{ data.stepThree.content  }}</div>
             </div>
           </div>
           <div class="btn">
@@ -50,6 +50,14 @@
             <div class="el-icon-arrow-right"></div>
           </div>
         </div>
+        <div class="card-money" v-else>
+          <img src="https://webapp-pub.ezijing.com/x-training-new/wx-fk.png">
+          <div class="bz">
+            <div class="label">备注：</div>
+            <div class="con-txt">{{ data.stepThree.content }}</div>
+            <div class="el-icon-arrow-right"></div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -148,6 +156,31 @@ export default {
   background: url(https://webapp-pub.ezijing.com/x-training-new/phone-wxgzh.png);
   background-size: 100% 100%;
   position: relative;
+  .card-money{
+    background: #fff;
+    width: 188px;
+    position: absolute;
+    top: 70px;
+    left: 50%;
+    transform: translateX(-50%);
+    padding-top: 8px;
+    .bz{
+      padding: 8px 10px;
+      border-top: 1px solid #ccc;
+      display: flex;
+      align-items: center;
+      .label{
+        font-size: 12px;
+        color: #333333;
+      }
+      .con-txt{
+        font-size: 12px;
+        color: #333333;
+        width: 100px;
+        margin-right: 15px;
+      }
+    }
+  }
   .card-msg{
     position: absolute;
     top: 70px;

src/modules/market-tools/components/weChat/ChatStepThree.vue

 <template>
   <div class="sms-three-box">
     <div class="content-left">
-      <div class="card-textarea">
+      <div class="card-textarea" v-if="twoData.index == 0">
         <div class="title">推送标题</div>
         <textarea :maxlength="10" v-model="data.title" placeholder="请输入"></textarea>
       </div>
@@ -12,7 +12,7 @@
     </div>
     <div class="content-right">
       <div class="right-box">
-        <div class="card-msg">
+        <div class="card-msg" v-if="twoData.index == 0">
           <div class="top">
             <div class="title">用户登录提醒</div>
             <div class="content">
@@ -29,6 +29,14 @@
             <div class="el-icon-arrow-right"></div>
           </div>
         </div>
+        <div class="card-money" v-else>
+          <img src="https://webapp-pub.ezijing.com/x-training-new/wx-fk.png">
+          <div class="bz">
+            <div class="label">备注：</div>
+            <div class="con-txt">{{ data.content }}</div>
+            <div class="el-icon-arrow-right"></div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -39,16 +47,26 @@ export default {
   props: {
     data: {
       type: Object
+    },
+    twoData: {
+      type: Object
     }
   },
   mounted() {
-    console.log(this.data, '23')
+    console.log(this.twoData, '123')
   },
   methods: {
     handleStepThree() {
-      if (this.data.title === '' || this.data.content === '') {
-        this.$message.warning('请完善改步骤后才能进入下一步')
-        return false
+      if (!parseInt(this.twoData.index)) {
+        if (this.data.title === '' || this.data.content === '') {
+          this.$message.warning('请完善改步骤后才能进入下一步')
+          return false
+        }
+      } else {
+        if (this.data.content === '') {
+          this.$message.warning('请完善改步骤后才能进入下一步')
+          return false
+        }
       }
       return true
     }
@@ -102,6 +120,31 @@ export default {
       background: url(https://webapp-pub.ezijing.com/x-training-new/phone-wxgzh.png);
       background-size: 100% 100%;
       position: relative;
+      .card-money{
+        background: #fff;
+        width: 188px;
+        position: absolute;
+        top: 70px;
+        left: 50%;
+        transform: translateX(-50%);
+        padding-top: 8px;
+        .bz{
+          padding: 8px 10px;
+          border-top: 1px solid #ccc;
+          display: flex;
+          align-items: center;
+          .label{
+            font-size: 12px;
+            color: #333333;
+          }
+          .con-txt{
+            font-size: 12px;
+            color: #333333;
+            width: 100px;
+            margin-right: 15px;
+          }
+        }
+      }
       .card-msg{
         position: absolute;
         top: 70px;

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

@@ -5,7 +5,7 @@
       <div style="flex: 1">
         <ChatStepOne v-if="activeStep === 0" class="pt-50" :data="form.stepOne" ref="ChatStepOne" />
         <ChatStepTwo v-if="activeStep === 1" class="pt-50" :data="form.stepTwo" />
-        <ChatStepThree  v-if="activeStep === 2" :data="form.stepThree" ref="ChatStepThree"/>
+        <ChatStepThree :twoData="form.stepTwo" v-if="activeStep === 2" :data="form.stepThree" ref="ChatStepThree"/>
         <ChatStepFour :data="form" class="step-four" v-if="activeStep === 3" />
         <div class="main_content_btn" v-if="this.$route.query.view != 1">
           <div class="step_prev step_btn" @click="handlePrev" v-if="activeStep > 0">上一步</div>