bug修复

src/api/index.js

@@ -1,8 +1,8 @@
 import Setting from "@/setting";
 
 const host = Setting.apiBaseURL
+const uploadURL = Setting.uploadURL
 const host1 = 'http://121.37.12.51/'
-const uploadURL = location.origin + '/'
 
 export default {
     logins: `users/users/user/login`,

src/layouts/navbar/index.vue

@@ -20,7 +20,7 @@ export default {
         return {
             token: util.local.get(Setting.tokenKey),
             isTourist: false,
-            active: this.$route.path,
+            active: '/' + this.$route.path.split('/')[1] + '/list',
             // 登录后的菜单
             loginedMenu: [
                 {
@@ -97,6 +97,17 @@ export default {
             columnActive: this.$route.query.parentId
         };
     },
+    watch: {
+        "$route"(to, from) {
+            let actives = this.actives;
+            for (let i in this.actives) {
+                if (actives[i].includes(this.$route.name)) this.active = `/${i}/list`;
+            }
+            let arr=this.$route.path.split("/");
+            let name =  `/${arr[1]}/list`
+            this.active = name;
+        }
+    },
     mounted() {
         const path = this.$route.path
         this.isTourist = !!Setting.whiteList.find(e => e === path)

src/pages/account/login/index.vue

@@ -328,7 +328,7 @@ export default {
           this.reloadIndex()
           util.successMsg('登录成功')
           this.$router.replace(this.courseId ?
-            `/course/details?id=${this.courseId}` :
+            `/preCourse/details?id=${this.courseId}` :
             this.toMatch ?
               `/touristMatch` :
               '/station')
@@ -387,12 +387,31 @@ export default {
             }
           }).then(({ data }) => {
             // 如果是客户
-            data.customerName && util.cookies.set('customerName', data.customerName)
+            if (data.customerName) {
+              util.cookies.set('customerName', data.customerName)
+            } else {
+              // 查询姓名
+              axios.get(Setting.apiBaseURL + this.api.queryUserInfoDetails, {
+                headers: {
+                  token: this.token
+                }
+              }).then(({ data }) => {
+                this.SET_CUSTOMERNAME(data.result.hrUserInfo.userName)
+                util.cookies.set('customerName', data.result.hrUserInfo.userName)
+              }).catch(err => {})
+            }
+            
             this.reloadIndex()
-            // 跳转到教师端的重定向页面
-            location.href = Setting.isDev ?
-              `http://${location.hostname}:8081/#/redirect?auth=${btoa(this.token)}` :
-              `${location.origin}/admin/#/redirect?auth=${window.btoa(this.token)}`
+            if (this.courseId) {
+              this.$router.replace(`/preCourse/details?id=${this.courseId}`)
+            } else if (this.toMatch) {
+              this.$router.replace(`/touristMatch`)
+            } else {
+              // 跳转到教师端的重定向页面
+              location.href = Setting.isDev ?
+                `http://${location.hostname}:8081/#/redirect?auth=${btoa(this.token)}` :
+                `${location.origin}/admin/#/redirect?auth=${window.btoa(this.token)}`
+            }
           }).catch(res => {})
         },
         // 选择端

src/pages/course/details/index.vue

@@ -173,7 +173,7 @@ export default {
         },
         preview(row, chapterName, showConfirm = 1){
             // 如果没登录，直接去登录
-            if (!util.local.get(Setting.tokenKey) && showConfirm) {
+            if (!util.local.get(Setting.tokenKey) && !util.local.get('oc_server_token') && showConfirm) {
               this.$confirm('请先登录，是否直接前往登录？', "提示", {
                 type: 'success'
               }).then(() => {

src/pages/info/list/index.vue

@@ -229,9 +229,13 @@ export default {
         align-items:flex-start;
     }
     .column-name {
-      padding-left: 10px;
+      padding: 14px 0;
       margin-bottom: 10px;
       font-size: 16px;
+      text-align: center;
+      color: #fff;
+      background-color: #007eff;
+      border-radius: 8px;
     }
     .nav{
         width: 156px;

src/pages/match/details/index.vue

@@ -1,11 +1,11 @@
 <template>
     <div class="wrap index">
         <div class="banner" :style="{backgroundImage: 'url(' + (form.carouselUrl || 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220613/png/1536269450851409920.png') + ')'}"></div>
-        <div class="center">
+        <div class="center-con">
           <div class="center-wrap">
               <breadcrumb ref="breadcrumb" :data="'全部赛事/' + form.name"></breadcrumb>
               <div class="content">
-                  <div class="flex-between">
+                  <div class="tool flex-between">
                       <el-tabs v-model="curType" @tab-click="typeChange">
                           <el-tab-pane v-for="(item, index) in typeList" :key="index" :label="item.name" :name="item.id"></el-tab-pane>
                       </el-tabs>
@@ -299,7 +299,7 @@ export default {
 .l-title {
   font-size: 18px;
 }
-.main .center {
+.main .center-con {
     background: url(../../../assets/img/match-bg1.png) (0px 95px)/auto auto no-repeat,
                 url(../../../assets/img/match-bg2.png) (98% 300px)/auto auto no-repeat;
 }
@@ -318,6 +318,11 @@ export default {
         text-align: center;
         color: #0B1D30;
     }
+    .tool {
+      position: sticky;
+      top: 64px;
+      background-color: #fff;
+    }
     .info .meta{
         padding: 16px 0;
         font-size: 12px;

src/pages/screen/index.vue

@@ -663,14 +663,14 @@ export default {
           this.$post(this.api.studentAssessSchievement, times).then(({ data }) => {
             const times = []
             const series = []
-            data.map(e => {
+            data.map((e, i) => {
               times.push(e.time)
               e.assesScoreRespList.map(n => {
                 const item = courseList.find(j => j.cid == n.curriculumId)
                 if (item) {
                   const name = item.curriculumName
                   if (courseData[name]) {
-                    courseData[name].push(+n.avgScore)
+                    courseData[name][i] = +n.avgScore
                   }
                 }
               })
@@ -684,7 +684,6 @@ export default {
                 smooth: true,
                 symbol: 'circle',
                 symbolSize: 5,
-                showSymbol: false,
                 lineStyle: {
                   normal: {
                     color: colors[index].color1,
@@ -752,6 +751,7 @@ export default {
                 type: 'category',
                 boundaryGap: false,
                 axisLabel:  {
+                  interval: 0,
                   textStyle: {
                     color: "rgba(255,255,255,.9)",
                     fontSize:12,

src/pages/station/preview/index.vue

@@ -102,8 +102,7 @@
         <!-- 购买弹框 -->
         <el-dialog title="温馨提示" :visible.sync="buyVisible" width="420px" center :close-on-click-modal="false">
           <div class="buy">
-            <p class="tips">该课程订阅期限已到期，若需要续费请扫码添加客服咨询“</p>
-            <img src="@/assets/img/wechat-code.jpeg" alt="">
+            <p class="tips">该课程订阅期限已到期，请联系院校管理员续费</p>
           </div>
         </el-dialog>
     </div>
@@ -206,8 +205,8 @@ export default {
         async getChapter() {
             let res = await this.$get(`${this.api.curriculumChapter}/${this.courseId}`);
             this.chapterList = res.chapterList;
-            if (this.overdue && this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) {
-                this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name);
+            if (this.chapterList.length && this.chapterList[0].subsectionList && this.chapterList[0].subsectionList.length) {
+                this.preview(this.chapterList[0].subsectionList[0], this.chapterList[0].name, 1);
             }
         },
         // 插入阿里云播放器脚本
@@ -238,9 +237,9 @@ export default {
           if('mp4,3gp,mov,m4v,avi,dat,mkv,flv,vob,rmvb,rm,qlv'.includes(suf)) return '视频'
           return suf
         },
-        preview(row, chapterName) {
+        preview(row, chapterName, showDia = 0) {
           // 如果没过期，则正常预览，否则显示购买弹框
-          if (this.overdue) {
+          if (this.overdue || showDia) {
             this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称，小节名称有重复的情况，如果只用小节名称判断，会有同时选中多个的情况
             this.playauth = "";
             this.coverUrl = "";
@@ -439,11 +438,14 @@ $height: 700px;
 .page {
     margin: 12px 0;
     .intro {
-        font-size: 16px;
+        font-size: 14px;
         color: #333;
         line-height: 24px;
     }
 }
+.l-title {
+  font-size: 17px;
+}
 .cover{
     flex: 1;
     background-color: #252528;

src/setting.js

@@ -28,7 +28,7 @@ if (isPro) {
     host = "http://121.37.12.51/"; // 测试服
     // host = 'https://www.occupationlab.com/' // 正式服
     host = "http://192.168.31.51:9000/"; // 榕
-    // host = "http://192.168.31.137:9000/"; // 赓
+    // host = "http://192.168.31.116:9000/"; // 赓
 }
 
 const Setting = {

src/store/modules/user.js

@@ -83,6 +83,7 @@ export default {
               util.local.remove(Setting.tokenKey)
               util.local.remove('oc_server_token')
               util.local.remove('oc_server_store')
+              util.cookies.remove('customerName')
               location.reload()
               resolve()
             });