feat(core): support config h5 router base

max-team · Sep 6, 2019 · b24b764 · b24b764
1 parent e1c8446
commit b24b764
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 4 deletions.
diff --git a/packages/mars-core/src/h5/app-shell/main.js b/packages/mars-core/src/h5/app-shell/main.js
@@ -5,7 +5,8 @@
 
 
 /* globals Vue */
-import Vue from 'vue';
+// import Vue from 'vue';
+import {Vue} from '../index';
 
 // 引入公共样式
 import './mars-base.css';

diff --git a/packages/mars-core/src/h5/app-shell/router.js b/packages/mars-core/src/h5/app-shell/router.js
@@ -3,19 +3,25 @@
  * @author mars
  */
 
-import Vue from 'vue';
+// import {} from 'vue';
+import {config as appConfig, Vue} from '../index';
 import VueRouter from 'vue-router';
 import browserHistory from './browserHistory';
 import {routes, mode} from './export';
 Vue.use(VueRouter);
 
+const {router: routerConfig = {}} = appConfig;
+const {base, mode: runtimeMode} = routerConfig;
+
 routes.push({
     path: '*',
     redirect: routes[0].path
 });
 
 const router = new VueRouter({
-    mode, routes
+    mode: runtimeMode || mode || 'history',
+    base: base || '/',
+    routes
 });
 
 function guid() {

diff --git a/packages/mars-core/src/h5/index.js b/packages/mars-core/src/h5/index.js
@@ -5,5 +5,9 @@
  */
 export {default as Vue} from 'vue';
 export const config = {
-    $platform: 'h5'
+    $platform: 'h5',
+    router: {
+        mode: undefined,
+        base: undefined
+    }
 };