【FIX】冲突解决

src/views/ebiz/common/SelectedProduct.vue

@@ -141,16 +141,7 @@
         </div>
       </van-submit-bar>
     </div>
-    <PopupQuesResult 
-      @goBackHandler="goBack"
-      @goNextHandler="goNext"
-      @reStartHandler="reStart"
-      @clickOverlayHandler="clickOverlay"
-      :showResultPopup="showResultPopup" 
-      :showHasTested = "showHasTested"
-      :resultRiskType = 'resultRiskType'
-      :appntInfo="saleInsuredInfo"     
-    />
+
   </div>
 </template>
 <script>
@@ -163,7 +154,6 @@
   import utilsAge from '@/assets/js/utils/age'
   import IndexBar from '@/components/ebiz/sale/IndexBar'
   import riskRules from './risk-rules'
-  import PopupQuesResult from '@/components/common/PopupQuesResult'
 
   export default {
     name: 'selectedProduct',
@@ -195,10 +185,7 @@
 
 
         saleInsuredInfo: {},   //投保人信息
-        showResultPopup:false, //测评弹窗弹窗
-        showHasTested:false,  //已经测评过
         assessFlag:"", //是否需要填写适应性问卷
-        resultRiskType:'', //评估结果
       }
     },
     components: {
@@ -210,7 +197,6 @@
       [RadioGroup.name]: RadioGroup,
       [Radio.name]: Radio,
       [Image.name]: Image,
-      [PopupQuesResult.name]: PopupQuesResult
     },
     async mounted() {
       this.$jump({
@@ -1053,8 +1039,7 @@
                   this.resultRiskType = res.orderDTO.orderInfoDTO.resultRiskType
                   console.log('this.assessFlag',this.assessFlag)
                   //return
-                  if(this.assessFlag === '0'){ //需要填写问卷
-                    localStorage.setItem('evalateFrom', 'toEvaluate')  //通过该字段确定跳回几层
+                  if(this.assessFlag === '0'||this.assessFlag === '2'){ //需要填写问卷
                     this.$jump({
                       flag: 'h5',
                       extra: {
@@ -1064,14 +1049,10 @@
                         path:`/sale/questionEvaluate?orderNo=${this.$route.query.orderNo}`
                       }
                     }) 
-                  }else if( this.assessFlag === '3'){ //3.不需要填写，已有有效期的问卷，需展示结论
-                    localStorage.setItem('evalateFrom', 'toResult')
-                    this.showResultPopup = true
-                    this.showHasTested = true
-                  }else{
-                    if(this.assessFlag === '2'){
-                      this.$toast('已超过评估次数限制，无法重新评估')
-                    }
+                  } else{
+                    // if(this.assessFlag === '2'){
+                    //   this.$toast('已超过评估次数限制，无法重新评估')
+                    // }
                     this.$jump({
                       flag: 'h5',
                       extra: {
@@ -1106,10 +1087,7 @@
           })
         }
       },
-      //做过测评，点击上一步
-      goBack(){
-        this.showResultPopup = false
-      },
+
       goNext(){
         this.$jump({
           flag: 'h5',
@@ -1133,9 +1111,6 @@
             path: `/sale/questionEvaluate?orderNo=${this.$route.query.orderNo}`
           }
         })
-      },
-      clickOverlay(){
-        this.showResultPopup = false
       }
     }
   }