merge:his

src/components/Header/index.vue

@@ -153,13 +153,6 @@ export default {
       const ls = Array.isArray(vuexList) ? vuexList : JSON.parse(vuexList)
       // vuex 有的话先从 vuex 取
       return ls.length? ls : local ? JSON.parse(local) : []
-      // if(ls.length){
-      //   list = ls
-      // }else if(local){
-      //   // 从local取
-      //   list = JSON.parse(local)
-      // }
-      // return list
     },
     ...mapGetters({
       project: 'getProjectInfo',

src/router/index.js

@@ -12,7 +12,8 @@ export default new Router({
       component: () => import(/* webpackChunkName: 'wxlogin' */ '@/pages/login'),
     },
     {
-      path: '/salesCenter/activity/lotteryActivity.do',
+      // path: '/salesCenter/activity/lotteryActivity.do',
+      path: '/',
       name: 'test',
       component: () => import(/* web packChunkName: 'wxhome' */ '@/pages/home'),
       children: [