Merge branch 'dev' into enterprise-wmp-dev

src/api/base_api.js

@@ -78,7 +78,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/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

@@ -276,6 +276,7 @@ export default {
       // 提交参数
       const params = { answers: JSON.stringify(answers), type: 1 }
       // 请求接口
+      this.submitLoading = true
       this.handleSubmitRequest(params)
     },
     // 自动提交
@@ -318,7 +319,6 @@ export default {
     },
     // 请求提交接口
     handleSubmitRequest(params) {
-      this.submitLoading = true
       params.offset = this.offset
       api
         .submitCourseExam(this.sid, this.cid, this.pid, params)