【FIX】合并代码解决冲突

src/views/ebiz/common/SelectedProduct.vue

@@ -141,6 +141,16 @@
         </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>
@@ -149,10 +159,11 @@
   import { orderDetail, deleteOrderInfo, mainRiskList, mainRiskListProposal, calculatePremium } from '@/api/ebiz/common/common'
   import { formatAllRisk } from '@/assets/js/utils/formatRiskList'
   import { getDetail, deleteProposal } from '@/api/ebiz/proposal/proposal.js'
-  import { saveOrderActiveType,getActivityList, getDoubleRecordProductLst, saveOrderType } from '@/api/ebiz/sale/sale.js'
+  import { saveOrderActiveType,getActivityList, getDoubleRecordProductLst, saveOrderType,getOrderDetail } from '@/api/ebiz/sale/sale.js'
   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',
@@ -180,7 +191,14 @@
         isCrossChannel: 0,   // 是否选择交叉渠道列表 0-否 1-是
         isElecCont: '', // 保单形式
         isElecContDisabled: false, // 保单形式是否禁用
-        branchType:''
+        branchType:'',
+
+
+        saleInsuredInfo: {},   //投保人信息
+        showResultPopup:false, //测评弹窗弹窗
+        showHasTested:false,  //已经测评过
+        assessFlag:"", //是否需要填写适应性问卷
+        resultRiskType:'', //评估结果
       }
     },
     components: {
@@ -191,7 +209,8 @@
       [IndexBar.name]: IndexBar,
       [RadioGroup.name]: RadioGroup,
       [Radio.name]: Radio,
-      [Image.name]: Image
+      [Image.name]: Image,
+      [PopupQuesResult.name]: PopupQuesResult
     },
     async mounted() {
       this.$jump({
@@ -200,6 +219,9 @@
           title: '已选产品列表'
         },
       })
+      if (this.$CacheUtils.getLocItem('saleInsuredInfo')) {
+        this.saleInsuredInfo = JSON.parse(this.$CacheUtils.getLocItem('saleInsuredInfo'))
+      }
       if (localStorage.isFrom == 'sale') {
         // 清除活动标志
         // localStorage.removeItem('active_type')
@@ -1025,17 +1047,47 @@
           }
           saveOrderType(params).then(res => {
             if(res.result == 0) {
-              this.$jump({
-                flag: 'h5',
-                extra: {
-                  forbidSwipeBack: '1',
-                  url: location.origin + '/#' + thismyurl,
-                  needRefresh: '1'
-                },
-                routerInfo: {
-                  path: thismyurl
+              getOrderDetail({orderNo: this.$route.query.orderNo,userAssessLogic:true}).then((res) => {
+                if(res.result == '0'){
+                  this.assessFlag = res.orderDTO.orderInfoDTO.assessFlag
+                  this.resultRiskType = res.orderDTO.orderInfoDTO.resultRiskType
+                  console.log('this.assessFlag',this.assessFlag)
+                  //return
+                  if(this.assessFlag === '0'){ //需要填写问卷
+                    localStorage.setItem('evalateFrom', 'toEvaluate')  //通过该字段确定跳回几层
+                    this.$jump({
+                      flag: 'h5',
+                      extra: {
+                        url: location.origin + '/#' + `/sale/questionEvaluate?orderNo=${this.$route.query.orderNo}`
+                      },
+                      routerInfo: {
+                        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('已超过评估次数限制，无法重新评估')
+                    }
+                    this.$jump({
+                      flag: 'h5',
+                      extra: {
+                        forbidSwipeBack: '1',
+                        url: location.origin + '/#' + '/sale/beneficiary?orderNo=' + this.$route.query.orderNo,
+                        needRefresh: '1'
+                      },
+                      routerInfo: {
+                        path: '/sale/beneficiary?orderNo=' + this.$route.query.orderNo,
+                      }
+                    })
+                  }
+                }else{
+                  this.$toast(res.resultMessage)
                 }
-              })
+              })    
             } else {
               this.$toast(res.resultMessage)
             }
@@ -1053,9 +1105,41 @@
             }
           })
         }
+      },
+      //做过测评，点击上一步
+      goBack(){
+        this.showResultPopup = false
+      },
+      goNext(){
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            forbidSwipeBack: '1',
+            url: location.origin + '/#' + '/sale/beneficiary?orderNo=' + this.$route.query.orderNo,
+            needRefresh: '1'
+          },
+          routerInfo: {
+            path: '/sale/beneficiary?orderNo=' + this.$route.query.orderNo,
+          }
+        })
+      },
+      reStart(){
+        this.$jump({
+          flag: 'h5',
+          extra: {
+            url: location.origin + `/#/sale/questionEvaluate?orderNo=${this.$route.query.orderNo}`
+          },
+          routerInfo: {
+            path: `/sale/questionEvaluate?orderNo=${this.$route.query.orderNo}`
+          }
+        })
+      },
+      clickOverlay(){
+        this.showResultPopup = false
       }
     }
   }
+
 </script>
 <style lang="scss" scoped>
   @import '@/assets/sass/variables.scss';