diff --git a/src/component/HomePage/UpgradePlan.vue b/src/component/HomePage/UpgradePlan.vue index 9b34a2ad..1d3f3cf2 100644 --- a/src/component/HomePage/UpgradePlan.vue +++ b/src/component/HomePage/UpgradePlan.vue @@ -274,8 +274,6 @@ export default defineComponent({ herf = `${data.url}?${data.alipay_order_string}` // this.newWindow.location.href = herf; } - console.log(herf); - if(this.newWindow){ this.newWindow.location.href = herf }else{ diff --git a/src/main.ts b/src/main.ts index 17a51eaf..ea2a4f34 100644 --- a/src/main.ts +++ b/src/main.ts @@ -25,10 +25,8 @@ flexible() import { getCookie, setCookie } from "@/tool/cookie"; router.beforeEach((to, from, next) => { - if(to.name == "login"){ - if(window.location.search.substring(1) != 'oldHis'){ - isMurmur() - } + if((to.name == "login" && !from.name) || (to.name == 'SquareWorks' && !from.name) || (to.name == 'works' && !from.name)){ + isMurmur() } next(); });