Merge branch 'master' of http://119.23.72.7/xiaokang/cloudSystem

src/components/menu.vue

@@ -23,9 +23,8 @@
                     <a href="#" class="fl"><span class="icon iconfont fl"></span></a>
                     <a href="#" class="fl"><span class="icon iconfont fl"></span></a>
                     <div class="line"></div>
                     <div class="line"></div>
                     <div class="login-v fl">
                     <div class="login-v fl">
-                        <img class="fl" src="http://img.ichunt.com/test/images/ichunt/9f/34/9f349b1400f659e5ad270412d4dbe160.jpg"
-                             alt="">
-                        <div class="fl namex">460053411@qq.com</div>
+                        <img class="fl" :src="userinfo.avatar" alt="">
+                        <div class="fl namex">{{userinfo.contacts_name}}</div>
                         <div class="fl lo-box-drop">
                         <div class="fl lo-box-drop">
                             <span class="icon iconfont"></span>
                             <span class="icon iconfont"></span>
                             <div class="drop-box">
                             <div class="drop-box">
@@ -152,19 +151,21 @@
     Submenu,
     Submenu,
     MenuItemGroup,
     MenuItemGroup,
     Message,
     Message,
-    Dialog
+    Dialog,
+    Button
   } from 'element-ui'
   } from 'element-ui'
 
 
-  Vue.use(Menu).use(MenuItem).use(MenuItemGroup).use(Submenu).use(Form).use(FormItem).use(Dialog);
+  Vue.use(Menu).use(MenuItem).use(MenuItemGroup).use(Submenu).use(Form).use(FormItem).use(Dialog).use(Button);
 
 
   export default {
   export default {
     name: 'menus',
     name: 'menus',
     props: {},
     props: {},
     created() {
     created() {
-
+      this.getData();
     },
     },
     data() {
     data() {
       return {
       return {
+        userinfo: {},
         collapse: false,
         collapse: false,
         isIndexTab: true,
         isIndexTab: true,
         tabSure: "",
         tabSure: "",
@@ -200,6 +201,13 @@
       this.tabss(this.$route.path)
       this.tabss(this.$route.path)
     },
     },
     methods: {
     methods: {
+      getData() {
+        this.$http('get', "/api/user/getuserinfo").then(res => {
+          this.userinfo = res.data;
+        }).catch(err => {
+
+        })
+      },
       changePwd() {
       changePwd() {
         this.dialogVisible = true;
         this.dialogVisible = true;
       },
       },

src/main.js

@@ -74,7 +74,6 @@ router.beforeEach((to, from, next) => {
   if (to.path == "/login") {
   if (to.path == "/login") {
     next()
     next()
   } else {
   } else {
-    next();
     let token = Util.getCookie('token') || '';
     let token = Util.getCookie('token') || '';
     if (!token) {
     if (!token) {
       window.location.href = '/#/login?referer=' + encodeURI(to.path);
       window.location.href = '/#/login?referer=' + encodeURI(to.path);