hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-25 01:22:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

【FIX】解决冲突代码合并

Browse Source
This commit is contained in:
勾通
2025-10-30 17:26:53 +08:00
parent e3ff31bc61
commit 715f2747d7
9 changed files with 138 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/views/ebiz/common/SelectedProduct.vue
View File

@@ -396,14 +396,14 @@
resultData = await orderDetail({ orderNo: this.$route.query.orderNo, isMerge: '1' })
}
if (resultData.result == 0) {
if( resultData.orderDTO ) {
//判断是否显示风险测评tab
let updateAnswerType = resultData.orderDTO.riskEvaluationDTO.isShowEvaluationPoint =='1'?true:false
this.$store.commit('updateAnswerType', updateAnswerType )
// console.log(updateAnswerType,'updateAnswerType');
this.renovate = new Date().getTime()
}
// if( resultData.orderDTO ) {
// //判断是否显示风险测评tab
// let updateAnswerType = resultData.orderDTO.riskEvaluationDTO.isShowEvaluationPoint =='1'?true:false
// this.$store.commit('updateAnswerType', updateAnswerType )
// // console.log(updateAnswerType,'updateAnswerType');
// this.renovate = new Date().getTime()
// }
this.renovate = new Date().getTime()
let riskDTOLst
if (isProposal) {
this.$CacheUtils.setLocItem('saleInsuredInfo',JSON.stringify(resultData.content[0].appntDTO))//存储投保人信息