wmp问题修改

client/src/action/CourseAction.js

@@ -53,7 +53,8 @@ export default class CourseAction extends BaseACTION {
           status: _cur.is_enabled ? _vIn.$t('action.courseAction.publish') : _vIn.$t('action.courseAction.noPublish'),
           time: cur.begin_date.split(' ')[0] + _vIn.$t('action.courseAction.to') + cur.end_date.split(' ')[0],
           myStatus: '',
-          progress: cur.video_progress
+          progress: cur.video_progress,
+          course_type: cur.course_type
         })
       }
       // callback(json) // 可以不使用callback 因为使用then

client/src/components/learnSysLayout/navigation.vue

@@ -25,13 +25,12 @@ export default {
   components: {},
   data () {
     return {
-      name: window.G.UserInfo.student_info.personal_name || '你好',
+      name: window.G.UserInfo.student_info.personal_name || window.G.UserInfo.nickname || '你好',
       num: 0
     }
   },
   mounted () {
-    console.log(window.G.UserInfo)
-    this.name = window.G.UserInfo.student_info.personal_name || '你好'
+    this.name = window.G.UserInfo.student_info.personal_name || window.G.UserInfo.nickname || '你好'
   },
   methods: {
     goNotify () {

client/src/pages/learn/course.vue

@@ -102,7 +102,9 @@ export default {
         ]
       }],
       homeList: [], // 从后台请求
-      param: {},
+      param: {
+        course_type: 1
+      },
       timeInterval: null,
       newLiveMsg: {}
     }
@@ -138,7 +140,7 @@ export default {
     },
     goCourseContent (e) {
       const cid = e.currentTarget.dataset.cid
-      this.$router.push({ path: `/app/learn/course-detail/${cid}` })
+      this.$router.push({ path: `/app/learn/course-detail/${cid}?v=${this.homeList[0].course_type}` })
     },
     getAjaxList (bool, str) {
       cAction.Course.getCourseList(bool, this.param).then(json => {

client/src/pages/learn/courseDetail.vue

@@ -63,7 +63,7 @@
               </template>
             </div>
           </el-tab-pane>
-          <el-tab-pane label="课程讨论" name="2">
+          <el-tab-pane label="课程讨论" name="2" v-if="isCourseDis === '1'">
             <template v-if="!isPublicShow">
               <div class='pub-ques'>
                 <div class='ask'>
@@ -106,11 +106,11 @@
                   <el-button type="text" @click='gobackDiscuss'>返回问题列表</el-button>
                 </div>
                 <el-form ref="setPublishform" :model="publish" :rules="publishRules">
-                  <el-form-item label="学习计划" prop="title">
-                    <el-input v-model="publish.title" type="text" placeholder="请输入学习计划"></el-input>
+                  <el-form-item label="问题章节" prop="title">
+                    <el-input v-model="publish.title" type="text" placeholder="请输入问题章节"></el-input>
                   </el-form-item>
                   <!--  v-model="publish.content" -->
-                  <div style="line-height: 1.5; font-size: 0.16rem; margin-bottom: 0.2rem;">教材提问</div>
+                  <div style="line-height: 1.5; font-size: 0.16rem; margin-bottom: 0.2rem;">问题内容</div>
                   <textarea id="editor"></textarea>
                   <div style="height: 0.2rem;"></div>
                   <el-form-item>
@@ -228,6 +228,7 @@ export default {
   },
   data () {
     return {
+      isCourseDis: this.getQueryString('v'),
       domLength: 0,
       ckeditor: null,
       activeName: '1',
@@ -782,6 +783,11 @@ export default {
       cAction.Discuss.getCourseDiscussList(this.cid, this.sid, this.param).then(json => {
         this.discussList = json
       }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
+    },
+    getQueryString (name) {
+      const reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i')
+      const r = window.location.search.substr(1).match(reg)
+      if (r != null) return unescape(r[2]); return null
     }
   }
 }