修改bug

package-lock.json

@@ -10975,8 +10975,8 @@
     },
     "webpack-merge": {
       "version": "4.2.2",
-      "resolved": "https://registry.npm.taobao.org/webpack-merge/download/webpack-merge-4.2.2.tgz?cache=0&sync_timestamp=1605175039097&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fwebpack-merge%2Fdownload%2Fwebpack-merge-4.2.2.tgz",
-      "integrity": "sha1-onxS6ng9E5iv0gh/VH17nS9DY00=",
+      "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.2.2.tgz",
+      "integrity": "sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==",
       "dev": true,
       "requires": {
         "lodash": "^4.17.15"

src/pages/home/index.vue

@@ -72,6 +72,7 @@ export default {
           this.caseItemList = this.caseData[i].children
         }
       }
+      window.sessionStorage.homeTabIndex = n
     },
     getClassifyList() {
       api
@@ -79,6 +80,9 @@ export default {
         .then(response => {
           this.caseData = response.data
           this.caseItemList = response.data[0].children
+          if (window.sessionStorage.homeTabIndex) {
+            this.tabCase(parseInt(window.sessionStorage.homeTabIndex))
+          }
         })
         .finally(() => {
         })

src/pages/practice/components/practice1.vue

@@ -28,7 +28,7 @@
             </li>
           </template>
         </ul>
-        <ul  v-if="tabIndex == 1">
+        <ul class="setHeight" v-if="tabIndex == 1">
           <template v-for="(item, index) in formData.fund_detail">
             <li :key="'pd'+index">
               <div class="name">{{ item.name }}</div>
@@ -36,7 +36,7 @@
             </li>
           </template>
         </ul>
-        <ul v-if="tabIndex == 2">
+        <ul class="setHeight" v-if="tabIndex == 2">
           <template v-for="(item, index) in formData.invest_detail">
             <li :key="'pdd'+index">
               <div class="name">{{ item.name }}</div>
@@ -114,13 +114,32 @@ export default {
       const fundForm = this.formData.fund_detail.find(item => { return item.content === '' })
       const invForm = this.formData.invest_detail.find(item => { return item.content === '' })
       if (proForm || fundForm || invForm) {
-        this.$alert('有部分内容您还没有填写，是否确认进入下一步', '提示', {
+        // this.$alert('有部分内容您还没有填写，是否确认进入下一步', '提示', {
+        //   confirmButtonText: '确定',
+        //   showCancelButton: true,
+        //   cancelButtonText: '继续填写',
+        //   callback: action => {
+        //     console.log(action)
+        //     if (action === 'confirm') {
+        //       this.$emit('step1Confirm', this.formData)
+        //     }
+        //   }
+        // })
+        this.$confirm('有部分内容您还没有填写，是否确认进入下一步', '提示', {
           confirmButtonText: '确定',
-          callback: action => {
-            console.log(action)
-            if (action === 'confirm') {
+          cancelButtonText: '继续填写',
+          type: 'warning'
+        }).then(() => {
           this.$emit('step1Confirm', this.formData)
+        }).catch(() => {
+          if (proForm) {
+            this.tabIndex = 0
           }
+          if (fundForm) {
+            this.tabIndex = 1
+          }
+          if (invForm) {
+            this.tabIndex = 2
           }
         })
       } else {

src/pages/practice/components/practice2.vue

@@ -3,7 +3,7 @@
     <div class="practice2-box" v-show="!isResult">
       <div class="read" v-show="islookRun">
         <div class="title">请阅读相关信息，阅读后点击“阅读完毕”按钮，在下一页您需要进行用户分析</div>
-        <img class="img" src="https://zws-imgs-pub.ezijing.com/static/public/e8b4df0a84d4a2853c171b9902bef239.png" alt="">
+        <img class="img" :src="data.url" alt="">
         <div class="btn-box">
           <div  class="btn-cont">
             <div class="btn" @click="islookRun = false">阅读完毕</div>
@@ -31,7 +31,7 @@
         </div>
         <div class="foot-btn-box">
           <div class="btn-box">
-            <img v-show="islook" src="https://zws-imgs-pub.ezijing.com/static/public/e8b4df0a84d4a2853c171b9902bef239.png" alt="">
+            <img v-show="islook" :src="data.url" alt="">
             <div class="btn" @click="islook = !islook">查看资料</div>
             <div class="btn" @click="confirm">确认并进入下一步</div>
           </div>
@@ -103,6 +103,7 @@ export default {
     this.countDomHeight()
     const caseStorageData = JSON.parse(window.sessionStorage.caseData)
     this.data = caseStorageData
+    console.log(caseStorageData, '===123')
     this.checkboxData = caseStorageData.characteristics[0].options.map(item => {
       item.answerCount = []
       item.options.map(chi => {
@@ -111,7 +112,6 @@ export default {
       })
       return item
     })
-    console.log(this.checkboxData, ',1123')
   },
   methods: {
     getOptData(item) {
@@ -370,6 +370,7 @@ export default {
           min-width: 88px;
           width: 88px;
           text-align: center;
+          white-space: break-spaces;
         }
         .checkbox-box{
           display: flex;

src/pages/result/index.vue

@@ -5,7 +5,8 @@
         <div class="num">{{ data.gross_score }}分</div>
         <img src="https://zws-imgs-pub.ezijing.com/static/public/3e4e378aa05c0672290eb9bcd61218c1.png" alt="">
       </div>
-      <div class="text">恭喜您，成绩很优秀，继续保持哦。建议您在<span>#产品分析#</span>方面进一步学习和提升，再选择案例进行练习。</div>
+      <!-- <div class="text">恭喜您，成绩很优秀，继续保持哦。建议您在<span>#产品分析#</span>方面进一步学习和提升，再选择案例进行练习。</div> -->
+      <div class="text" v-html="resultText"></div>
       <img class="img-bottom" src="https://zws-imgs-pub.ezijing.com/static/public/d0d57e03e79a4a5dea5993fd67ff9a7e.png" alt="">
     </div>
     <div class="content-right">
@@ -50,7 +51,8 @@ import * as api from '@/api/common.js'
 export default {
   data() {
     return {
-      data: {}
+      data: {},
+      resultText: ''
     }
   },
   computed: {
@@ -62,7 +64,34 @@ export default {
   },
   created() {
     this.data = JSON.parse(window.sessionStorage.resultData)
-    console.log(this.data, '123===')
+    // data.gross_score
+    // const getText = ''
+    const textParam = [
+      {
+        name: '产品分析',
+        score: this.data.production_analyze.score / this.data.production_analyze.score_sum * 100
+      },
+      {
+        name: '用户分析',
+        score: this.data.user_analyze.score / this.data.user_analyze.score_sum * 100
+      },
+      {
+        name: '用户触达',
+        score: this.data.reach_analyze.score / this.data.reach_analyze.score_sum * 100
+      }
+    ]
+    const sortText = textParam.sort((a, b) => { return a.score - b.score })
+    if (this.data.gross_score < 50) {
+      this.resultText = `离达标的要求还有一段距离，继续努力哦。建议您在<span>#${sortText[0].name}#</span>方面进一步学习和提升，再选择案例进行练习。`
+    } else if (this.data.gross_score >= 50 && this.data.gross_score < 60) {
+      this.resultText = `离达标的要求很接近了，继续加油哦。建议您在<span>#${sortText[0].name}#</span>方面进一步学习和提升，再选择案例进行练习。`
+    } else if (this.data.gross_score >= 60 && this.data.gross_score < 70) {
+      this.resultText = `恭喜您，已经达标了，真棒！建议您在<span>#${sortText[0].name}#</span>方面进一步学习和提升，再选择案例进行练习。`
+    } else if (this.data.gross_score >= 70 && this.data.gross_score < 80) {
+      this.resultText = `恭喜您，成绩很优秀，继续保持哦。建议您在<span>#${sortText[0].name}#</span>方面进一步学习和提升，再选择案例进行练习。`
+    } else if (this.data.gross_score >= 80) {
+      this.resultText = `恭喜您拿到了高分！继续保持，继续加油哦。建议您在<span>#${sortText[0].name}#</span>方面进一步学习和提升，再选择案例进行练习。`
+    }
   },
   methods: {
     contince () {