Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

src/main.js

@@ -11,7 +11,7 @@ import './assets/rem/rem.js'
 import MetaInfo from 'vue-meta-info'
 import modules from './modules'
 
-// import createBefore from './components/beforeEnter'
+import createBefore from './components/beforeEnter'
 
 // vant
 import Vant from 'vant'
@@ -45,11 +45,11 @@ Vue.prototype.VueEvent = new Vue()
 Vue.prototype.wx = window.wx.miniProgram
 
 /* 创建实例之前，通过导航守卫，处理部分逻辑，如：是否直接进入系统 */
-// const before = createBefore()
+const before = createBefore()
 /* 导航守卫 */
 router.beforeEach((to, from, next) => {
-  // before.update(to, from, next)
-  next()
+  before.update(to, from, next)
+  // next()
 })
 window.G.$instance_vue = new Vue({
   store,