Merge branch 'hotfix/【20210305】分享建议书token失效问题优化' into dev

# Conflicts:
#	src/api/ebiz/proposal/proposal.js
#	src/views/ebiz/proposal/ProposalInfo.vue
This commit is contained in:
mengxiaolong
2021-03-05 21:05:13 +08:00
2 changed files with 27 additions and 17 deletions

View File

@@ -82,3 +82,12 @@ export function share(data = {}) {
data data
}) })
} }
// 分享建议书获取token
export function getSharingToken(data = {}) {
return request({
url: getUrl('/customer/account/getShareParam', 1),
method: 'post',
data
})
}

View File

@@ -291,15 +291,13 @@ import {
Button Button
} from 'vant' } from 'vant'
import SelectRadio from '@/components/ebiz/SelectRadio' import SelectRadio from '@/components/ebiz/SelectRadio'
import { getDemo, toInsurance, getDemoByProposalNo, share } from '@/api/ebiz/proposal/proposal.js' import { getDemo, toInsurance, getDemoByProposalNo, share, getSharingToken } from '@/api/ebiz/proposal/proposal.js'
import { haveTap, getTapIndex, relevanceByInsure } from './js/exhibitionMethod.js' import { haveTap, getTapIndex, relevanceByInsure } from './js/exhibitionMethod.js'
import { formatRiskList } from '@/assets/js/utils/formatRiskList.js' import { formatRiskList } from '@/assets/js/utils/formatRiskList.js'
import { weixinShare } from '@/assets/js/utils/wxShare.js' import { weixinShare } from '@/assets/js/utils/wxShare.js'
import { getAgentInfo } from '@/api/ebiz/my/my.js' import { getAgentInfo } from '@/api/ebiz/my/my.js'
import getAge from '@/assets/js/utils/age.js' import getAge from '@/assets/js/utils/age.js'
import filters from '@/filters'
import dataDictionary from '@/assets/js/utils/data-dictionary' import dataDictionary from '@/assets/js/utils/data-dictionary'
import Layout from '../../app/layout/Layout' //使用数据字典中的险种类型
import riskRules from '../common/risk-rules.js' import riskRules from '../common/risk-rules.js'
export default { export default {
data() { data() {
@@ -507,20 +505,24 @@ export default {
} }
}, },
//app回调 //app回调
appCallBack(data) { async appCallBack(data) {
if (data.trigger == 'right_button_click') { if (data.trigger == 'right_button_click') {
// eslint-disable-next-line no-undef let res = await getSharingToken({})
EWebBridge.webCallAppInJs('bridge', { if (res.result == '0') {
flag: 'share', // eslint-disable-next-line no-undef
extra: { EWebBridge.webCallAppInJs('bridge', {
title: this.wxTitle, flag: 'share',
content: '国富为您量身定制的保险产品,请查收', extra: {
url: location.origin + '/#/proposal/proposalInfo?proposalNo=' + encodeURI(localStorage.orderNo) + '&token=' + encodeURI(localStorage.token), title: this.wxTitle,
// url: 'http://47.96.143.111/#/proposal/proposalInfo?proposalNo=' + localStorage.orderNo + '&token=' + localStorage.token, content: '国富为您量身定制的保险产品,请查收',
img: this.$assetsUrl + 'images/logo.png' url: location.origin + '/#/proposal/proposalInfo?proposalNo=' + encodeURI(localStorage.orderNo) + '&token=' + encodeURI(res.content),
} img: this.$assetsUrl + 'images/logo.png'
}) }
share() })
share()
} else {
return this.$toast(res.resultMessage)
}
} }
if (data.trigger == 'left_button_click') { if (data.trigger == 'left_button_click') {
this.$jump({ this.$jump({
@@ -797,7 +799,6 @@ export default {
} }
}, },
components: { components: {
Layout,
[Field.name]: Field, [Field.name]: Field,
[Popup.name]: Popup, [Popup.name]: Popup,
[Picker.name]: Picker, [Picker.name]: Picker,