diff --git a/.env.development b/.env.development index b3b870e..0cc5e9d 100644 --- a/.env.development +++ b/.env.development @@ -1,4 +1,4 @@ VITE_COMMON_API_PREFIX = /api-base -VITE_COMMON_API_URL = http://store-manage.hmily.club +VITE_COMMON_API_URL = http://store-manage.hmily.club/api diff --git a/src/App.vue b/src/App.vue index 9334c3f..69da161 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,16 +3,25 @@ import { useUserStoreWithOut } from '@/store/modules/user' export default { onLaunch: function () { const userStore = useUserStoreWithOut() - + // if (userStore.isLogin) { + // userStore.fetchUserInfo() + // } else { + // uni.navigateTo({ + // url: '/pages/login/index', + // }) + // } + // #ifdef APP-PLUS if (userStore.isLogin) { - userStore.fetchUserInfo() + plus.navigator.closeSplashscreen() } else { - uni.navigateTo({ + uni.reLaunch({ url: '/pages/login/index', + success: () => { + plus.navigator.closeSplashscreen() + }, }) } - - console.log('App Launch') + // #endif }, onShow: function () { console.log('App Show') diff --git a/src/components/cu-navbar/index.vue b/src/components/cu-navbar/index.vue index f8b2621..98140d6 100644 --- a/src/components/cu-navbar/index.vue +++ b/src/components/cu-navbar/index.vue @@ -11,11 +11,12 @@ >