diff --git a/App.vue b/App.vue
index b1beaa4..eedd4c1 100644
--- a/App.vue
+++ b/App.vue
@@ -6,6 +6,9 @@ export default {
computed: {
...mapGetters({ user: "getUser" }),
},
+ globalData: {
+ isSkip: "",// 判断是否跳转过
+ },
methods: {
...mapActions(["memberLogin", "getLoginCode"]),
...mapMutations(["setVisitChannels"]),
@@ -29,6 +32,7 @@ export default {
},
},
onLaunch: function (options) {
+ uni.setStorageSync('isSkip', '')
uni.getSystemInfo({
success: function (e) {
// #ifndef MP
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 63e2b57..6904526 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -4378,8 +4378,18 @@ export default {
}
if (!this.isShowFestival) {
this.isShowFestival = "other";
+ uni.setStorageSync("festival", this.isShowFestival);
+ } else {
+ let isSkip = uni.getStorageSync('isSkip')
+ if (!isSkip) {
+ this.$util.toNextRoute(
+ "navigateTo",
+ `/pages/nationalPage/springTravel?selectType=2`
+ );
+ uni.setStorageSync('isSkip', true)
+ }
+ uni.setStorageSync("festival", this.isShowFestival);
}
- uni.setStorageSync("festival", this.isShowFestival);
await this.getData(this.option);
}
@@ -4448,10 +4458,22 @@ export default {
this.currentFestivalObj = obj
}
}
+
if (!this.isShowFestival) {
this.isShowFestival = "other";
+ uni.setStorageSync("festival", this.isShowFestival);
+ } else {
+ let isSkip = uni.getStorageSync('isSkip')
+ if (!isSkip) {
+ this.$util.toNextRoute(
+ "navigateTo",
+ `/pages/nationalPage/springTravel?selectType=2`
+ );
+ uni.setStorageSync('isSkip', true)
+ }
+ uni.setStorageSync("festival", this.isShowFestival);
}
- uni.setStorageSync("festival", this.isShowFestival);
+
// 顶部显示的时间
this.single = timestampToTimeMonth(new Date(this.lastDay).getTime());
diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue
index 6410d5a..b82db38 100644
--- a/pages/nationalPage/merchantRevenue.vue
+++ b/pages/nationalPage/merchantRevenue.vue
@@ -43,7 +43,7 @@
{{ springService.SPREGIONTYPE_NAME }}
@@ -59,8 +59,8 @@