Merge branch 'dev' into bluestar-dev

src/api/base_api.js

@@ -76,7 +76,7 @@ export default class API {
       // _vIn.$router.push({
       //   path: '/login/index?rd=' + encodeURIComponent(href.replace(/.*?\/\/.*?\//gi, '/'))
       // })
-      window.location.href = `${webConf.others.loginUrl}'?rd=${encodeURIComponent(window.location.href)}`
+      window.location.href = `${webConf.others.loginUrl}?rd=${encodeURIComponent(window.location.href)}`
     }
   }
 

src/components/beforeEnter/Before.js

@@ -6,7 +6,7 @@ export default class Before {
     this.opt = opt || {}
     // 免登录列表
     this.whiteList = ['login-normal', 'login-code', 'login-forget', 'studentHelp', 'teacherHelp']
-    this.isMobile = /android|iphone|ipad|ipod/i.test(UA)
+    this.isMobile = /iphone/i.test(UA) || (/android/i.test(UA) && /mobile/i.test(UA))
   }
 
   async update(to, from, next) {

src/components/editor.vue

@@ -10,7 +10,7 @@ export default {
   name: 'VEditor',
   props: {
     value: { type: String },
-    disabled: { type: Boolean, default: null }
+    disabled: { type: Boolean, default: false }
   },
   data() {
     return {
@@ -49,16 +49,7 @@ export default {
           '/',
           {
             name: 'basicstyles',
-            items: [
-              'Bold',
-              'Italic',
-              'Underline',
-              'Strike',
-              'Subscript',
-              'Superscript',
-              '-',
-              'RemoveFormat'
-            ]
+            items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat']
           },
           {
             name: 'paragraph',
@@ -86,14 +77,12 @@ export default {
         ]
       }
 
-      if (this.disabled !== null) {
-        config.readOnly = this.disabled
-      }
+      // if (this.disabled !== null) {
+      //   console.log(this.disabled)
+      //   config.readOnly = this.disabled
+      // }
 
-      const editor = (this.ckEditor = CKEDITOR.replace(
-        this.textareaElementId,
-        config
-      ))
+      const editor = (this.ckEditor = CKEDITOR.replace(this.textareaElementId, config))
       editor.on('instanceReady', () => {
         const data = this.value
         editor.fire('lockSnapshot')
@@ -118,6 +107,7 @@ export default {
             editor.fire('unlockSnapshot')
           }
         })
+        editor.setReadOnly(this.disabled)
       })
     },
     bindEvent() {

src/modules/viewer/components/common/editor.vue

@@ -10,7 +10,7 @@ export default {
   name: 'VEditor',
   props: {
     value: { type: String },
-    disabled: { type: Boolean, default: null }
+    disabled: { type: Boolean, default: false }
   },
   data() {
     return {
@@ -49,16 +49,7 @@ export default {
           '/',
           {
             name: 'basicstyles',
-            items: [
-              'Bold',
-              'Italic',
-              'Underline',
-              'Strike',
-              'Subscript',
-              'Superscript',
-              '-',
-              'RemoveFormat'
-            ]
+            items: ['Bold', 'Italic', 'Underline', 'Strike', 'Subscript', 'Superscript', '-', 'RemoveFormat']
           },
           {
             name: 'paragraph',
@@ -85,14 +76,13 @@ export default {
           { name: 'insert', items: ['Image', 'Table', 'HorizontalRule'] }
         ]
       }
-      if (this.disabled !== null) {
-        config.readOnly = this.disabled
-      }
 
-      const editor = (this.ckEditor = CKEDITOR.replace(
-        this.textareaElementId,
-        config
-      ))
+      // if (this.disabled !== null) {
+      //   console.log(this.disabled)
+      //   config.readOnly = this.disabled
+      // }
+
+      const editor = (this.ckEditor = CKEDITOR.replace(this.textareaElementId, config))
       editor.on('instanceReady', () => {
         const data = this.value
         editor.fire('lockSnapshot')
@@ -117,6 +107,7 @@ export default {
             editor.fire('unlockSnapshot')
           }
         })
+        editor.setReadOnly(this.disabled)
       })
     },
     bindEvent() {

src/modules/viewer/components/common/upload.vue

@@ -10,23 +10,18 @@
       </template>
     </el-upload>
     <div class="file-list" v-if="fileList.length">
-      <div class="file-list-item" v-for="(fileUrl, index) in fileList" :key="index">
-        <a :href="fileUrl" target="_blank">
+      <div class="file-list-item" v-for="(item, index) in fileList" :key="index">
+        <a :href="item.url" :download="item.name" target="_blank">
           <i class="el-icon-document"></i>
-          {{ fileUrl | fileName }}
+          {{ item.name }}
         </a>
         <div>
-          <a
-            href="javascript:;"
-            @click="handleRemove(index)"
-            style="margin-right:10px;"
-            v-if="!disabled"
-          >
+          <a href="javascript:;" @click="handleRemove(index)" style="margin-right: 10px" v-if="!disabled">
             <el-tooltip effect="dark" content="删除">
               <i class="el-icon-delete"></i>
             </el-tooltip>
           </a>
-          <a :href="fileUrl" :download="fileUrl | fileName" target="_blank">
+          <a :href="item.url" :download="item.name" target="_blank">
             <el-tooltip effect="dark" content="下载">
               <i class="el-icon-download"></i>
             </el-tooltip>
@@ -55,36 +50,39 @@ export default {
     value: {
       immediate: true,
       handler(value) {
-        if (value) {
-          if (Array.isArray(value)) {
-            this.fileList = value.map(item => {
-              return item.url || item
-            })
-          } else {
-            this.fileList = [value]
-          }
+        if (!value) {
+          return
+        }
+        let fileList = []
+        if (Array.isArray(value)) {
+          fileList = value.map(item => {
+            return { name: item.name || item, url: item.url || item }
+          })
+        } else {
+          fileList.push({ name: '附件下载', url: value })
         }
+        this.fileList = fileList
       }
     }
   },
-  filters: {
-    fileName(value) {
-      return value ? value.split('/').pop() : ''
-    }
-  },
   methods: {
     httpRequest(xhr) {
-      api.uploadFile({ file: xhr.file }).then(response => {
-        if (response.success) {
-          if (Array.isArray(this.value)) {
-            this.fileList.push(response.url)
-            this.$emit('input', this.fileList)
-          } else {
-            this.fileList = [response.url]
-            this.$emit('input', response.url)
+      api
+        .uploadFile({ file: xhr.file })
+        .then(response => {
+          if (response.success) {
+            if (Array.isArray(this.value)) {
+              this.fileList.push({ name: xhr.file.name, url: response.url })
+              this.$emit('input', this.fileList)
+            } else {
+              this.fileList = [response.url]
+              this.$emit('input', response.url)
+            }
           }
-        }
-      })
+        })
+        .catch(error => {
+          this.$message.error(error.message)
+        })
     },
     handleRemove(index) {
       this.fileList.splice(index, 1)

src/modules/viewer/components/live/chapterLive.vue

@@ -68,7 +68,7 @@ export default {
       const live = this.live
       if (this.isLiveEnd && this.hasRecord) {
         // 查看回放
-        return live.record_url
+        return live.record_url.replace(/^http:|^https:/, '')
       } else {
         // 直播
         live.user_name = live.user_name || this.nickName

src/modules/viewer/components/work/chapterExam.vue

@@ -224,6 +224,7 @@ export default {
       // 提交参数
       const params = { answers: JSON.stringify(answers), type: 1 }
       // 请求接口
+      this.submitLoading = true
       this.handleSubmitRequest(params)
     },
     // 自动提交
@@ -236,7 +237,7 @@ export default {
         const params = { answers: JSON.stringify(answers), type: 0 }
         // 请求接口
         this.handleSubmitRequest(params)
-      }, 10000)
+      }, 3000)
     },
     // 处理请求接口答案数据
     handleSubmitData() {
@@ -266,7 +267,6 @@ export default {
     },
     // 请求提交接口
     handleSubmitRequest(params) {
-      this.submitLoading = true
       params.paper_type = 0
       api
         .submitCourseExam(this.sid, this.cid, this.pid, params)

src/modules/viewer/components/work/courseExam.vue

@@ -171,16 +171,16 @@ export default {
   },
   methods: {
     // 初始化
-    init() {
+    async init() {
       this.clearTimer()
       // 自动获取考试状态
-      this.autoCheckExamStatus()
+      await this.autoCheckExamStatus()
       // 获取试题
       this.getExam()
     },
     // 获取考试状态
-    getExamStatus() {
-      api.getCourseExamStatus(this.sid, this.cid, this.pid).then(response => {
+    async getExamStatus() {
+      await api.getCourseExamStatus(this.sid, this.cid, this.pid).then(response => {
         this.status = response
         if (this.isSubmited || response.examination_status === '90') {
           this.checkStatusTimer && clearInterval(this.checkStatusTimer)
@@ -188,9 +188,9 @@ export default {
       })
     },
     // 自动获取考试状态
-    autoCheckExamStatus() {
+    async autoCheckExamStatus() {
       // 获取试题状态
-      this.getExamStatus()
+      await this.getExamStatus()
       this.checkStatusTimer && clearInterval(this.checkStatusTimer)
       this.checkStatusTimer = setInterval(this.getExamStatus, 5000)
     },
@@ -276,6 +276,7 @@ export default {
       // 提交参数
       const params = { answers: JSON.stringify(answers), type: 1 }
       // 请求接口
+      this.submitLoading = true
       this.handleSubmitRequest(params)
     },
     // 自动提交
@@ -288,7 +289,7 @@ export default {
         const params = { answers: JSON.stringify(answers), type: 0 }
         // 请求接口
         this.handleSubmitRequest(params)
-      }, 10000)
+      }, 3000)
     },
     // 处理请求接口答案数据
     handleSubmitData() {
@@ -318,7 +319,6 @@ export default {
     },
     // 请求提交接口
     handleSubmitRequest(params) {
-      this.submitLoading = true
       params.offset = this.offset
       api
         .submitCourseExam(this.sid, this.cid, this.pid, params)

src/modules/viewer/components/work/examItem.vue

@@ -12,13 +12,17 @@
       <!-- 单选 -->
       <el-radio-group v-model="currentValue.user_answer" v-if="type === 1">
         <div class="q-option-item" v-for="item in currentOptions" :key="item.id">
-          <el-radio :class="genClass(item)" :label="item.id"><span v-html="item.abc_option"></span></el-radio>
+          <el-radio :class="genClass(item)" :label="item.id">
+            <div class="q-option-item__answer" v-html="item.abc_option"></div>
+          </el-radio>
         </div>
       </el-radio-group>
       <!-- 多选 -->
       <el-checkbox-group v-model="currentValue.user_answer" v-if="type === 2">
         <div class="q-option-item" v-for="item in currentOptions" :key="item.id">
-          <el-checkbox :class="genClass(item)" :label="item.id"><span v-html="item.abc_option"></span></el-checkbox>
+          <el-checkbox :class="genClass(item)" :label="item.id">
+            <div class="q-option-item__answer" v-html="item.abc_option"></div>
+          </el-checkbox>
         </div>
       </el-checkbox-group>
       <!-- 简答题 -->
@@ -224,6 +228,12 @@ export default {
   padding-left: 20px;
   margin-bottom: 14px;
 }
+.q-option-item__answer {
+  display: inline;
+  ::v-deep * {
+    display: inline;
+  }
+}
 .is-success {
   color: #090;
 }

src/pages/learn/course.vue

@@ -29,7 +29,7 @@
     <!-- <el-button class="rbtn" type="primary" size="medium" icon="el-icon-self-cc-book icon" @click="goCourseAll">{{ $t('pages.learn.course.changeCourse') }}</el-button> -->
   </div>
 
-  <div class="con-box">
+  <div class="con-box" v-loading="loading">
     <ul class="course-list">
       <template v-for="(item, index) in homeList">
         <li v-bind:key="index" class="item">
@@ -99,7 +99,8 @@ export default {
       homeList: [], // 从后台请求
       param: {},
       timeInterval: null,
-      newLiveMsg: {}
+      newLiveMsg: {},
+      loading: false
     }
   },
   mounted () {
@@ -112,11 +113,10 @@ export default {
     // 定时获取最新直播
     this.timeInterval = setInterval(this.getLatestLive, 10000)
 
-    const loading = this.$loading({ lock: true, text: '', spinner: '', background: 'rgba(255, 255, 255, 0.9)' })
     cAction.Course.getLearnFind().then(data => {
       this.find[0].arrItem = data
       this.getAjaxList(true, this.$t('pages.learn.course.goCourseAllStr'))
-    }).catch(e => { this.$message.error(e.message) }).finally(() => { loading.close() })
+    }).catch(e => { this.$message.error(e.message) }).finally(() => { })
   },
   destroyed () {
     if (this.timeInterval) {
@@ -134,12 +134,15 @@ export default {
       this.$router.push({ path: `/app/learn/course-detail/${sid}/${cid}` })
     },
     getAjaxList (bool, str) {
+      this.loading = true
       cAction.Course.getCourseList(bool, this.param).then(json => {
         this.homeList = json
         if (!json.length) {
           this.$message(str)
         }
-      }).catch(e => { this.$message.error(e.message) }).finally(() => {})
+      }).catch(e => { this.$message.error(e.message) }).finally(() => {
+        this.loading = false
+      })
     },
     /**
      * 分类选择 - 选中某一项

src/pages/other/message.vue

@@ -6,7 +6,7 @@
         <template v-for="(item, index) in msgList">
           <el-collapse-item v-bind:key="index" :name="index">
             <template slot="title">
-              <el-badge :is-dot="!item.isShow" class="item">{{ item.title }}</el-badge>
+              <el-badge :is-dot="!item.isShow" class="item">{{ item.title || '系统通知' }}</el-badge>
             </template>
             <div v-html="item.text"></div>
           </el-collapse-item>