diff --git a/.eslintrc.cjs b/.eslintrc.cjs index aff8be4..e4a7aba 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -62,13 +62,14 @@ module.exports = { 'no-plusplus': 'off', 'no-shadow': 'off', 'vue/multi-word-component-names': 'off', + 'vue/no-unused-vars': 'off', + '@typescript-eslint/no-unused-vars': 'off', '@typescript-eslint/no-explicit-any': 'off', 'no-underscore-dangle': 'off', 'no-use-before-define': 'off', 'no-undef': 'off', 'no-unused-vars': 'off', 'no-param-reassign': 'off', - '@typescript-eslint/no-unused-vars': 'off', // 避免 `eslint` 对于 `typescript` 函数重载的误报 'no-redeclare': 'off', '@typescript-eslint/no-redeclare': 'error', diff --git a/package.json b/package.json index 556098d..6731ef4 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "unibest", "type": "commonjs", - "version": "2.6.3", + "version": "2.6.4", "description": "unibest - 最好的 uniapp 开发模板", "author": { "name": "feige996", diff --git a/src/interceptors/request.ts b/src/interceptors/request.ts index 1f84b31..63ea3e0 100644 --- a/src/interceptors/request.ts +++ b/src/interceptors/request.ts @@ -31,7 +31,8 @@ const httpInterceptor = { // #ifdef H5 // console.log(__VITE_APP_PROXY__) if (JSON.parse(__VITE_APP_PROXY__)) { - // 啥都不需要做 + // 自动拼接代理前缀 + options.url = import.meta.env.VITE_APP_PROXY_PREFIX + options.url } else { options.url = baseUrl + options.url } diff --git a/src/interceptors/route.ts b/src/interceptors/route.ts index ddd6c98..6e71763 100644 --- a/src/interceptors/route.ts +++ b/src/interceptors/route.ts @@ -5,7 +5,7 @@ * 我这里应为大部分都可以随便进入,所以使用黑名单 */ import { useUserStore } from '@/store' -import { needLoginPages as _needLoginPages, getNeedLoginPages } from '@/utils' +import { needLoginPages as _needLoginPages, getNeedLoginPages, getLastPage } from '@/utils' // TODO Check const loginRoute = '/pages/login/index' @@ -20,9 +20,19 @@ const isDev = import.meta.env.DEV // 黑名单登录拦截器 - (适用于大部分页面不需要登录,少部分页面需要登录) const navigateToInterceptor = { // 注意,这里的url是 '/' 开头的,如 '/pages/index/index',跟 'pages.json' 里面的 path 不同 + // 增加对相对路径的处理,BY 网友 @ideal invoke({ url }: { url: string }) { // console.log(url) // /pages/route-interceptor/index?name=feige&age=30 - const path = url.split('?')[0] + let path = url.split('?')[0] + + // 处理相对路径 + if (!path.startsWith('/')) { + const currentPath = getLastPage().route + const normalizedCurrentPath = currentPath.startsWith('/') ? currentPath : `/${currentPath}` + const baseDir = normalizedCurrentPath.substring(0, normalizedCurrentPath.lastIndexOf('/')) + path = `${baseDir}/${path}` + } + let needLoginPages: string[] = [] // 为了防止开发时出现BUG,这里每次都获取一下。生产环境可以移到函数外,性能更好 if (isDev) { diff --git a/src/utils/index.ts b/src/utils/index.ts index a60e713..e358e1b 100644 --- a/src/utils/index.ts +++ b/src/utils/index.ts @@ -1,7 +1,7 @@ import { pages, subPackages, tabBar } from '@/pages.json' import { isMpWeixin } from './platform' -const getLastPage = () => { +export const getLastPage = () => { // getCurrentPages() 至少有1个元素,所以不再额外判断 // const lastPage = getCurrentPages().at(-1) // 上面那个在低版本安卓中打包会报错,所以改用下面这个【虽然我加了 src/interceptions/prototype.ts,但依然报错】