Merge branch 'feature/GFRS-730【0326】国富人寿附加综合意外伤害保险' into release/0415

# Conflicts:
#	src/views/ebiz/sale/SignatureConfirmation.vue
This commit is contained in:
tgy
2020-04-15 23:12:18 +08:00
3 changed files with 8 additions and 4 deletions

View File

@@ -104,7 +104,7 @@ export default {
value: '1' value: '1'
} }
], ],
currentTime: beforeDate.getBeforeDays(27), currentTime: beforeDate.getBeforeDays(28),
insured: { insured: {
name: '', name: '',
age: '', age: '',

View File

@@ -483,7 +483,7 @@ export default {
value: '1' value: '1'
} }
], ],
currentTime: beforeDate.getBeforeDays(27), currentTime: beforeDate.getBeforeDays(28),
fromCustomer: false, //是否从客户列表拉取的数据 fromCustomer: false, //是否从客户列表拉取的数据
codeDisabled: false, //获取验证码是否禁用 codeDisabled: false, //获取验证码是否禁用
countDown: 60, //倒计时 countDown: 60, //倒计时

View File

@@ -901,8 +901,12 @@ export default {
!!res.orderDTO.productDTO.special.content && !!res.orderDTO.productDTO.special.content &&
res.orderDTO.productDTO.special.content !== '' res.orderDTO.productDTO.special.content !== ''
) { ) {
const message = res.orderDTO.productDTO.special.content const message = '  ' + res.orderDTO.productDTO.special.content
Dialog({ message }) Dialog({
message: message.split("\\n").join("\n  "),
confirmButtonText: '本人已阅读并同意上述特别约定内容',
messageAlign: 'left'
})
} }
/* if (isShowDialog) { /* if (isShowDialog) {
//记录每次弹框的订单号。再次进入页面,订单号改变才会弹窗。 //记录每次弹框的订单号。再次进入页面,订单号改变才会弹窗。