bug fixes

client/src/api/course_api.js

@@ -28,11 +28,11 @@ export default class CourseAPI extends BaseAPI {
    * @param {[string]} cid
    * @param {[string]} sid
    */
-  selectCourse = (cid, sid) => this.post('/v2/education/courses/major', { course_id: cid, semester_id: sid })
+  selectCourse = (cid, sid) => this.post('/v2/education/courses/major', { course_id: cid, semester_id: sid }, { headers: { 'Content-Type': 'application/json' } })
   /**
    * 退课
    * @param {[string]} cid
    * @param {[string]} sid
    */
-  outSelectCourse = (cid, sid) => this.post('/v2/education/courses/drop', { course_id: cid, semester_id: sid })
+  outSelectCourse = (cid, sid) => this.post('/v2/education/courses/drop', { course_id: cid, semester_id: sid }, { headers: { 'Content-Type': 'application/json' } })
 }

client/src/components/beforeEnter/Before.js

@@ -3,36 +3,56 @@ import cAction from '@action'
 import { Message } from 'element-ui'
 
 export default class Before {
-  constructor (opt) {
+  constructor(opt) {
+    const UA = navigator.userAgent
     this.opt = opt || {}
+    // 免登录列表
+    this.whiteList = [
+      'login-normal',
+      'login-code',
+      'login-forget',
+      'studentHelp',
+      'teacherHelp'
+    ]
+    this.isMobile = /android|iphone|ipad|ipod/i.test(UA)
   }
 
-  async update (to, from, next) {
-    if (to.name === 'studentHelp' || to.name === 'teacherHelp') {
-      next()
-    } else if (to.name !== 'login-normal' && to.name !== 'login-code' && to.name !== 'login-forget') { // 所有登录页 不进行登录校验
-      const isLogin = await this.isLogin()
-      if (isLogin) {
-        next()
-      } else {
-        next({ path: '/login/index?rd=' + encodeURIComponent(to.fullPath) }) // 需要传参并再传回来
-      }
-    } else {
+  async update(to, from, next) {
+    // 免登录页面
+    if (this.whiteList.includes(to.name)) {
       next()
+      return
+    }
+    // 检测登录状态
+    const isLogin = await this.isLogin()
+    if (!isLogin) {
+      next({
+        path: '/login/index',
+        query: { rd: encodeURIComponent(to.fullPath) }
+      })
+      return
+    }
+    // 移动端
+    if (this.isMobile && to.name !== 'mobileIndex') {
+      next({ path: '/mobile/list' })
+      return
     }
+    next()
   }
 
   /* 获取用户信息 */
-  isLogin () {
+  isLogin() {
     if (window.G.UserInfo) return true
-    return cAction.Other.getInfo().then(res => {
-      window.G.UserInfo = res
-      return true
-    }).catch(res => {
-      if (res.code !== 80201) {
-        Message({ type: 'error', message: res.message })
-      }
-      return false
-    })
+    return cAction.Other.getInfo()
+      .then((res) => {
+        window.G.UserInfo = res
+        return true
+      })
+      .catch((res) => {
+        if (res.code !== 80201) {
+          Message({ type: 'error', message: res.message })
+        }
+        return false
+      })
   }
 }

client/src/pages/learn/courseDetail.vue

@@ -4,14 +4,16 @@
   <div class="detail-box">
     <div class="box-thd">
       <div class="title" @click="noWantThisCourse">{{headerInfo.title}}
-        <template v-if='headerInfo.isStart && tabs[1].chapterList.currentChapterId'>
-          <el-button class="rbtn" type="primary" size="mini" @click='startLearn' :data-cid='cid' :data-sid='sid' :data-type='tabs[1].chapterList.currentVideoProvider' :data-vid='tabs[1].chapterList.currentChapterId'>继续学习</el-button>
-        </template>
-        <template v-else-if='headerInfo.isStart'>
-          <el-button class="rbtn" type="primary" size="mini" @click='startLearn' :data-cid='cid' :data-sid='sid' :data-type='tabs[1].chapterList.course[0].chapters[0].video_provider' :data-vid='tabs[1].chapterList.course[0].chapters[0].vid'>开始学习</el-button>
-        </template>
-        <template v-else>
-          <el-button class="rbtn" type="primary" size="mini" @click='wantThisCourse'>选课</el-button>
+        <template v-if="tabs[1].chapterList.course[0].chapters[0].vid">
+          <template v-if='headerInfo.isStart && tabs[1].chapterList.currentChapterId'>
+            <el-button class="rbtn" type="primary" size="mini" @click='startLearn' :data-cid='cid' :data-sid='sid' :data-type='tabs[1].chapterList.currentVideoProvider' :data-vid='tabs[1].chapterList.currentChapterId'>继续学习</el-button>
+          </template>
+          <template v-else-if='headerInfo.isStart'>
+            <el-button class="rbtn" type="primary" size="mini" @click='startLearn' :data-cid='cid' :data-sid='sid' :data-type='tabs[1].chapterList.course[0].chapters[0].video_provider' :data-vid='tabs[1].chapterList.course[0].chapters[0].vid'>开始学习</el-button>
+          </template>
+          <template v-else>
+            <el-button class="rbtn" type="primary" size="mini" @click='wantThisCourse'>选课</el-button>
+          </template>
         </template>
       </div>
       <div class="tags">

client/src/router/routes.js

@@ -250,7 +250,7 @@ export default [
       },
       {
         path: 'list',
-        name: 'list',
+        name: 'mobileIndex',
         component: () => import('@/pages/mobileLive/list.vue'),
         props: true
       },