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