【国富人寿】建议书跳转链接拼接订单号 并区分投保与建议书链接传递的数据

src/components/ebiz/proposal/BreadcrumbNavigator.vue

@@ -33,14 +33,18 @@ export default {
     jump(index) {
       if (index === this.current || index == 2) return
       if (this.moveOn) {
+        let thisMyUrl = this.routerInfos[index]
+        if (this.$route.query.proposalOrderNo) {
+          thisMyUrl = this.routerInfos[index] + '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+        }
         this.$jump({
           flag: 'h5',
           extra: {
-            url: location.origin + `/#/${this.routerInfos[index]}`,
+            url: location.origin + '/#/' + thisMyUrl,
             needRefresh: '1'
           },
           routerInfo: {
-            path: `/${this.routerInfos[index]}`
+            path: '/' + thisMyUrl
           }
         })
       }

src/config/index.js

@@ -27,27 +27,27 @@ function getSearchString (key) {
   }
   return obj[key]
 }
-let apiVersion = 'v2'
+let apiVersion = 'v1'
-var ua = window.navigator.userAgent.toLowerCase()
+// var ua = window.navigator.userAgent.toLowerCase()
-//通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
+// //通过正则表达式匹配ua中是否含有MicroMessenger字符串, 在微信
-if (localStorage.getItem('apiVersion')) {
+// if (localStorage.getItem('apiVersion')) {
-  apiVersion = localStorage.getItem('apiVersion')
+//   apiVersion = localStorage.getItem('apiVersion')
-} else {
+// } else {
-  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+//   if (ua.match(/MicroMessenger/i) == 'micromessenger') {
-    //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
+//     //report/reportList数据报表页面在浏览器可以打开了，但在微信或企业微信中打开不了,接口请求不需要token
-    if (window.location.href.indexOf('apiVersion') > 0) {
+//     if (window.location.href.indexOf('apiVersion') > 0) {
-      apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
+//       apiVersion = getSearchString('apiVersion') == 'V3' ? 'v3' : 'v2';//url中apiVersion没有时，为v2
-    } else {
+//     } else {
-      apiVersion = 'v3'
+//       apiVersion = 'v3'
-    }
+//     }
-  } else {
+//   } else {
-    // 在app
+//     // 在app
-    if (navigator.userAgent.indexOf('JZG_') > 0) {
+//     if (navigator.userAgent.indexOf('JZG_') > 0) {
-      apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
+//       apiVersion = navigator.userAgent.split('JZG_')[1].split('/')[0].split('_')[1] == 'V3' ? 'v3' : 'v2'
-    }
+//     }
-  }
+//   }
-  window.localStorage.setItem('apiVersion', apiVersion)
+//   window.localStorage.setItem('apiVersion', apiVersion)
-}
+// }
 // 可以多个接口域名，按需添加
 console.log('环境：', process.env.VUE_APP_FLAG)
 switch (process.env.VUE_APP_FLAG) {

src/views/ebiz/common/CalculatePremium.vue

@@ -359,16 +359,16 @@
   </div>
 </template>
 <script>
-import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field, Checkbox, RadioGroup, Radio } from 'vant'
+  import { Tag, Icon, Dialog, ActionSheet, Popup, Picker, Stepper, Field, Checkbox, RadioGroup, Radio } from 'vant'
-import { trial } from '@/api/ebiz/common/common'
+  import { trial } from '@/api/ebiz/common/common'
-import { saveOrUpdateOrderInfo, getOrderDetail,orderTrial } from '@/api/ebiz/sale/sale'
+  import { saveOrUpdateOrderInfo, getOrderDetail,orderTrial } from '@/api/ebiz/sale/sale'
-import { saveProposal } from '@/api/ebiz/proposal/proposal.js'
+  import { saveProposal } from '@/api/ebiz/proposal/proposal.js'
-import { getAgentInfo } from '@/api/ebiz/my/my.js'
+  import { getAgentInfo } from '@/api/ebiz/my/my.js'
-import occupationList from '@/components/ebiz/occipation/data/occupation'
+  import occupationList from '@/components/ebiz/occipation/data/occupation'
 
-//险种GFRS_M0016的责任的验证规则
+  //险种GFRS_M0016的责任的验证规则
-//默认 最低基本保险金额min 10000 整数倍要求mutiple 1000
+  //默认 最低基本保险金额min 10000 整数倍要求mutiple 1000
-const dutyRules = {
+  const dutyRules = {
     410800: {
       min: 50000,
       msg: '意外基本保险金额最低为50000元，超过最低基本保险金额为1000元整数倍'
@@ -397,11 +397,11 @@ const dutyRules = {
       mutiple: 10,
       msg: '意外住院津贴日额最低基本保险金额为10元/天，超过最低基本保险金额为10元/天整数倍，最高不得超过200元/天'
     }
-}
+  }
 
-//险种GFRS_M0070的责任的验证规则
+  //险种GFRS_M0070的责任的验证规则
-//默认 最低基本保险金额min 10000 整数倍要求mutiple 1000
+  //默认 最低基本保险金额min 10000 整数倍要求mutiple 1000
-const dutdutyGFRS_M0070RulesyRules = {
+  const dutdutyGFRS_M0070RulesyRules = {
     411200: {
       min: 100000,
       msg: '意外基本保险金额最低为100000元，超过最低基本保险金额为10000元整数倍'
@@ -436,9 +436,9 @@ const dutdutyGFRS_M0070RulesyRules = {
       mutiple: 10,
       msg: '意外住院津贴日额最低基本保险金额为10元/天，超过最低基本保险金额为10元/天整数倍，最高不得超过200元/天'
     }
-}
+  }
 
-const dutyGFRS_A0004Rules = {
+  const dutyGFRS_A0004Rules = {
     320205: {
       mainRisk: 'GFRS_M0005',
       msg: '住院医疗提示：金额只能是0.5、1、1.5、2',
@@ -451,8 +451,8 @@ const dutyGFRS_A0004Rules = {
     320207: {
       msg: '恶性肿瘤提示：投保可选责任时，可选责任最低投保 50 元，且应为 10 元的整数倍'
     }
-}
+  }
-const dutyGFRS_A0008Rules = {
+  const dutyGFRS_A0008Rules = {
     320404: {
       mainRisk: 'GFRS_M0005',
       otmainRisk: 'GFRS_M0031',
@@ -468,11 +468,11 @@ const dutyGFRS_A0008Rules = {
     320406: {
       msg: '恶性肿瘤提示：投保可选责任时，可选责任最低投保 50 元，且应为 10 元的整数倍'
     }
-}
+  }
-const DUTY_DEFAULT_MUTIPLE = 1000
+  const DUTY_DEFAULT_MUTIPLE = 1000
-const DUTY_DEFAULT_MIN = 10000
+  const DUTY_DEFAULT_MIN = 10000
 
-export default {
+  export default {
     name: 'calculatePremium',
     filters: {
       ruleTypeFilter(val) {
@@ -624,7 +624,6 @@ export default {
 
 
         if (this.isFrom != 'proposal') {
-        // debugger
           collect(occupationList,detailPromise.orderDTO.insuredDTOs[0].occupationCode)
           //活动生效日期
           this.cvalidateStr = detailPromise.orderDTO.orderInfoDTO.cvaliDate
@@ -1820,6 +1819,12 @@ export default {
                   if (this.chooseProducts[index].isMainRisk == 0) {
                     this.chooseProducts = []
                     localStorage.chooseProducts = JSON.stringify(this.chooseProducts)
+                    let thismyurl = ''
+                    if (this.$route.query.orderNo) {
+                      thismyurl = '/?orderNo=' + this.$route.query.orderNo
+                    } else if (this.$route.query.proposalOrderNo) {
+                      thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+                    }
                     this.$jump({
                       flag: 'goBack',
                       extra: {
@@ -1829,7 +1834,7 @@ export default {
                       routerInfo: {
                         type: 2,
                         index: -2,
-                path: '/common/selectedProduct'
+                        path: '/common/selectedProduct' + thismyurl
                       }
                     })
                     localStorage.trialList = ''
@@ -2250,13 +2255,19 @@ export default {
         })
 
         localStorage.addRiskCodes = JSON.stringify(addRiskCodes)
+        let thismyurl = ''
+        if (this.$route.query.orderNo) {
+          thismyurl = '/?orderNo=' + this.$route.query.orderNo
+        } else if (this.$route.query.proposalOrderNo) {
+          thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+        }
         this.$jump({
           flag: 'h5',
           extra: {
-          url: location.origin + '/#/common/addRiskList'
+            url: location.origin + '/#/common/addRiskList' + thismyurl
           },
           routerInfo: {
-          path: '/common/addRiskList'
+            path: '/common/addRiskList' + thismyurl
           }
         })
       },
@@ -2685,7 +2696,7 @@ export default {
 
         //建议书需要添加全部投保人信息，电投只需要投保人ID
         let insuredDTOItem = Object.assign(this.saleInsuredPersonInfo, { riskDTOLst: riskDTOLst })
-      let orderNo = this.$route.query.orderNo
+        let orderNo = localStorage.isFrom == 'proposal'?this.$route.query.proposalOrderNo:this.$route.query.orderNo
         let params = {
           orderType: 'RISK_ORDER',
           orderDTO: {
@@ -2748,6 +2759,12 @@ export default {
             if (resultData.deleteFlag == '0') {
               localStorage.salePageFlag = '3';
             }
+            let thismyurl = ''
+            if (this.$route.query.orderNo) {
+              thismyurl = '/?orderNo=' + this.$route.query.orderNo
+            } else if (this.$route.query.proposalOrderNo) {
+              thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+            }
             this.$jump({
               flag: 'goBack',
               extra: {
@@ -2757,11 +2774,11 @@ export default {
               routerInfo: {
                 type: 2,
                 index: -2,
-              path: '/common/selectedProduct'
+                path: '/common/selectedProduct' + thismyurl
               }
             })
           }else if (localStorage.isFrom == 'proposal'){
-          let proposalOrderNo = this.$CacheUtils.getLocItem('proposalNo') || ''
+            let proposalOrderNo = this.$route.query.proposalOrderNo || ''
             let url = `/common/selectedProduct?proposalOrderNo=${proposalOrderNo}`
             if (resultData.content.id) {
               this.saleInsuredPersonInfo.insuredId = resultData.content.id;
@@ -2807,42 +2824,42 @@ export default {
       //   }
       // }
     }
-}
+  }
 </script>
 <style lang="scss" scoped>
-/deep/ .van-dialog .van-dialog__header{
+  /deep/ .van-dialog .van-dialog__header{
     font-size: 16px;
     font-weight: 700;
-}
+  }
-/deep/ .van-button--danger{
+  /deep/ .van-button--danger{
     border-radius: 0;
-}
+  }
 
-/deep/ .van-button--plain {
+  /deep/ .van-button--plain {
     border: none !important;
     border-top: 1px solid #E9332E !important;
-}
+  }
-.renewalWrappser {
+  .renewalWrappser {
     display: flex;
     justify-content: space-between;
     align-items: center;
-}
+  }
 
-/deep/ .van-radio {
+  /deep/ .van-radio {
     margin: 0 0.5em;
-}
+  }
 
-.renewal {
+  .renewal {
     display: flex;
     justify-content: flex-end;
     padding: 1em;
-}
+  }
 
-/deep/ .van-radio__label {
+  /deep/ .van-radio__label {
     line-height: normal;
-}
+  }
 
-.calculate-premium-container {
+  .calculate-premium-container {
     .border-bottom {
       border-bottom: 1px solid #dadada;
     }
@@ -2865,5 +2882,5 @@ export default {
     .van-dialog__content{
       border: 1px solid red;
     }
-}
+  }
 </style>

src/views/ebiz/common/MainRiskList.vue

@@ -121,7 +121,7 @@ export default {
     } else {
       return new Promise((resolve, reject) => {
         getDetail({
-          orderNo: this.$route.query.orderNo
+          orderNo: this.$route.query.proposalOrderNo
         }).then(res => {
           if (res.result == '0') {
             this.recommendType = res.content[0].recmdDTO?res.content[0].recmdDTO.recommendType:'';
@@ -219,6 +219,12 @@ export default {
         
         if (this.list.length == 0) {
           this.$dialog({ message: '暂无可选产品!' }).then(() => {
+            let thismyurl = ''
+            if (this.$route.query.orderNo) {
+              thismyurl = '?orderNo=' + this.$route.query.orderNo
+            } else if (this.$route.query.proposalOrderNo) {
+              thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+            }
             this.$jump({
               flag: 'goBack',
               // extra: {
@@ -226,7 +232,7 @@ export default {
               // },
               routerInfo: {
                 type: 1,
-                path: '/common/selectedProduct'
+                path: '/common/selectedProduct' + thismyurl
               }
             })
           })
@@ -289,6 +295,12 @@ export default {
 
         if (this.list.length == 0) {
           this.$dialog({ message: '暂无可选产品!' }).then(() => {
+            let thismyurl = ''
+            if (this.$route.query.orderNo) {
+              thismyurl = '?orderNo=' + this.$route.query.orderNo
+            } else if (this.$route.query.proposalOrderNo) {
+              thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+            }
             this.$jump({
               flag: 'goBack',
               // extra: {
@@ -296,7 +308,7 @@ export default {
               // },
               routerInfo: {
                 type: 1,
-                path: '/common/selectedProduct'
+                path: '/common/selectedProduct' + thismyurl
               }
             })
           })
@@ -518,13 +530,19 @@ export default {
     },
     //页面跳转
     jumpTo() {
+      let thismyurl = ''
+      if (this.$route.query.orderNo) {
+        thismyurl = '?orderNo=' + this.$route.query.orderNo
+      } else if (this.$route.query.proposalOrderNo) {
+        thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+      }
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/common/calculatePremium?orderNo=' + this.$route.query.orderNo
+          url: location.origin + '/#/common/calculatePremium' + thismyurl
         },
         routerInfo: {
-          path: '/common/calculatePremium?orderNo=' + this.$route.query.orderNo
+          path: '/common/calculatePremium' + thismyurl
         }
       })
     }

src/views/ebiz/common/SelectedProduct.vue

@@ -271,7 +271,7 @@ export default {
           loadingType: 'spinner',
           message: '加载中……'
         })
-        resultData = await orderDetail({ orderNo: this.$CacheUtils.getLocItem('orderNo'), isMerge: '1' })
+        resultData = await orderDetail({ orderNo: this.$route.query.orderNo, isMerge: '1' })
       }
       if (resultData.result == 0) {
         if( resultData.orderDTO ) {
@@ -348,7 +348,7 @@ export default {
         resultData = await deleteProposal({
           orderDTO: {
             orderInfoDTO: {
-              orderNo: this.$CacheUtils.getLocItem('proposalNo')
+              orderNo: this.$route.query.proposalOrderNo
             },
             insuredDTOs: [
               {
@@ -368,7 +368,7 @@ export default {
           id: this.chooseProducts[index].insuanceId,
           orderDTO: {
             orderInfoDTO: {
-              orderNo: this.$CacheUtils.getLocItem('orderNo')
+              orderNo: this.$route.query.orderNo
             }
           }
         })
@@ -508,13 +508,19 @@ export default {
           return
         }
       }
+      let thismyurl = ''
+      if (this.$route.query.orderNo) {
+        thismyurl = '?orderNo=' + this.$route.query.orderNo
+      } else if (this.$route.query.proposalOrderNo) {
+        thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+      }
       this.$jump({
         flag: 'h5',
         extra: {
-          url: location.origin + '/#/common/mainRiskList'
+          url: location.origin + '/#/common/mainRiskList' + thismyurl
         },
         routerInfo: {
-          path: '/common/mainRiskList'
+          path: '/common/mainRiskList' + thismyurl
         }
       })
     },
@@ -525,7 +531,7 @@ export default {
         param = {
           orderDTO: {
             orderInfoDTO: {
-              orderNo: this.$CacheUtils.getLocItem('orderNo'),
+              orderNo: this.$route.query.orderNo?this.$route.query.orderNo:this.$route.query.proposalOrderNo,
               activeType: this.activityList[this.active_radio].isKmh,
               activityCode: this.activityList[this.active_radio].activityCode,
               cvaliDate : this.activityList[this.active_radio].cvaildateStr
@@ -537,7 +543,7 @@ export default {
         param = {
           orderDTO: {
             orderInfoDTO: {
-              orderNo: this.$CacheUtils.getLocItem('orderNo'),
+              orderNo: this.$route.query.orderNo?this.$route.query.orderNo:this.$route.query.proposalOrderNo,
               activeType: this.activityList[this.active_sqy_radio].isKmh,
               activityCode: this.activityList[this.active_sqy_radio].activityCode,
               cvaliDate : this.activityList[this.active_sqy_radio].cvaildateStr
@@ -555,13 +561,19 @@ export default {
         // localStorage.setItem('active_type', type=='KMH'?this.active_radio == '1'?'KMH':'':type=='SQY'?this.active_sqy_radio=='1'?'SQY':'':'')
         // localStorage.setItem('active_type', this.activityList[this.active_sqy_radio].isKmh)
         if (res.result == 0) {
+          let thismyurl = ''
+          if (this.$route.query.orderNo) {
+            thismyurl = '?orderNo=' + this.$route.query.orderNo
+          } else if (this.$route.query.proposalOrderNo) {
+            thismyurl = '?proposalOrderNo=' + this.$route.query.proposalOrderNo
+          }
           this.$jump({
             flag: 'h5',
             extra: {
-              url: location.origin + '/#/common/mainRiskList'
+              url: location.origin + '/#/common/mainRiskList' + thismyurl
             },
             routerInfo: {
-              path: '/common/mainRiskList'
+              path: '/common/mainRiskList' + thismyurl
             }
           })
         } else {
@@ -584,7 +596,12 @@ export default {
       return showFlag
     },
     nextPageShow() {
-      let routerUrl = '/sale/beneficiary'
+      let thismyurl = ''
+      if (this.$route.query.orderNo) {
+        thismyurl = '/sale/beneficiary?orderNo=' + this.$route.query.orderNo
+      } else if (this.$route.query.proposalOrderNo) {
+        thismyurl = '/sale/beneficiary?proposalOrderNo=' + this.$route.query.proposalOrderNo
+      }
       localStorage.beneficiaryInfo = ''
       localStorage.fromAddBeneficiaryInfo = ''
       localStorage.removeItem('applicant')
@@ -592,11 +609,11 @@ export default {
         flag: 'h5',
         extra: {
           forbidSwipeBack: '1',
-          url: location.origin + '/#' + routerUrl,
+          url: location.origin + '/#' + thismyurl,
           needRefresh: '1'
         },
         routerInfo: {
-          path: routerUrl
+          path: thismyurl
         }
       })
     }

src/views/ebiz/proposal/Appnt.vue

@@ -115,7 +115,7 @@ export default {
   methods: {
     async echoInfo() {
       // 从编辑页面过来时localstorage存在orderNo
-      const orderNo = this.$CacheUtils.getLocItem('proposalNo')
+      const orderNo = this.$route.query.proposalOrderNo
       if (orderNo) {
         let proposalInfoDTO = {
           orderNo: orderNo

src/views/ebiz/proposal/ChooseInsuredPerson.vue

@@ -221,7 +221,7 @@ export default {
       saveProposal(params).then(res => {
         if (res.result == '0') {
           this.$CacheUtils.setLocItem('proposalNo', res.content.orderNo)
-          let url = `/proposal/proposalInfo?proposalNo=${res.content.orderNo}`
+          let url = `/proposal/proposalInfo?proposalOrderNo=${res.content.orderNo}`
           //调用保存接口
           this.$jump({
             flag: 'h5',

src/views/ebiz/sale/Beneficiary.vue

@@ -193,11 +193,11 @@ export default {
             flag: 'h5',
             extra: {
               forbidSwipeBack: '1',
-              url: location.origin + `/#/sale/notifyingMessage`,
+              url: location.origin + `/#/sale/notifyingMessage?orderNo=` + this.$route.query.orderNo,
               needRefresh: '1'
             },
             routerInfo: {
-              path: `/sale/notifyingMessage`
+              path: `/sale/notifyingMessage?orderNo=` + this.$route.query.orderNo
             }
           })
         } else {

src/views/ebiz/sale/List.vue

@@ -499,32 +499,32 @@ export default {
       localStorage.isFrom = 'sale'
       localStorage.removeItem('changeCard')
       if(orderStatus == '01'){ //已签名待客户确认, 跳到签名确认页面
-          url = '/sale/SignatureConfirmation?edit=1'
+          url = '/sale/SignatureConfirmation?edit=1&orderNo='+orderNo
       }else if(orderStatus == '43'){//未签名待客户确认, 跳到签名确认页面
-        url = '/sale/SignatureConfirmation?edit=1'
+        url = '/sale/SignatureConfirmation?edit=1&orderNo='+orderNo
       }else if(orderStatus == '35'){//投保人保存成功, 跳到被保险人页面
-        url = '/sale/insuredPerson?edit=1'
+        url = '/sale/insuredPerson?edit=1&orderNo='+orderNo
       }else if(orderStatus == '36'){//被保险人保存成功, 跳到已选产品列表
-         url = '/common/selectedProduct?edit=1'
+         url = '/common/selectedProduct?edit=1&orderNo='+orderNo
       }else if(orderStatus == '37'){//受益人保存成功, 跳到告知信息--
-          url = '/sale/NotifyingMessage?edit=1'
+          url = '/sale/NotifyingMessage?edit=1&orderNo='+orderNo
       }else if(orderStatus == '38'){ //账户信息保存成功, 跳到附件管理--
-          url = '/sale/AttachmentManagement?edit=1'
+          url = '/sale/AttachmentManagement?edit=1&orderNo='+orderNo
       }else if(orderStatus == '39'){ //险种信息保存成功, 跳到已选产品列表
-          url = '/common/selectedProduct?edit=1'
+          url = '/common/selectedProduct?edit=1&orderNo='+orderNo
       }else if(orderStatus == '40'){//告知信息保存成功, 跳到风险测评--
         if( order.riskEvaluationDTO.isShowEvaluationPoint == '0'){
-          url = '/sale/AccountInformation?edit=1'
+          url = '/sale/AccountInformation?edit=1&orderNo='+orderNo
           }else {
-          url = '/sale/answerPage?edit=1'
+          url = '/sale/answerPage?edit=1&orderNo='+orderNo
         }
       }else if(orderStatus == ''){//跳到投保人
-          url = '/sale/insuredInfo?edit=1'
+          url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
       }else if(orderStatus == '44'){//建议书转投保, 跳到投保人
-          url = '/sale/insuredInfo?edit=1'
+          url = '/sale/insuredInfo?edit=1&orderNo='+orderNo
       }else if(orderStatus == '62'){//风险测评保存成功, 跳到账户信息--
           //  url = '/sale/AccountInformation?edit=1'
-           url = '/sale/answerSuccess?edit=1'
+           url = '/sale/answerSuccess?edit=1&orderNo='+orderNo
       }
       // switch (orderStatus) {
       //   case '01': //已签名待客户确认, 跳到签名确认页面