updates

src/components/base/StepTab.vue

@@ -30,22 +30,14 @@
 </template>
 <script>
 export default {
+  props: {
+    tabList: {
+      type: Array
+    }
+  },
   data() {
     return {
-      activeTab: 0,
-      time: '',
-      tabList: [
-        {
-          icon: 'https://webapp-pub.ezijing.com/x-training-new/tab_icon11.png',
-          iconActive: 'https://webapp-pub.ezijing.com/x-training-new/tab_icon12.png',
-          tabName: '单次触发'
-        },
-        {
-          icon: 'https://webapp-pub.ezijing.com/x-training-new/tab_icon21.png',
-          iconActive: 'https://webapp-pub.ezijing.com/x-training-new/tab_icon22.png',
-          tabName: '条件触发'
-        }
-      ]
+      activeTab: 0
     }
   },
   methods: {

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

@@ -15,7 +15,7 @@
         <el-form :inline="true" :model="form">
           <div v-for="(item, indexB) in list" :key="indexB">
             <el-form-item>
-              当用户做过
+              <span class="optionList_right_text">当用户做过</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
               <el-select v-model="item.triggerValue">
                 <el-option
                   v-for="it in item.list"
@@ -26,10 +26,14 @@
                 >
                 </el-option>
               </el-select>
-              对目标用户进行触达
+              &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+              <span class="optionList_right_text">对目标用户进行触达</span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
             </el-form-item>
             <el-form-item>
-              <el-button type="text" @click="handleDelete(item, indexB)" icon="el-icon-close"></el-button>
+              <img
+                src="https://webapp-pub.ezijing.com/x-training-new/btn_del.png"
+                @click="handleDelete(item, indexB)"
+              />
             </el-form-item>
           </div>
         </el-form>
@@ -136,6 +140,11 @@ export default {
       margin-left: 16px;
       .el-form-item {
         padding-top: 0;
+        .optionList_right_text {
+          font-size: 16px;
+          font-weight: 400;
+          color: #333333;
+        }
         .optionList_right_del {
           width: 12px;
           height: 12px;

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

@@ -6,7 +6,7 @@
         <MailStepOne v-if="activeStep === 0" />
         <MailStepTwo v-if="activeStep === 1" />
         <div class="main_content_btn">
-          <div class="step_prev step_btn" @click="handlePrev" :disabled="activeStep === 0">上一步</div>
+          <div class="step_prev step_btn" @click="handlePrev" v-if="activeStep > 0">上一步</div>
           <div class="step_next step_btn" @click="handleNext">下一步</div>
           <div class="step_finished step_btn" @click="handlePreview">点击生成预览</div>
         </div>