Merge branch 'dev_pw' into dev

# Conflicts:
#	src/views/ebiz/proposal/Exhibition.vue
This commit is contained in:
皮伟
2019-12-06 15:15:38 +08:00

View File

@@ -233,7 +233,6 @@ export default {
},
mounted() {
document.body.style.backgroundColor = '#fff'
setTimeout(() => {
// 右上角的显示
window.EWebBridge.webCallAppInJs('webview_right_button', {
@@ -295,6 +294,7 @@ export default {
//在app端
this.mainRiskCodes = JSON.parse(localStorage.mainRiskCodes)
params.proposalInfoDTO.proposalNo = localStorage.orderNo
this.mainRiskCodes = JSON.parse(localStorage.mainRiskCodes)
getDemo(params).then(res => {
this.formatLocal(res)
})
@@ -308,7 +308,7 @@ export default {
extra: {
title: this.wxTitle,
content: '国富为您量身定制的保险产品,请查收',
url: location.origin + '/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token + '&mainRiskCodes=' + localStorage.mainRiskCodes,
url: encodeURIComponent(location.origin + '/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token + '&mainRiskCodes=' + JSON.stringify(localStorage.mainRiskCodes)),
// url: 'http://47.96.143.111/#/proposal/exhibition?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token,
img: this.$assetsUrl + 'images/logo.png'
}