Merge remote-tracking branch 'origin/master'

src/modules/market-tools/components/mail/MailStepThree.vue

@@ -168,7 +168,7 @@ export default {
             message: '请编辑主题',
             type: 'warning'
           })
-          return false
+          return {}
         }
       }
       return params

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

+<template>
+  <div class="sms-three-box">
+    <div class="content-left">
+      <div class="card-textarea">
+        <div class="title">推送标题</div>
+        <textarea placeholder="请输入"></textarea>
+      </div>
+      <div class="card-textarea">
+        <div class="title">推送内容</div>
+        <textarea placeholder="请输入"></textarea>
+      </div>
+    </div>
+    <div class="content-right"></div>
+  </div>
+</template>
+
+<script>
+export default {}
+</script>
+
+<style lang="scss" scoped>
+.sms-three-box {
+  margin-bottom: 20px;
+  display: flex;
+  .content-left {
+    border-left: 1px solid #dedede;
+    border-right: 1px solid #dedede;
+    padding: 30px 30px 0;
+    .card-textarea {
+      width: 320px;
+      background: rgba(248, 248, 248, 0.39);
+      border-radius: 16px;
+      padding: 23px;
+      margin-bottom: 30px;
+      .title {
+        text-align: center;
+        margin-bottom: 23px;
+        font-size: 18px;
+        font-weight: bold;
+        line-height: 100%;
+        color: #333333;
+      }
+      textarea {
+        width: 100%;
+        height: 91px;
+        background: rgba(255, 255, 255, 0.39);
+        border: 1px solid #efefef;
+        border-radius: 6px;
+        padding: 10px 15px;
+        color: #333333;
+        font-size: 14px;
+        resize: none;
+      }
+    }
+  }
+  .content-right {
+    width: 588px;
+    padding-top: 95px;
+    box-sizing: border-box;
+  }
+}
+</style>

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

@@ -18,6 +18,9 @@
           @getShowIndex="getShowIndex"
           :stepTwoData="stepTwoData"
         />
+        <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>
@@ -36,17 +39,19 @@ import ToolCard from '@/components/base/ToolCard.vue'
 import SmsStepOne from '../components/mobileSms/SmsStepOne.vue'
 import Step from '@/components/base/Step.vue'
 import SmsStepTwo from '../components/mobileSms/SmsStepTwo.vue'
+import SmsStepThree from '../components/mobileSms/SmsStepThree.vue'
 export default {
   components: {
     ToolCard,
     SmsStepOne,
     Step,
-    SmsStepTwo
+    SmsStepTwo,
+    SmsStepThree
   },
   data() {
     return {
       // times: '',
-      activeStep: 0,
+      activeStep: 2,
       stepOneList: [],
       caseId: '',
       stepTwoData: {
@@ -145,12 +150,11 @@ export default {
     }
   },
   mounted() {
-    console.log(this.$route.query.type)
-    if (this.$route.query.type) {
-      this.getReportDetail(this.$route.query.id)
-    } else {
-      this.checkRecord()
-    }
+    // if (this.$route.query.type) {
+    //   this.getReportDetail(this.$route.query.id)
+    // } else {
+    //   this.checkRecord()
+    // }
   }
 }
 </script>