Merge branch 'base'
This commit is contained in:
commit
28a7f26bd3
@ -5,7 +5,7 @@
|
|||||||
* 我这里应为大部分都可以随便进入,所以使用黑名单
|
* 我这里应为大部分都可以随便进入,所以使用黑名单
|
||||||
*/
|
*/
|
||||||
import { useUserStore } from '@/store'
|
import { useUserStore } from '@/store'
|
||||||
import { getNeedLoginPages, needLoginPages as _needLoginPages } from '@/utils'
|
import { needLoginPages as _needLoginPages, getNeedLoginPages } from '@/utils'
|
||||||
|
|
||||||
// TODO Check
|
// TODO Check
|
||||||
const loginRoute = '/pages/login/index'
|
const loginRoute = '/pages/login/index'
|
||||||
@ -49,5 +49,7 @@ export const routeInterceptor = {
|
|||||||
uni.addInterceptor('navigateTo', navigateToInterceptor)
|
uni.addInterceptor('navigateTo', navigateToInterceptor)
|
||||||
uni.addInterceptor('reLaunch', navigateToInterceptor)
|
uni.addInterceptor('reLaunch', navigateToInterceptor)
|
||||||
uni.addInterceptor('redirectTo', navigateToInterceptor)
|
uni.addInterceptor('redirectTo', navigateToInterceptor)
|
||||||
|
uni.addInterceptor('navigateBack', navigateToInterceptor)
|
||||||
|
uni.addInterceptor('switchTab', navigateToInterceptor)
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
@ -24,7 +24,6 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"vueCompilerOptions": {
|
"vueCompilerOptions": {
|
||||||
"target": 3,
|
|
||||||
"plugins": ["@uni-helper/uni-types/volar-plugin"]
|
"plugins": ["@uni-helper/uni-types/volar-plugin"]
|
||||||
},
|
},
|
||||||
"exclude": ["node_modules"],
|
"exclude": ["node_modules"],
|
||||||
|
@ -7,7 +7,7 @@ export function copyNativeRes() {
|
|||||||
__dirname,
|
__dirname,
|
||||||
'../dist',
|
'../dist',
|
||||||
process.env.NODE_ENV === 'production' ? 'build' : 'dev',
|
process.env.NODE_ENV === 'production' ? 'build' : 'dev',
|
||||||
process.env.UNI_PLATFORM,
|
process.env.UNI_PLATFORM!,
|
||||||
'nativeResources',
|
'nativeResources',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user