guhongwei 4 년 전
부모
커밋
2a988a2581
5개의 변경된 파일48개의 추가작업 그리고 32개의 파일을 삭제
  1. 1 1
      src/layout/kjpdCenter/menuInfo.vue
  2. 41 28
      src/layout/live/head.vue
  3. 2 2
      src/layout/userCenter/heads.vue
  4. 2 0
      src/store/user/login.js
  5. 2 1
      src/views/hallList/parts/kjpdlist.vue

+ 1 - 1
src/layout/kjpdCenter/menuInfo.vue

@@ -69,7 +69,7 @@ export default {
           message: '退出登录成功',
           type: 'success',
         });
-        this.$router.push({ path: '/market/index' });
+        this.$router.push({ path: '/' });
       } else {
         this.$router.push({ path: '/kjpdCenter/index', query: { num: key } });
       }

+ 41 - 28
src/layout/live/head.vue

@@ -11,28 +11,37 @@
             <span @click="guanzhu()">关注公众号</span>
           </el-col>
           <el-col :span="12" class="right">
-            <span v-if="user.uid || user.suid" class="name"> {{ user.name || user.adminuser }}</span>
-            <span v-if="user.uid">
-              <span v-if="user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'">
-                <el-button @click="tuCenter" type="info" size="mini">个人中心</el-button>
+            <span v-if="user.uid || user.suid">
+              <span v-if="user.uid || user.suid" class="name"> {{ user.name || user.adminuser }}</span>
+              <span v-if="user.uid">
+                <span v-if="user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'">
+                  <el-button @click="tuCenter" type="info" size="mini">个人中心</el-button>
+                </span>
+                <el-button
+                  @click="zhuxiao"
+                  type="danger"
+                  size="mini"
+                  style="margin:0 0 0 10px"
+                  v-if="
+                    user.role == '2' || user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'
+                  "
+                  >退出登录</el-button
+                >
               </span>
-              <el-button
-                @click="zhuxiao"
-                type="danger"
-                size="mini"
-                style="margin:0 0 0 10px"
-                v-if="user.role == '2' || user.role == '3' || user.role == '4' || user.role == '5' || user.role == '6' || user.role == '7' || user.role == '8'"
-                >退出登录</el-button
-              >
-            </span>
-            <el-button v-else type="primary" size="mini" @click="webLogin">平台登录</el-button>
-            <span v-if="user.uid">
-              <span v-if="user.role == '0' || user.role == '1' || user.role == '7'">
-                <el-button @click="tuCenter" type="info" size="mini">个人中心</el-button>
-                <el-button @click="zhuxiao" type="danger" size="mini">退出登录</el-button>
+              <el-button v-else type="primary" size="mini" @click="webLogin">平台登录</el-button>
+              <span v-if="user.uid">
+                <span v-if="user.role == '0' || user.role == '1' || user.role == '7'">
+                  <el-button @click="tuCenter" type="info" size="mini">个人中心</el-button>
+                  <el-button @click="zhuxiao" type="danger" size="mini">退出登录</el-button>
+                </span>
               </span>
+              <el-button v-else type="primary" size="mini" @click="adminLogin">管理登录</el-button>
+            </span>
+            <span v-else>
+              <span class="name">{{ user.title }}</span>
+              <el-button @click="tuCenter" type="info" size="mini">个人中心</el-button>
+              <el-button @click="zhuxiao" type="danger" size="mini">退出登录</el-button>
             </span>
-            <el-button v-else type="primary" size="mini" @click="adminLogin">管理登录</el-button>
           </el-col>
         </div>
       </div>
@@ -130,16 +139,20 @@ export default {
     },
     // 个人中心跳转
     tuCenter() {
-      if (this.user.role == '4' || this.user.role == '5' || this.user.role == '6' || this.user.role == '7') {
-        this.$router.push({ path: '/userCenter/index', query: { num: '1' } });
-      } else if (this.user.role == '3') {
-        this.$router.push({ path: '/adminCenter/index', query: { num: '1' } });
-      } else if (this.user.role == '8') {
-        this.$router.push({ path: '/vipCenter/index', query: { num: '1' } });
-      } else if (this.user.role == '0' || this.user.role == '1') {
-        this.$router.push({ path: '/superAdminCenter/index', query: { num: '1' } });
+      if (this.user.role) {
+        if (this.user.role == '4' || this.user.role == '5' || this.user.role == '6' || this.user.role == '7') {
+          this.$router.push({ path: '/userCenter/index', query: { num: '1' } });
+        } else if (this.user.role == '3') {
+          this.$router.push({ path: '/adminCenter/index', query: { num: '1' } });
+        } else if (this.user.role == '8') {
+          this.$router.push({ path: '/vipCenter/index', query: { num: '1' } });
+        } else if (this.user.role == '0' || this.user.role == '1') {
+          this.$router.push({ path: '/superAdminCenter/index', query: { num: '1' } });
+        } else {
+          this.$router.push('/market/index');
+        }
       } else {
-        this.$router.push('/market/index');
+        this.$router.push({ path: '/kjpdCenter/index', query: { num: '1' } });
       }
     },
     async zhuxiao() {

+ 2 - 2
src/layout/userCenter/heads.vue

@@ -9,8 +9,8 @@
           <el-col :span="12" class="left">
             <span>欢迎来到中科在线(长春)</span>
           </el-col>
-          <el-col :span="12" class="right" v-if="user || user.name || user.adminuser">
-            <span>{{ user.name || user.adminuser }}</span>
+          <el-col :span="12" class="right" v-if="user || user.name || user.adminuser || user.room_id">
+            <span>{{ user.name || user.adminuser || user.title }}</span>
             <el-button type="danger" size="mini" @click="zhuxiao">退出登录</el-button>
           </el-col>
         </div>

+ 2 - 0
src/store/user/login.js

@@ -95,8 +95,10 @@ const actions = {
     return res;
   },
   async logout({ commit }, payload) {
+    window.localStorage.removeItem('user');
     let key = localStorage.removeItem('token');
     const res = await this.$axios.$post(api.logout, { key: key });
+
     commit('deleteUser');
   },
   async update({ commit }, payload) {

+ 2 - 1
src/views/hallList/parts/kjpdlist.vue

@@ -44,7 +44,8 @@ export default {
     },
     //管理进入
     async adminBtn(item) {
-      if (this.user.uid) {
+      console.log(this.user);
+      if (this.user.room_id) {
         this.$router.push({ path: '/kjpdCenter/index', query: { num: '1' } });
       } else {
         this.$router.push({ path: '/hallList/kjpdLogin' });