bug修复

src/api/index.js

@@ -12,6 +12,7 @@ export default {
     getToken: `users/users/user/getToken`,
     getOtherAccountByPhone: `users/users/user/getOtherAccountByPhone`,
     unbindAccounts: `users/users/user/unbindAccounts`,
+    getUserRolesPermissionMenu: `${host}users/users/user-role/getUserRolesPermissionMenu`,
 
     platformLogList: `nakadai/nakadai/log/platformLogList`,
     logNotification: `nakadai/nakadai/log/logNotification`,

src/layouts/header/index.vue

@@ -10,16 +10,16 @@
         <div class="inner">
             <navbar class="nav-wrap" ref="nav"></navbar>
             
-            <template v-if="token">
+            <template v-if="token || serverToken">
               <div class="user-wrap">
                 <el-dropdown size="medium" @command="menuChange">
                   <div class="user">
                     <el-avatar :size="35" :src="avatar"></el-avatar>
-                    <span class="username">{{ customerName || userName }}</span>
+                    <span class="username">{{ customerName || cName || userName }}</span>
                   </div>
                   <el-dropdown-menu slot="dropdown">
-                    <el-dropdown-item v-if="isIndex" command="index">前往学习</el-dropdown-item>
+                    <el-dropdown-item v-if="isIndex" command="index">前往{{ serverToken ? '教学' : '学习' }}</el-dropdown-item>
-                    <el-dropdown-item v-if="!customerName" command="info">个人中心</el-dropdown-item>
+                    <el-dropdown-item v-if="!customerName && !serverToken" command="info">个人中心</el-dropdown-item>
                     <el-dropdown-item command="logout">退出登录</el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
@@ -29,7 +29,6 @@
                 <img src="@/assets/img/user.png" alt="">
                 <span>登录</span>
             </div>
-            
         </div>
     </div>
 </template>
@@ -38,10 +37,13 @@ import { mapState, mapMutations, mapActions } from "vuex";
 import Setting from "@/setting";
 import util from "@/libs/util";
 import navbar from "../navbar";
+import axios from 'axios'
 export default {
     data() {
         return {
-            token: util.local.get(Setting.tokenKey),
+            token: util.local.get(Setting.tokenKey), // 学生端token
+            serverToken: util.local.get('oc_server_token'), // 教师端token
+            cName: util.cookies.get('customerName'),
             isIndex: Setting.whiteList.find(e => e === this.$route.path), // 是否是在白名单页面
         };
     },
@@ -108,9 +110,19 @@ export default {
         toNew(path) {
           // 如果缓存里有教师端的标识，则前往教师端，否则，打开学生端
           if (util.cookies.get('serverLogin') === 'true' && util.local.get('oc_server_token')) {
-            window.open(process.env.NODE_ENV === 'development' ?
+            const defaultPath = '/station/list' // 默认路径
-              'http://192.168.31.125:8081/#/index' :
+            // 查询教师端的权限
-              `${location.origin}/admin/#/index`)
+            axios.get(`${this.api.getUserRolesPermissionMenu}?platformId=1`, {
+              headers: {
+                token: this.serverToken
+              }
+            }).then(({ data }) => {
+              const list = data.permissionMenu[0].children
+              const route = list.find(e => e.path === defaultPath) ? defaultPath : list[0].path // 如果有默认路由的权限，则跳转到默认路由，否则跳转到第一个
+              window.open(process.env.NODE_ENV === 'development' ?
+                `http://192.168.31.125:8081/#${route}` :
+                `${location.origin}/admin/#${route}`)
+            }).catch(err => {})
           } else {
             window.open(this.$router.resolve(path).href)
           }

src/pages/account/login/index.vue

@@ -368,16 +368,25 @@ export default {
         },
         // 跳转到教师端
         toMang() {
-          util.local.set(Setting.tokenKey, this.token, Setting.tokenExpires)
+          const { token } = this
+          util.local.set('oc_server_token', token, Setting.tokenExpires)
           // 从学生端登录到教师端的标识，教师端需要使用
           util.cookies.set('serverLogin', true, {
             expires: new Date(Date.now() + 15 * 60 * 1000) // 15分钟后过期
           })
-          this.reloadIndex()
+          axios.get(this.api.isClient, {
-          // 跳转到教师端的重定向页面
+            headers: {
-          location.href = Setting.isDev ?
+              token
-            `http://${location.hostname}:8081/#/redirect?auth=${btoa(this.token)}` :
+            }
-            `${location.origin}/admin/#/redirect?auth=${window.btoa(this.token)}`
+          }).then(({ data }) => {
+            // 如果是客户
+            data.customerName && util.cookies.set('customerName', data.customerName)
+            this.reloadIndex()
+            // 跳转到教师端的重定向页面
+            location.href = Setting.isDev ?
+              `http://${location.hostname}:8081/#/redirect?auth=${btoa(this.token)}` :
+              `${location.origin}/admin/#/redirect?auth=${window.btoa(this.token)}`
+          }).catch(res => {})
         },
         // 选择端
         selectRole(val) {

src/pages/match/list/index.vue

@@ -461,7 +461,7 @@ export default {
             }
             dd {
                 padding: 5px 15px;
-                color: #4c4c4c;
+                color: #6a6a6a;
                 font-size: 16px;
                 white-space: nowrap;
                 cursor: pointer;

src/pages/station/preview/index.vue

@@ -20,7 +20,7 @@
                         <div class="excel-mask1" style="height: 48px;"></div>
                     </template>
                 </template>
-                <div class="pdf inner" v-else-if="pdfSrc">
+                <div class="pdf" v-else-if="pdfSrc">
                     <p class="arrow">
                         <span @click="changePdfPage(0)" class="turn el-icon-arrow-left"
                                 :class="{grey: currentPage==1}"></span>
@@ -53,7 +53,12 @@
                                 <div class="section" v-if="item.subsectionList.length">
                                     <p class="sectionName" :class="{active: curLink === `${item.name}${section.name}`}" v-for="(section,i) in item.subsectionList" :key="i" @click="preview(section, item.name)">
                                         <img v-if="section.fileType === 'pptx'" src="@/assets/img/exts/ppt.png" alt="">
-                                        <img v-else src="@/assets/img/exts/video.png" alt="">
+                                        <img v-else-if="section.fileType === 'mp4'" src="@/assets/img/exts/video.png" alt="">
+                                        <img v-else-if="section.fileType === 'doc' || section.fileType === 'docx'" src="@/assets/img/exts/word.png" alt="">
+                                        <img v-else-if="section.fileType === 'pptx'" src="@/assets/img/exts/ppt.png" alt="">
+                                        <img v-else-if="section.fileType === 'txt'" src="@/assets/img/exts/txt.png" alt="">
+                                        <img v-else-if="section.fileType === 'pdf'" src="@/assets/img/exts/pdf.png" alt="">
+                                        <img v-else src="@/assets/img/exts/pic.png" alt="">
                                         {{ section.name }}
                                     </p>
                                 </div>
@@ -238,6 +243,7 @@ export default {
                 this.coverUrl = row.fileUrl;
             } else if (row.fileType == "pdf") {
                 this.pdfSrc = row.fileUrl;
+                console.log("🚀 ~ file: index.vue ~ line 246 ~ preview ~ this.pdfSrc", this.pdfSrc)
                 this.pdfVisible = true;
             } else {
                 this.$get(`${this.api.curriculumGetSubsection}/${row.id}`).then(res => {

src/store/modules/user.js

@@ -79,10 +79,15 @@ export default {
         },
         logout({ commit, state, dispatch }) {
             return new Promise((resolve, reject) => {
-                util.local.remove(Setting.storeKey);
+              if (util.local.get(Setting.storeKey)) {
-                util.local.remove(Setting.tokenKey);
+                util.local.remove(Setting.storeKey)
-                location.reload();
+                util.local.remove(Setting.tokenKey)
-                resolve();
+              } else {
+                util.local.remove('oc_server_token')
+                util.local.remove('oc_server_store')
+              }
+              location.reload()
+              resolve()
             });
         },
         setInfo({ state, commit }, info) {