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

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

@@ -2,7 +2,7 @@
   <div>
     <ToolCard class="main_content">
       <Step :activeStep="activeStep" class="pt50-pl60" />
-      <div style="flex:1;">
+      <div style="flex: 1">
         <MailStepOne
           v-if="activeStep === 0"
           class="pt-50"
@@ -133,7 +133,11 @@ export default {
           if (res.data.items.length && answerList.length) {
             this.activeStep = answerList[0].answer.activeStep
             this.stepOneList = answerList[0].answer.commit_report[0].stepOneList || stepOne
-            this.stepTwoList = answerList[0].answer.commit_report[1].form || stepTwo
+            if (answerList[0].answer.commit_report[1].form.length) {
+              this.stepTwoList = answerList[0].answer.commit_report[1].form
+            } else {
+              this.stepTwoList = stepTwo
+            }
             this.time = answerList[0].answer.commit_report[2].time || this.times
             this.time2 = answerList[0].answer.commit_report[2].time2 || this.times2
             this.stepThreeData = answerList[0].answer.commit_report[3].stepThreeData || {}