Merge branch 'develop' into 'test'

.env

 VUE_APP_BASE_URL=/
-VUE_APP_LIB_BASE_URL=/systemManageShell/
 VUE_APP_CUSTOMER_MENU_CODE=0001
 VUE_APP_BASE_MENU_CODE=0002
 VUE_APP_SYSTEM_MENU_CODE=0003
@@ -8,7 +7,7 @@ VUE_APP_DEVICE_MENU_CODE=0048
 VUE_APP_DASHBOARD_CODE=0079
 VUE_APP_CUSTOMER_OPERATE_CODE=0077
 VUE_APP_WHITE_LIST=/login,/404,/401
-VUE_APP_LIB_MANAGER=http://ex-dev-dcxy-static.168cad.top
+VUE_APP_SUBSYSTEM=http://ex-dev-dcxy-static.168cad.top
 VUE_APP_SYSTEM_SERVER_URL=http://ex-dev-dcxy-system-manage.168cad.top
 VUE_APP_CUSTOMER_SERVER_URL=http://ex-dev-customer-manage.168cad.top
 VUE_APP_BASE_SERVER_URL=http://ex-dev-dcxy-base-manage.168cad.top

.env.dev

 NODE_ENV = production
-VUE_APP_LIB_MANAGER=http://ex-dev-dcxy-static.168cad.top
+VUE_APP_SUBSYSTEM=http://ex-dev-dcxy-static.168cad.top
 VUE_APP_SYSTEM_SERVER_URL=http://ex-dev-dcxy-system-manage.168cad.top
 VUE_APP_CUSTOMER_SERVER_URL=http://ex-dev-customer-manage.168cad.top
 VUE_APP_BASE_SERVER_URL=http://ex-dev-dcxy-base-manage.168cad.top

README.md

@@ -14,9 +14,9 @@ npm run build:master   # 生成环境
 
 ```bash
 # 如果多项目配置在同一域名下需要配置项目的文件路径
-VUE_APP_BASE_URL=/systemManageShell/ # 项目文件路径 配合nginx设置
+VUE_APP_BASE_URL=/ # 项目文件路径 配合nginx设置
 
-VUE_APP_LIB_MANAGER=http://ex-dev-dcxy-static.168cad.top # 静态项目部署地址
+VUE_APP_SUBSYSTEM=http://ex-dev-dcxy-static.168cad.top # 子项目部署地址
 VUE_APP_SYSTEM_SERVER_URL=http://ex-dev-dcxy-system-manage.168cad.top   # 系统管理接口
 VUE_APP_CUSTOMER_SERVER_URL=http://ex-dev-customer-manage.168cad.top    # 会员系统接口
 VUE_APP_BASE_SERVER_URL=http://ex-dev-dcxy-base-manage.168cad.top       # 基础服务接口

public/index.html

@@ -10,12 +10,12 @@
   <script src="https://unpkg.com/vuex@3.1.0/dist/vuex.js"></script>
   <script src="https://unpkg.com/vue-router@3.0.1/dist/vue-router.js"></script>
   <script src="/lib/manageShell.umd.min.js"></script>
-  <script src="<%= VUE_APP_LIB_MANAGER %>/customerManage/lib/customerManage.umd.min.js"></script>
-  <script src="<%= VUE_APP_LIB_MANAGER %>/baseManage/lib/baseManage.umd.min.js"></script>
-  <script src="<%= VUE_APP_LIB_MANAGER %>/systemManage/lib/systemManage.umd.min.js"></script>
-  <script src="<%= VUE_APP_LIB_MANAGER %>/operateManage/lib/operateManage.umd.min.js"></script>
-  <script src="<%= VUE_APP_LIB_MANAGER %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
-  <script src="<%= VUE_APP_LIB_MANAGER %>/deviceManage/lib/deviceManage.umd.min.js"></script>
+  <script src="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.umd.min.js"></script>
+  <script src="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.umd.min.js"></script>
+  <script src="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.umd.min.js"></script>
+  <script src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js"></script>
+  <script src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
+  <script src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js"></script>
 
   <link rel="stylesheet" href="/lib/manageShell.css" />
   <title>多彩综合管理系统</title>

src/dev-local/develop.html

@@ -20,12 +20,12 @@
   <div id="app"></div>
   <!-- built files will be auto injected -->
 </body>
-<script src="<%= VUE_APP_LIB_MANAGER %>/customerManage/lib/customerManage.umd.min.js"></script>
-<script src="<%= VUE_APP_LIB_MANAGER %>/baseManage/lib/baseManage.umd.min.js"></script>
-<script src="<%= VUE_APP_LIB_MANAGER %>/systemManage/lib/systemManage.umd.min.js"></script>
-<script src="<%= VUE_APP_LIB_MANAGER %>/operateManage/lib/operateManage.umd.min.js"></script>
-<script src="<%= VUE_APP_LIB_MANAGER %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
-<script src="<%= VUE_APP_LIB_MANAGER %>/deviceManage/lib/deviceManage.umd.min.js"></script>
+<script src="<%= VUE_APP_SUBSYSTEM %>/customerManage/lib/customerManage.umd.min.js"></script>
+<script src="<%= VUE_APP_SUBSYSTEM %>/baseManage/lib/baseManage.umd.min.js"></script>
+<script src="<%= VUE_APP_SUBSYSTEM %>/systemManage/lib/systemManage.umd.min.js"></script>
+<script src="<%= VUE_APP_SUBSYSTEM %>/operateManage/lib/operateManage.umd.min.js"></script>
+<script src="<%= VUE_APP_SUBSYSTEM %>/statisticsManage/lib/statisticsManage.umd.min.js"></script>
+<script src="<%= VUE_APP_SUBSYSTEM %>/deviceManage/lib/deviceManage.umd.min.js"></script>
 
 <script src="https://webapi.amap.com/maps?v=1.4.12&key=dd6103c90f2f17310a8711f2d330a0a6"></script>
 <script src="https://webapi.amap.com/ui/1.0/main.js?v=1.0.11"></script>