asd123a20 2 роки тому
батько
коміт
0ac9656d1e

+ 1 - 1
admin-code/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/code/' : '/',
+    base: '/admin/code/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-content/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/contents/' : '/',
+    base: '/admin/contents/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-files/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/files/' : '/',
+    base: '/admin/files/',
     mode: 'history',
     routes
   });

+ 11 - 17
admin-frame/lib/apps.js

@@ -10,76 +10,70 @@ export default [
     // 子应用名称
     name: 'admin-code',
     // 子应用入口
-    entry: config.dev ? `//${ip}:3001/admin-code/` : './admin-code',
+    entry: config.dev ? `//${ip}:3001/admin-code/` : '/admin-code/',
     // 子应用渲染ID
     container: config.tabs ? '#code' : '#content',
     // 路由匹配规则
     activeRule: '/admin/code'
   },
-  // {
-  //   name: 'admin-files',
-  //   entry: '//${ip}:3002',
-  //   container: config.tabs ? '#files' : '#content',
-  //   activeRule: '/admin/files'
-  // },
   {
     name: 'admin-user',
-    entry: config.dev ? `//${ip}:3003/admin-user/` : 'admin-user',
+    entry: config.dev ? `//${ip}:3003/admin-user/` : '/admin-user/',
     container: config.tabs ? '#adminUser' : '#content',
     activeRule: '/admin/adminUser'
   },
   {
     name: 'admin-role',
-    entry: config.dev ? `//${ip}:3004/admin-role/` : 'admin-role',
+    entry: config.dev ? `//${ip}:3004/admin-role/` : '/admin-role/',
     container: config.tabs ? '#role' : '#content',
     activeRule: '/admin/role'
   },
   // 内容管理
   {
     name: 'admin-menus',
-    entry: config.dev ? `//${ip}:3005/admin-menus/` : 'admin-menus',
+    entry: config.dev ? `//${ip}:3005/admin-menus/` : '/admin-menus/',
     container: config.tabs ? '#menus' : '#content',
     activeRule: '/admin/menus'
   },
   {
     name: 'admin-contents',
-    entry: config.dev ? `//${ip}:3007/admin-contents/` : 'admin-contents',
+    entry: config.dev ? `//${ip}:3007/admin-contents/` : '/admin-contents/',
     container: config.tabs ? '#contents' : '#content',
     activeRule: '/admin/contents'
   },
   {
     name: 'admin-pages',
-    entry: config.dev ? `//${ip}:3008/admin-pages` : 'admin-pages',
+    entry: config.dev ? `//${ip}:3008/admin-pages` : '/admin-pages/',
     container: config.tabs ? '#pages' : '#content',
     activeRule: '/admin/pages'
   },
   {
     name: 'admin-imgNews',
-    entry: config.dev ? `//${ip}:3009/admin-imgNews/` : 'admin-imgNews',
+    entry: config.dev ? `//${ip}:3009/admin-img-news/` : '/admin-img-news/',
     container: config.tabs ? '#imgNews' : '#content',
     activeRule: '/admin/imgNews'
   },
   {
     name: 'admin-toConfig',
-    entry: config.dev ? `//${ip}:3010/admin-toConfig/` : 'admin-toConfig',
+    entry: config.dev ? `//${ip}:3010/admin-to-config/` : '/admin-to-config/',
     container: config.tabs ? '#toConfig' : '#content',
     activeRule: '/admin/toConfig'
   },
   {
     name: 'admin-log',
-    entry: config.dev ? `//${ip}:3011/admin-log/` : 'admin-log',
+    entry: config.dev ? `//${ip}:3011/admin-log/` : '/admin-log/',
     container: config.tabs ? '#log' : '#content',
     activeRule: '/admin/log'
   },
   {
     name: 'admin-files',
-    entry: config.dev ? `//${ip}:3023/admin-files/` : 'admin-files',
+    entry: config.dev ? `//${ip}:3023/admin-files/` : '/admin-files/',
     container: config.tabs ? '#files' : '#content',
     activeRule: '/admin/files'
   },
   {
     name: 'admin-role-menu',
-    entry: config.dev ? `//${ip}:3026/admin-role-menu/` : 'admin-role-menu',
+    entry: config.dev ? `//${ip}:3026/admin-role-menu/` : '/admin-role-menu/',
     container: config.tabs ? '#roleMenu' : '#content',
     activeRule: '/admin/roleMenu'
   }

+ 1 - 1
admin-img-news/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/imgNews/' : '/',
+    base: '/admin/imgNews/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-log/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/log/' : '/',
+    base: '/admin/log/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-menu/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/menus/' : '/',
+    base: '/admin/menus/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-page/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/pages/' : '/',
+    base: '/admin/pages/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-role-menu/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/roleMenu/' : '/',
+    base: '/admin/roleMenu/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-role/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/role/' : '/',
+    base: '/admin/role/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-toconfig/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/toConfig/' : '/',
+    base: '/admin/toConfig/',
     mode: 'history',
     routes
   });

+ 1 - 1
admin-user/src/main.js

@@ -20,7 +20,7 @@ let instance = null;
 function render (props = {}) {
   const { container } = props;
   router = new VueRouter({
-    base: window.__POWERED_BY_QIANKUN__ ? '/admin/adminUser/' : '/',
+    base: '/admin/adminUser/',
     mode: 'history',
     routes
   });