diff --git a/src/assets/images/test.png b/src/assets/images/test.png new file mode 100644 index 000000000..7b5507f76 Binary files /dev/null and b/src/assets/images/test.png differ diff --git a/src/config/index.js b/src/config/index.js index 0a5099eac..d8617b6be 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -19,7 +19,8 @@ switch (process.env.VUE_APP_FLAG) { // 静态服务资源 assetsUrl = 'http://139.199.50.151:8000/app/' mainUrl = 'http://139.199.50.151' - payUrl = 'http://10.10.100.84:7003/s3-modules-gateway/embed/gateway.action' + // payUrl = 'http://10.10.100.84:7003/s3-modules-gateway/embed/gateway.action' + payUrl = 'http://funduat.e-guofu.com/s3-modules-gateway/embed/gateway.action' break case 'uat': apiDomain = '' diff --git a/src/views/ebiz/common/CalculatePremium.vue b/src/views/ebiz/common/CalculatePremium.vue index dff08e1b6..a58bef911 100644 --- a/src/views/ebiz/common/CalculatePremium.vue +++ b/src/views/ebiz/common/CalculatePremium.vue @@ -628,7 +628,8 @@ export default { trialInfo['amt'] = Number(dutyItem.defaultDutyAmt) * Number(dutyItem.moneyUnit) result.push({ amt: Number(dutyItem.defaultDutyAmt) * Number(dutyItem.moneyUnit), - dutyCode: dutyItem.duty + dutyCode: dutyItem.duty, + dutyName: dutyItem.dutyName }) } }) @@ -712,6 +713,11 @@ export default { if (item.isMainRisk == 0) { mainRiskCode = item.productCode } + // this.trialInfos.map(trial=>{ + // trial.duty.map(dutylist=> { + // dutylist.dutyname + // }) + // }) let riskItem = { isMainRisk: item.isMainRisk, riskName: item.riskName, @@ -833,5 +839,6 @@ export default { /deep/.van-action-sheet__name { font-size: 12px; } + } diff --git a/src/views/ebiz/proposal/Exhibition.vue b/src/views/ebiz/proposal/Exhibition.vue index 472a96110..f70d693fe 100644 --- a/src/views/ebiz/proposal/Exhibition.vue +++ b/src/views/ebiz/proposal/Exhibition.vue @@ -110,12 +110,52 @@ -
+
产品总利益
-
+ +
{{ demoLabel.contentLabel }} {{ demoLabel.value }}
+
+ {{ duty.dutyName }} + {{ duty.amt }} +
+
+ + + + + +
+ + +
拖动按钮查看不同年龄的保单利益
+
+
+
产品总利益
+ +
+
+ {{ demoLabel.contentLabel }} + {{ demoLabel.value }} +
+
{ // 右上角的显示 window.EWebBridge.webCallAppInJs('webview_right_button', { @@ -253,7 +296,6 @@ export default { //在app端 params.proposalInfoDTO.proposalNo = localStorage.orderNo getDemo(params).then(res => { - this.formatLocal(res) }) } @@ -318,6 +360,8 @@ export default { } else { risk.payName = risk.payEndYear + '岁' } + // risk.demoValue[demoLabel.content] == dutyLst.dutyCode + this.dutyLst = risk.dutyLst }) }) this.appntDTO = orderDTO.appntDTO @@ -325,7 +369,7 @@ export default { insuredDTOs[0].insuredDTOs = orderDTO.insuredDTOs insuredDTOs = formatRiskList(insuredDTOs, 'insuredDTOs', 'riskDTOLst') this.insuredDTOs = insuredDTOs[0].insuredDTOs - this.insuredDTOs = relevance(this.insuredDTOs, insuredLabelResult, insuredResult, insuredInfoResult, this.amtFormat) //进行数据关联 + this.insuredDTOs = relevance(this.insuredDTOs, insuredLabelResult, insuredResult, insuredInfoResult, this.amtFormat, this.dutyLst) //进行数据关联 this.getWXTitle(this.insuredDTOs) //获取微信标题 let active = this.insuredDTOs.length //默认展开项 this.activeNames = [active] @@ -333,16 +377,13 @@ export default { }, //获取微信分享的标题 getWXTitle(insuredDTOs) { - dataDictionary.riskType.forEach(dataRisk => { //根据数字字典来找到 险种简称 // console.log(insuredDTOs) // console.log(insuredDTOs[0].mainRisk[0].riskCode) - // console.log(dataRisk.code) - + // console.log(dataRisk.code) + if (insuredDTOs[0].mainRisk[0].riskCode == dataRisk.code) { - - this.wxTitle = dataRisk.shortName + '计划书' } }) diff --git a/src/views/ebiz/proposal/js/exhibitionMethod.js b/src/views/ebiz/proposal/js/exhibitionMethod.js index 5b79f7df6..b26261364 100644 --- a/src/views/ebiz/proposal/js/exhibitionMethod.js +++ b/src/views/ebiz/proposal/js/exhibitionMethod.js @@ -1,16 +1,19 @@ -export function haveTap(content,keys) { //判断是否含有档位 +export function haveTap(content, keys) { + //判断是否含有档位 if (content.indexOf(keys) === -1) { return false } else { return true } } -export function getTapIndex(content,keys) { //获取关键字的位置 - let index = null ; +export function getTapIndex(content, keys) { + //获取关键字的位置 + let index = null index = content.indexOf(keys) return index } -export function formLabel(label, key) { //格式化label +export function formLabel(label, key) { + //格式化label let obj = {} let result = [] //进行去重 for (var i = 0; i < label.length; i++) { @@ -41,7 +44,7 @@ export function formLabel(label, key) { //格式化label return result } //将被保人与利益演示相关联 -export function relevance(insured, insuredLabelResult, insuredResult, insuredInfoResult, amtFormat) { +export function relevance(insured, insuredLabelResult, insuredResult, insuredInfoResult, amtFormat, dutyLst) { insured.forEach(insure => { insure.productFeatures = '' insure.riskDTOLst.forEach(risk => { @@ -57,8 +60,20 @@ export function relevance(insured, insuredLabelResult, insuredResult, insuredIn risk.demoValue = insuredResult[insuredId][riskCode] insure.productFeatures = insure.productFeatures + currentInsuredInfo.productFeatures //所有产品特色 + // dutyLst.map((duty, ind) => { + // console.log(duty) + // risk.demoLabel.map((item, index, array) => { + // // debugger + // // console.log(risk.demoValue['1'][item.content].replace(/,/g, '')) + // if (risk.demoValue['1'][item.content].replace(/,/g, '') != duty.dutyCode) { + // array.splice(index, 1) + // // console.log('删除成功') + // } + // }) + // }) risk.demoLabel.forEach(v => { // v.value = '' //设置初始值 + v.value = risk.demoValue['1'][v.content] //设置初始值 }) if (currentInsuredInfo.plan && currentInsuredInfo.plan === '0') { @@ -96,4 +111,4 @@ export function relevance(insured, insuredLabelResult, insuredResult, insuredIn }) }) return insured -} \ No newline at end of file +} diff --git a/src/views/ebiz/sale/test.vue b/src/views/ebiz/sale/test.vue index 02a81d9b2..1f426c7f1 100644 --- a/src/views/ebiz/sale/test.vue +++ b/src/views/ebiz/sale/test.vue @@ -1,9 +1,17 @@