Merge branch 'develop' of http://39.106.8.246:3003/web/wanda-bm-guide into develop

src/components/menuList.vue

@@ -13,7 +13,7 @@
             <div
                 v-for='(item, index) in list'
                 :key='index'
-                :class='{ "is-active": item.state }'
+                :class='{ "is-active": item.state,"hide-home-page":item.hideHomePage }'
                 @click='clickEventAcitve(item, index)'
             >{{ item.name }}</div>
         </div>
@@ -48,7 +48,9 @@ export default {
         return {
             state: '',
             list: [
-                { name: '', state: false, route: 'homepage' },
+                // { name: '', state: false, route: 'homepage' }, 
+                //TODO: 显示首页 liujiandong用户路由跳转处理
+                { name: '首页', state: false, route: 'homepage' },  
                 { name: '项目概况', state: false, route: 'overview' },
                 { name: '楼层功能', state: false, route: 'floorFunc' }, //楼层功能
                 { name: '设备设施', state: false, route: 'equipment' }, //设备设施
@@ -79,6 +81,11 @@ export default {
         $route: 'handleRoute'
     },
     created() {
+        console.log('menulist created,',this.$store.state.userInfo)
+        // 非liujiandong用户,隐藏首页入口
+        if(this.$store.state.userInfo.username !== 'liujiandong'){
+            this.$set(this.list,0,{ name: '', state: false, route: 'homepage', hideHomePage: true })
+        }
         this.currentTime()
     },
     mounted() {
@@ -256,9 +263,14 @@ export default {
             margin: 0 8px;
             cursor: pointer;
             transition: all 0.2s;
-            &:first-child {
+            // TODO: 取消隐藏 首页菜单,
+            /* &:first-child {
                 display: none;
-            }
+            } */
+        }
+        // 改为动态根据 : 用户不是liujiandong时,隐藏首页
+        .hide-home-page{
+            display: none;
         }
 
         .is-active {

src/router/index.js

@@ -1,6 +1,12 @@
 import Vue from "vue"
 import store from "@/store"
 import VueRouter from "vue-router"
+// 解决Vue-Router升级导致的Uncaught(in promise) navigation guard问题
+const originalPush = VueRouter.prototype.push
+VueRouter.prototype.push = function push (location, onResolve, onReject) {
+  if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
+  return originalPush.call(this, location).catch(err => err)
+}
 import {
     query
 } from "@/utils/query"
@@ -33,7 +39,15 @@ const routes = [
                 path: "homepage",
                 name: "项目首页",
                 component: () => import("../views/homepage"),
-                redirect: "/home/overview",
+                // TODO: 注释重定向到预览页面,liujiandong用户 路由跳转处理
+                // redirect: "/home/overview", 
+                beforeEnter (to,from,next){
+                    if (store.state.userInfo.username !== 'liujiandong') {
+                        next('/home/overview')
+                    } else {
+                        next()
+                    }
+                }
             },
             //概览
             {

src/store/index.js

@@ -97,6 +97,10 @@ export default new Vuex.Store({
             // state.userInfo.employeename = palyload.employeename
             // state.userInfo.orgCode = palyload.orgCode
             // state.userInfo.username = palyload.username
+            // TODO: 设置用户名
+            if (palyload.username){ 
+                state.userInfo.username = palyload.username
+            }
         },
         SETISMESSAGE(state, data) {
             state.isMessage = data