Merge branch 'base'

feige996 · Dec 31, 2024 · 28a7f26 · 28a7f26
2 parents 25a6ba3 + c47eb87
commit 28a7f26
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/src/interceptors/route.ts b/src/interceptors/route.ts
@@ -5,7 +5,7 @@
  * 我这里应为大部分都可以随便进入，所以使用黑名单
  */
 import { useUserStore } from '@/store'
-import { getNeedLoginPages, needLoginPages as _needLoginPages } from '@/utils'
+import { needLoginPages as _needLoginPages, getNeedLoginPages } from '@/utils'
 
 // TODO Check
 const loginRoute = '/pages/login/index'
@@ -49,5 +49,7 @@ export const routeInterceptor = {
     uni.addInterceptor('navigateTo', navigateToInterceptor)
     uni.addInterceptor('reLaunch', navigateToInterceptor)
     uni.addInterceptor('redirectTo', navigateToInterceptor)
+    uni.addInterceptor('navigateBack', navigateToInterceptor)
+    uni.addInterceptor('switchTab', navigateToInterceptor)
   },
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -24,7 +24,6 @@
     ]
   },
   "vueCompilerOptions": {
-    "target": 3,
     "plugins": ["@uni-helper/uni-types/volar-plugin"]
   },
   "exclude": ["node_modules"],

diff --git a/vite-plugins/copyNativeRes.ts b/vite-plugins/copyNativeRes.ts
@@ -7,7 +7,7 @@ export function copyNativeRes() {
     __dirname,
     '../dist',
     process.env.NODE_ENV === 'production' ? 'build' : 'dev',
-    process.env.UNI_PLATFORM,
+    process.env.UNI_PLATFORM!,
     'nativeResources',
   )