xiongxing 3 недель назад
Родитель
Сommit
f619aa84d6
3 измененных файлов с 12 добавлено и 11 удалено
  1. 1 1
      .env.local
  2. 1 1
      .env.prod
  3. 10 9
      src/permission.ts

+ 1 - 1
.env.local

@@ -7,7 +7,7 @@ VITE_DEV=true
 # VITE_BASE_URL='http://localhost:48080'
 # VITE_BASE_URL='http://192.168.20.213:4080' #//测试
 # VITE_BASE_URL='http://home.ynims.com:4080' #//测试
-VITE_BASE_URL='http://47.107.245.0:48080' #//测试
+VITE_BASE_URL='http://47.107.245.0:4080' #//测试
 VITE_API_WSS_URL='wss://home.ynims.com:7060/ws/homecare-web/'
 # VITE_API_WSS_URL='ws://192.168.101.174:3443/ws/homecare-web/'
 VITE_BASE_URL_APP_LITE='http://47.107.245.0:4080'  # 家属端小程序用到的

+ 1 - 1
.env.prod

@@ -4,7 +4,7 @@ NODE_ENV=production
 VITE_DEV=false
 
 # 请求路径
-VITE_BASE_URL='http://47.107.245.0:48080'
+VITE_BASE_URL='http://47.107.245.0:4080'
 VITE_API_WSS_URL='wss://home.ynims.com:7060/ws/homecare-web/'
 VITE_BASE_URL_APP_LITE='http://47.107.245.0:4080' #//测试
 

+ 10 - 9
src/permission.ts

@@ -69,15 +69,16 @@ router.beforeEach(async (to, from, next) => {
       // 获取所有字典
       const permissionStore = usePermissionStoreWithOut()
       await permissionStore.generateRoutes()
-      permissionStore.getAddRouters.forEach((route) => {
-        router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
-      })
-      const redirectPath = from.query.redirect || to.path
-      // 修复跳转时不带参数的问题
-      const redirect = decodeURIComponent(redirectPath as string)
-      const { paramsObject: query } = parseURL(redirect)
-      const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect, query }
-      next(nextData)
+      // permissionStore.getAddRouters.forEach((route) => {
+      //   router.addRoute(route as unknown as RouteRecordRaw) // 动态添加可访问路由表
+      // })
+      next()
+      // const redirectPath = from.query.redirect || to.path
+      // // 修复跳转时不带参数的问题
+      // const redirect = decodeURIComponent(redirectPath as string)
+      // const { paramsObject: query } = parseURL(redirect)
+      // const nextData = to.path === redirect ? { ...to, replace: true } : { path: redirect, query }
+      // next(nextData)
       // const dictStore = useDictStoreWithOut()
       // const userStore = useUserStoreWithOut()
       // const permissionStore = usePermissionStoreWithOut()