Merge branch 'master' of http://git.cc-lotus.info/service-platform/web-test

src/layout/live/head.vue

@@ -11,7 +11,8 @@
           </p>
           <p class="username">
             <span v-if="user.uid">
-              <button type="text" style="color:blue" @click="stnmae">
+              {{ user.name }}
+              <button type="text" style="color:blue" @click="stnmae" v-if="user.role == '2' || user.role == '3'">
                 个人中心
               </button>
               <button type="button" class="logininfo" @click="zhuxiao">注销</button>
@@ -111,7 +112,7 @@ export default {
       this.toLogin();
     },
     async toLogin() {
-      this.$router.push({ path: '/' });
+      this.$router.go(0);
     },
   },
   computed: {