Merge remote-tracking branch 'origin/dev' into dev

.env.production

@@ -5,4 +5,4 @@ VUE_APP_TITLE = 移动安全保卫管理平台项目
 ENV = 'production'
 
 # 生产环境
-VUE_APP_BASE_API = 'http://10.87.10.55:8081'
+VUE_APP_BASE_API = '/'

.env.staging

@@ -7,5 +7,4 @@ NODE_ENV = production
 ENV = 'staging'
 
 # 测试环境
-# VUE_APP_BASE_API = 'http://10.87.10.55:8080/'
-VUE_APP_BASE_API = 'http://127.0.0.1:8080/
+VUE_APP_BASE_API = '/'

package.json

@@ -1,8 +1,8 @@
 {
-  "name": "ruoyi",
+  "name": "soc",
   "version": "3.6.2",
-  "description": "若依管理系统",
-  "author": "若依",
+  "description": "移动安全保卫管理系统",
+  "author": "xunmei",
   "private": true,
   "license": "MIT",
   "scripts": {

src/store/modules/permission.js

@@ -146,7 +146,8 @@ export const loadView = (view) => {
     return (resolve) => require([`@/views/${view}`], resolve)
   } else {
     // 使用 import 实现生产环境的路由懒加载
-    return () => import(`@/views/${view}`)
+    //return () => import(`@/views/${view}`)
+    return (resolve) => require([`@/views/${view}`], resolve);
   }
 }