Merge branch 'feature/开门红' into release/1215

This commit is contained in:
mengxiaolong
2020-12-15 13:17:46 +08:00

View File

@@ -26,6 +26,7 @@ export default {
},
data() {
return {
isFromService: '',
isPrevShow: false,
currentPage: 0,
pics: [],
@@ -42,6 +43,7 @@ export default {
}
},
created() {
this.isFromService = this.$route.query.from === 'service'
this.getSchemePics()
this.interceptAppBtn()
},
@@ -61,18 +63,24 @@ export default {
appCallBack(data) {
if (data.trigger == 'left_button_click') {
if (!this.isPrevShow) {
this.$jump({
flag: 'h5',
extra: {
title: '开门红专区',
forbidSwipeBack: 1,
url: location.origin + `/#/goodStart/prefecture`
},
routerInfo: {
path: `/goodStart/prefecture`,
type: '1'
}
})
if (this.isFromService) {
this.$jump({
flag: 'service'
})
} else {
this.$jump({
flag: 'h5',
extra: {
title: '开门红专区',
forbidSwipeBack: 1,
url: location.origin + `/#/goodStart/prefecture`
},
routerInfo: {
path: `/goodStart/prefecture/prefecture`,
type: '1'
}
})
}
} else {
this.isPrevShow = false
}