From 1fa546e22f9b913868cdeb5a84f3fc3c4f500ffb Mon Sep 17 00:00:00 2001 From: jazz <jazzxhunter@163.com> Date: 星期四, 21 十二月 2023 19:39:48 +0800 Subject: [PATCH] update_202312211937_增加卸麻通知和称谓显示 --- src/App.vue | 51 +++++++++++++++++++++++++++++---------------------- 1 files changed, 29 insertions(+), 22 deletions(-) diff --git a/src/App.vue b/src/App.vue index b371ff0..5f4bbe0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -2,7 +2,12 @@ <div id="app"> <transition name="fade" mode="out-in"> <!-- 椤甸潰锛宨sRouterAlive 鍒锋柊鐢� --> - <router-view v-if="isRouterAlive"/> + <!-- <router-view v-if="isRouterAlive"/> --> + <div> + <keep-alive> + <router-view v-if="isRouterAlive" /> + </keep-alive> + </div> </transition> <!-- Toast 鎻愮ず --> @@ -24,10 +29,11 @@ // 鍏ュ彛鍙傛暟 // 杩欓噷娉ㄩ噴鍏ュ彛鍙傛暟 -import Login from '@/utils/jun_login.js' +// import Login from '@/utils/jun_login.js' import wxsign from '@/utils/wxsign.js' -import Config from './config' -import eruda from 'eruda' +// import Config from './config' +// import xioFn from './utils/xio_fn.js' +// import eruda from 'eruda' export default { name: 'App', @@ -80,11 +86,11 @@ console.log('app amounted') // 閬垮厤鍒锋柊瀵艰嚧code閲嶅浣跨敤 - let code = this.getQueryString('code') // 寰俊鍥炶皟code - let cover = this.getQueryString('cover') // 鏄惁灏侀潰鍏ュ彛 - let local_code = this.getLocalStorage('code') // 鏈湴缂撳瓨code - let isRule = this.getQueryString('rule')==1 // 瑙勫垯 - let isCoupon = this.getQueryString('coupon')==1 // 浼樻儬鍒� + // let code = this.getQueryString('code') // 寰俊鍥炶皟code + // let cover = this.getQueryString('cover') // 鏄惁灏侀潰鍏ュ彛 + // let local_code = this.getLocalStorage('code') // 鏈湴缂撳瓨code + // let isRule = this.getQueryString('rule')==1 // 瑙勫垯 + // let isCoupon = this.getQueryString('coupon')==1 // 浼樻儬鍒� // 浠ヤ笅鎯呭喌闇�瑕侀噸瀹氬悜鍒伴暱閾� // 1. 閾炬帴甯︽湁code锛屼絾code宸茬粡鐢ㄨ繃 @@ -94,20 +100,20 @@ // 4. 闈炰紭鎯犲埜鍗曢〉 // console.dir(Config.createCodeUrl()) - if(Config.isWxLoginType){ - if (code && local_code == code || (!isCoupon && !isRule && !cover && !code && !Config.ismock && !Config.istest)) { - // 璇ュ井淇ode宸蹭娇鐢紝閲嶆柊璺宠浆闀块摼 - Login.toLongUrl() - return - } else { - this.removeLocalStorage('code') - } - } + // if(Config.isWxLoginType){ + // if (code && local_code == code || (!isCoupon && !isRule && !cover && !code && !Config.ismock && !Config.istest)) { + // // 璇ュ井淇ode宸蹭娇鐢紝閲嶆柊璺宠浆闀块摼 + // Login.toLongUrl() + // return + // } else { + // this.removeLocalStorage('code') + // } + // } // 鍒锋柊鍥哄畾棣栭〉 - if (location.hash && location.hash!='#/') { - this.$router.replace({name: 'root'}) - } + // if (location.hash && location.hash!='#/') { + // this.$router.replace({name: 'root'}) + // } // 鏆撮湶鍒板叏灞�锛宩un_httpEvent.js 璋冪敤 window.appLoading = this.loading.bind(this) @@ -115,7 +121,8 @@ window.appToast = this.toast.bind(this) // this.$refs.audio.play() - if(Config.isWxLoginType) this.wxinit() + // if(Config.isWxLoginType) this.wxinit() + }, methods: { // 寰俊鍒濆鍖� -- Gitblit v1.8.0