update

src/components/base/EditStyle.vue

@@ -15,7 +15,7 @@
           placeholder="请输入"
         ></el-input>
       </template>
-      <template v-else>
+      <template v-if="type == 'input'">
         <el-input
           :maxlength="valueMaxLength"
           style="margin-top: 15px"
@@ -23,6 +23,15 @@
           placeholder="请输入"
         ></el-input>
       </template>
+      <template v-if="type == 'textarea'">
+        <el-input
+          type="textarea"
+          :maxlength="valueMaxLength"
+          style="margin-top: 15px"
+          v-model="returnData.textValue"
+          placeholder="请输入"
+        ></el-input>
+      </template>
     </div>
     <div class="tool-select">
       <div v-for="(item, index) in toolList" :key="index">

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

@@ -55,7 +55,7 @@ export default {
           ]
         },
         {
-          type: 'input',
+          type: 'textarea',
           dataFlag: 'describeParams',
           title: '推送内容',
           subTitle: '内容栏',
@@ -120,7 +120,7 @@ export default {
       for (const data in params) {
         if (params[data].textValue === '' || this.imgParams.url === '') {
           this.$message({
-            message: '请编辑主题',
+            message: '请完善步骤后才能进入下一步',
             type: 'warning'
           })
           return false

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

@@ -183,7 +183,7 @@ export default {
         return params
       } else {
         this.$message({
-          message: '请编辑主题',
+          message: '请完善步骤后才能进入下一步',
           type: 'warning'
         })
         return false

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

@@ -33,7 +33,7 @@
             <div class="icon"></div>
             <div class="text">
               触发时间：{{ data.stepTwo.time_range[0] }}至{{ data.stepTwo.time_range[1] }}&nbsp;&nbsp;{{
-                data.stepTwo.times_every
+                data.stepTwo.times_every.toString()
               }}&nbsp;&nbsp;{{ data.stepTwo.times_hour }}
             </div>
           </div>

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

@@ -34,14 +34,16 @@
             start-placeholder="开始日期"
             end-placeholder="结束日期"
             :picker-options="pickerOptions"
+            value-format="yyyy-MM-dd"
           >
           </el-date-picker>
           &nbsp;&nbsp;时间范围内
           <br />
           <br />
-          <el-select v-model="data.times_every">
+          <!-- <el-select v-model="data.times_every">
             <el-option v-for="it in timesList" :key="it.value" :label="it.label" :value="it.value"> </el-option>
-          </el-select>
+          </el-select> -->
+          <el-cascader :options="timesEvery" v-model="data.times_every"></el-cascader>
           &nbsp;&nbsp;&nbsp;
           <el-time-picker
             v-model="data.times_hour"
@@ -131,6 +133,7 @@ export default {
           return time.getTime() < Date.now()
         }
       },
+      timesEvery: [],
       timesList: [
         {
           value: '每日',
@@ -215,6 +218,54 @@ export default {
     }
   },
   mounted() {
+    this.timesEvery = [
+      {
+        value: '每日',
+        label: '每日'
+      },
+      {
+        value: '每周',
+        label: '每周',
+        children: [
+          {
+            value: '周一',
+            label: '周二'
+          },
+          {
+            value: '周二',
+            label: '周二'
+          },
+          {
+            value: '周三',
+            label: '周三'
+          },
+          {
+            value: '周四',
+            label: '周四'
+          },
+          {
+            value: '周五',
+            label: '周五'
+          },
+          {
+            value: '周六',
+            label: '周六'
+          },
+          {
+            value: '周日',
+            label: '周日'
+          }
+        ]
+      },
+      {
+        value: '每月',
+        label: '每月',
+        children: []
+      }
+    ]
+    for (let i = 0; i < 31; i++) {
+      this.timesEvery[2].children.push({ value: `${i + 1}号`, label: `${i + 1}号` })
+    }
     this.setSolarTerms()
   },
   methods: {
@@ -286,7 +337,13 @@ export default {
     },
     // 进去下一步之前的判断
     handleStepTwo() {
-      if (this.data.index === 0 && (this.data.triggerDate === '' || this.data.triggerDate === null || this.data.triggerTime === '' || this.data.triggerTime === null)) {
+      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 (
@@ -300,7 +357,8 @@ export default {
         return false
       } else if (
         this.data.index === 2 &&
-        (this.data.times_send === '' || this.data.times_send === null ||
+        (this.data.times_send === '' ||
+          this.data.times_send === null ||
           this.festivalList.filter(item => item.isActive === false).length === this.festivalList.length ||
           this.solarTermsList.filter(item => item.isActive === false).length === this.solarTermsList.length)
       ) {