Merge branch 'feature/商品商城优化' into dev

This commit is contained in:
mengxiaolong
2020-09-11 11:19:43 +08:00

View File

@@ -155,23 +155,29 @@ export default {
const res = await getShopList(data)
if (!res) return
if (res.result == '0') {
if (res.content.rightBtnShow && !this.isWeixin) {
// eslint-disable-next-line no-undef
window.EWebBridge.webCallAppInJs('webview_right_button', {
btns: [
{
img: icon,
route: { flag: '', extra: {} }
}
]
})
if (res.content.redirect) {
console.log('redirect...')
window.location.href = res.content.linkUrl
} else {
if (res.content.rightBtnShow && !this.isWeixin) {
// eslint-disable-next-line no-undef
window.EWebBridge.webCallAppInJs('webview_right_button', {
btns: [
{
img: icon,
route: { flag: '', extra: {} }
}
]
})
window['appCallBack'] = this.appCallBack
}
this.detailImg = res.content.detailImgUrl
this.bottomBtnShow = res.content.bottomBtnShow
this.detail = res.content
this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
this.loaded = true
this.isCanCheck2 = true
}
this.detailImg = res.content.detailImgUrl
this.bottomBtnShow = res.content.bottomBtnShow
this.detail = res.content
this.pdfUrl = this.$assetsUrl + res.content.pdfUrl
this.loaded = true
this.isCanCheck2 = true
} else {
this.$toast(res.resultMessage)
}