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

This commit is contained in:
mengxiaolong
2020-09-09 09:40:12 +08:00

View File

@@ -136,10 +136,12 @@ export default {
await this.saveShareTrack({ id: this.shareId, mallId: this.mallId }) await this.saveShareTrack({ id: this.shareId, mallId: this.mallId })
} }
this.getShopList({ id: this.mallId }) this.getShopList({ id: this.mallId })
// eslint-disable-next-line no-undef setTimeout(() => {
EWebBridge.webCallAppInJs('webview_left_button', { // eslint-disable-next-line no-undef
intercept: '1' //是否拦截原生返回事件 1是 其他否 EWebBridge.webCallAppInJs('webview_left_button', {
}) intercept: '1' //是否拦截原生返回事件 1是 其他否
})
}, 100)
window['appCallBack'] = this.appCallBack window['appCallBack'] = this.appCallBack
}, },
methods: { methods: {
@@ -235,7 +237,7 @@ export default {
flag: 'h5', flag: 'h5',
extra: { extra: {
url: location.origin + `/#/productStore/storeList`, url: location.origin + `/#/productStore/storeList`,
pullRefresh: '0' needRefresh: '0'
}, },
routerInfo: { routerInfo: {
path: `/productStore/storeList` path: `/productStore/storeList`