Skip to content

C
common-templete
Commit ad0fe209 by 高淑倩
Options

merge:his

parents 806d3bce 58e7576b
Showing with 2 additions and 8 deletions
src/components/Header/index.vue
...@@ -153,13 +153,6 @@ export default { ...@@ -153,13 +153,6 @@ export default {
const ls = Array.isArray(vuexList) ? vuexList : JSON.parse(vuexList) const ls = Array.isArray(vuexList) ? vuexList : JSON.parse(vuexList)
// vuex 有的话先从 vuex 取 // vuex 有的话先从 vuex 取
return ls.length? ls : local ? JSON.parse(local) : [] return ls.length? ls : local ? JSON.parse(local) : []
// if(ls.length){
// list = ls
// }else if(local){
// // 从local取
// list = JSON.parse(local)
// }
// return list
}, },
...mapGetters({ ...mapGetters({
project: 'getProjectInfo', project: 'getProjectInfo',
......
src/router/index.js
...@@ -12,7 +12,8 @@ export default new Router({ ...@@ -12,7 +12,8 @@ export default new Router({
component: () => import(/* webpackChunkName: 'wxlogin' */ '@/pages/login'), component: () => import(/* webpackChunkName: 'wxlogin' */ '@/pages/login'),
}, },
{ {
path: '/salesCenter/activity/lotteryActivity.do', // path: '/salesCenter/activity/lotteryActivity.do',
path: '/',
name: 'test', name: 'test',
component: () => import(/* web packChunkName: 'wxhome' */ '@/pages/home'), component: () => import(/* web packChunkName: 'wxhome' */ '@/pages/home'),
children: [ children: [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment