xiufu bug

src/apis/login.js

@@ -110,7 +110,7 @@ export default {
    * 找回密码
    */
 	forgetUser(data) {
-		return myRequest({
+		return request({
 			url: '/app/common/register_forget',
 			method: 'post',
 			data: data,

src/axios.js

@@ -1,13 +1,13 @@
 import axios from 'axios'
 import store from './store'
-// export const BASE_URL = 'https://api.xyyxt.net'   //release
-export const BASE_URL = 'http://42.192.164.187:19005'    //test
+export const BASE_URL = 'https://api.xyyxt.net'   //release
+// export const BASE_URL = 'http://42.192.164.187:19005'    //test
 export const tenantId = '867735392558919680'
 
 
 //图片上传api
-// export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
-export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
+export const BASE_IMG_URL = 'https://file.xyyxt.net/'     //release
+// export const BASE_IMG_URL = 'https://file-dev.xyyxt.net/'  //test
 
 import tools from './common/tools'
 import router from './router'
@@ -35,13 +35,12 @@ const err = (error) => {
 
 // request interceptor(请求拦截器)
 request.interceptors.request.use(config => {
-  console.log(config,'config')
   const token = tools.getToken()
   if (token && !config.noToken) {
     config.headers['AuthorizationToken'] = 'WX ' + token // 让每个请求携带自定义 token 请根据实际情况自行修改
   }
   config.headers['TenantId'] = tenantId
-
+  
   return config
 }, err)
 

src/common/tools.js

@@ -36,10 +36,19 @@ export default {
 		}
 	},
 
+  setUuid(id) {
+    sessionStorage.setItem('uuid',id)
+  },
+
+  getUuid() {
+    return sessionStorage.getItem('uuid')
+  },
+
   exit() {
     
 		localStorage.removeItem('user_account')
 		localStorage.removeItem('token')
+    sessionStorage.removeItem('uuid')
 		store.state.userInfo = null
 
     if(router.currentRoute.path != '/home') {

src/pages/about/index.vue

@@ -16,31 +16,49 @@
           <ul class="about-nav-list">
             <!--a标签里的title参数固定为数字1-9-->
             <li class="con01">
-              <a href="javascript:void(0)" title="1">学校简介</a>
+              <a href="javascript:void(0)" title="1" @click="jump('about-1')"
+                >学校简介</a
+              >
             </li>
             <li class="con02">
-              <a href="javascript:void(0)" title="2">学校荣誉</a>
+              <a href="javascript:void(0)" title="2" @click="jump('about-2')"
+                >学校荣誉</a
+              >
             </li>
             <li class="con03">
-              <a href="javascript:void(0)" title="3">学校资质</a>
+              <a href="javascript:void(0)" title="3" @click="jump('about-3')"
+                >学校资质</a
+              >
             </li>
             <li class="con04">
-              <a href="javascript:void(0)" title="4">课程体系</a>
+              <a href="javascript:void(0)" title="4" @click="jump('about-4')"
+                >课程体系</a
+              >
             </li>
             <li class="con05">
-              <a href="javascript:void(0)" title="5">学校历程</a>
+              <a href="javascript:void(0)" title="5" @click="jump('about-5')"
+                >学校历程</a
+              >
             </li>
             <li class="con06">
-              <a href="javascript:void(0)" title="6">学校架构</a>
+              <a href="javascript:void(0)" title="6" @click="jump('about-6')"
+                >学校架构</a
+              >
             </li>
             <li class="con07">
-              <a href="javascript:void(0)" title="7">学校师资</a>
+              <a href="javascript:void(0)" title="7" @click="jump('about-7')"
+                >学校师资</a
+              >
             </li>
             <li class="con08">
-              <a href="javascript:void(0)" title="8">办学优势</a>
+              <a href="javascript:void(0)" title="8" @click="jump('about-8')"
+                >办学优势</a
+              >
             </li>
             <li class="con09">
-              <a href="javascript:void(0)" title="9">学校风采</a>
+              <a href="javascript:void(0)" title="9" @click="jump('about-9')"
+                >学校风采</a
+              >
             </li>
           </ul>
           <div style="clear: both"></div>
@@ -705,7 +723,16 @@ export default {
     return {};
   },
   mounted() {},
-  methods: {},
+  methods: {
+    jump(id) {
+      console.dir(this.$el.querySelector("#" + id));
+      this.$el.querySelector("#" + id).scrollIntoView({
+        behavior: "smooth",
+        block: "start",
+        inline: "nearest",
+      });
+    },
+  },
 };
 </script>
 

src/pages/bank-exam-all-explain/index.vue

@@ -668,7 +668,34 @@ export default {
       checked: false,
       questionList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       lastCount: 0,
       examId: 0,
       goodsId: 0,

src/pages/bank-exam-continue/index.vue

@@ -187,7 +187,12 @@
                         >
                           确认答案
                         </div>
-                        <div class="collect" @click="collect">
+                        <div
+                          class="collect"
+                          @click="
+                            collect(collectList[questionIndex], questionIndex)
+                          "
+                        >
                           <template v-if="!collectList[questionIndex]"
                             ><i class="el-icon-star-off"></i>收藏本题</template
                           >
@@ -253,7 +258,12 @@
                         </div>
                       </div>
                       <div class="question__btns">
-                        <div class="collect" @click="collect">
+                        <div
+                          class="collect"
+                          @click="
+                            collect(collectList[questionIndex], questionIndex)
+                          "
+                        >
                           <template v-if="!collectList[questionIndex]"
                             ><i class="el-icon-star-off"></i>收藏本题</template
                           >
@@ -687,7 +697,12 @@
                         </el-tabs>
                       </div>
                       <div class="question__btns">
-                        <div class="collect" @click="collect">
+                        <div
+                          class="collect"
+                          @click="
+                            collect(collectList[questionIndex], questionIndex)
+                          "
+                        >
                           <template v-if="!collectList[questionIndex]"
                             ><i class="el-icon-star-off"></i>收藏本题</template
                           >
@@ -788,7 +803,12 @@
                         >
                           确认答案
                         </div>
-                        <div class="collect" @click="collect">
+                        <div
+                          class="collect"
+                          @click="
+                            collect(collectList[questionIndex], questionIndex)
+                          "
+                        >
                           <template v-if="!collectList[questionIndex]"
                             ><i class="el-icon-star-off"></i>收藏本题</template
                           >
@@ -859,7 +879,13 @@
                   </div>
                 </div>
                 <div class="right-box__footer">
-                  <div class="submit" @click="submit">交卷</div>
+                  <el-button
+                    type="primary"
+                    :loading="loading"
+                    class="submit"
+                    @click="submit"
+                    >交卷</el-button
+                  >
                 </div>
               </div>
             </div>
@@ -893,7 +919,34 @@ export default {
       questionList: [],
       bankList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       lastTime: 0, //剩余考试时长
       allTimes: 0, //总考试时长
       lastCount: 0,
@@ -901,6 +954,7 @@ export default {
       goodsId: 0,
       moduleId: 0,
       chapterId: 0,
+      loading: false,
       current: 0,
       examData: {},
       orderGoodsId: "",
@@ -983,6 +1037,25 @@ export default {
       }
     },
 
+    /**
+     * 是否做完所有题目
+     */
+    isDoOver() {
+      let questionOverNum = this.questionOverNum(true); //获取已经回答的题目数(包括简答和案例)
+      if (this.questionList.length == questionOverNum) {
+        //全部做完弹窗
+        this.$confirm("您已完成所有题目，快去交卷吧！", "提示", {
+          confirmButtonText: "立即交卷",
+          cancelButtonText: "暂不交卷",
+          type: "warning",
+        })
+          .then(() => {
+            this.examSubmit();
+          })
+          .catch(() => {});
+      }
+    },
+
     /**
      * 请求题目列表
      */
@@ -1008,6 +1081,7 @@ export default {
     radioSelect(question, questionIndex, optionsId) {
       if (this.questionList[questionIndex].ques) return;
       this.$set(this.questionList[questionIndex], "ques", optionsId);
+      this.isDoOver();
     },
 
     /**
@@ -1017,6 +1091,7 @@ export default {
     radioSelectChild(questionIndex, jsonIndex, optionsId) {
       if (this.questionList[questionIndex].ques[jsonIndex]) return;
       this.$set(this.questionList[questionIndex].ques, jsonIndex, optionsId);
+      this.isDoOver();
     },
     /**
      * 多选点击确认
@@ -1037,6 +1112,7 @@ export default {
         return;
       }
       this.$set(this.questionList[questionIndex], "ques", arr);
+      this.isDoOver();
     },
     /**
      * @param {Object}
@@ -1062,6 +1138,7 @@ export default {
       }
 
       this.$set(this.questionList[questionIndex].ques, ansIndex, arr);
+      this.isDoOver();
     },
     /**
      * 判断点击确认
@@ -1069,11 +1146,13 @@ export default {
     judgeSelect(question, questionIndex, index) {
       if (question.ques) return;
       this.$set(this.questionList[questionIndex], "ques", index + "");
+      this.isDoOver();
     },
     judgeSelectChild(questionIndex, jsonIndex, index) {
       console.log(this.questionList[questionIndex].ques[jsonIndex]);
       if (this.questionList[questionIndex].ques[jsonIndex]) return;
       this.$set(this.questionList[questionIndex].ques, jsonIndex, index + "");
+      this.isDoOver();
     },
 
     /**
@@ -1148,30 +1227,6 @@ export default {
           this.$set(this.collectList, current, false);
         });
     },
-    collect(state, index) {
-      if (!state) {
-        this.$request
-          .collectQuestion({
-            examId: this.examId,
-            questionId: this.questionList[index].questionId,
-            goodsId: this.goodsId || "",
-            orderGoodsId: this.orderGoodsId,
-          })
-          .then((res) => {
-            this.$set(this.collectList, index, true);
-            this.$message.success("收藏成功");
-            this.getCollectInfo(index);
-          });
-      } else {
-        this.$request
-          .deleteCollectQuestion(this.collectList[index].collectQuestionId)
-          .then((res) => {
-            this.$set(this.collectList, index, false);
-            this.$message.success("取消收藏成功");
-          });
-      }
-      return;
-    },
     isOver(item, index) {
       if (this.questionList[index].ques) {
         if (item.type == 4) {
@@ -1230,6 +1285,7 @@ export default {
 
       question.ques.imageList = question.ansText.imageList;
       question.ques.text = question.ansText.text;
+      this.isDoOver();
 
       console.log(question.ques);
     },
@@ -1254,6 +1310,7 @@ export default {
           this.questionList[questionIndex].jsonStr[jsonIndex].ansText.text ||
           "",
       });
+      this.isDoOver();
     },
 
     changeIndex(index) {
@@ -1481,6 +1538,7 @@ export default {
     },
 
     examSubmit() {
+      this.loading = true;
       let score = 0; //计算总分
       let reportStatus = 0;
       let number = 0; //做对的题目数量
@@ -1506,6 +1564,7 @@ export default {
           }
           allScore += item.score;
           if (item.ques) {
+            console.log(doQuestionNum, "单选");
             doQuestionNum++;
             doQuestionIds.push(item.questionId);
           }
@@ -1569,6 +1628,7 @@ export default {
           }
           allScore += item.score;
           if (item.ques && item.ques.length) {
+            console.log(doQuestionNum, "多选");
             doQuestionNum++;
             doQuestionIds.push(item.questionId);
           }
@@ -1584,18 +1644,24 @@ export default {
           }
           allScore += item.score;
           if (item.ques) {
+            console.log(doQuestionNum, "判断");
             doQuestionNum++;
             doQuestionIds.push(item.questionId);
           }
         } else if (item.type == 4) {
           allScore += item.score;
           if (item.ques && item.ques.length) {
+            console.log(doQuestionNum, "案例");
             doQuestionNum++;
             doQuestionIds.push(item.questionId);
           }
         } else if (item.type == 5) {
           allScore += item.score;
-          if (item.ques && (item.ques.imageList || item.ques.text)) {
+          if (
+            item.ques &&
+            (item.ques.imageList.length || item.ques.text.length)
+          ) {
+            console.log(doQuestionNum, "简答");
             doQuestionNum++;
             doQuestionIds.push(item.questionId);
           }
@@ -1630,6 +1696,7 @@ export default {
         })
         .then((res) => {
           this.isSubmit = true;
+          this.loading = false;
           this.$message({
             type: "success",
             message: "交卷成功",
@@ -1660,6 +1727,18 @@ export default {
         .catch((err) => {
           console.log(err, "err");
         });
+
+      //错题集id提交（客观题）
+      this.$request
+        .examWrongRecord({
+          orderGoodsId: this.orderGoodsId,
+          examId: this.examId,
+          goodsId: this.goodsId,
+          questionIds: doWrongQuestionIds,
+          recordId: this.recordId,
+        })
+        .then((res) => {})
+        .catch((err) => {});
     },
 
     /**
@@ -2063,12 +2142,12 @@ export default {
                     margin: 0 auto;
                     width: 140px;
                     height: 32px;
+                    color: #fff;
                     background: #3f8dfd;
                     box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.2);
                     border-radius: 16px;
                     text-align: center;
                     line-height: 32px;
-                    color: #fff;
                     font-size: 16px;
                   }
 
@@ -2254,12 +2333,11 @@ export default {
                 cursor: pointer;
                 width: 140px;
                 height: 32px;
-                background: #3f8dfd;
+                padding: 0;
                 box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.2);
                 border-radius: 16px;
                 line-height: 32px;
                 text-align: center;
-                color: #fff;
                 font-size: 16px;
               }
             }

src/pages/bank-exam-explain/index.vue

@@ -656,7 +656,34 @@ export default {
       checked: false,
       questionList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       examId: 0,
       goodsId: 0,
       moduleId: 0,

src/pages/bank-exam-wrong-explain/index.vue

@@ -668,7 +668,34 @@ export default {
       checked: false,
       questionList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       lastCount: 0,
       examId: 0,
       goodsId: 0,

src/pages/bank-exam/index.vue

@@ -884,7 +884,13 @@
                   </div>
                 </div>
                 <div class="right-box__footer">
-                  <div class="submit" @click="submit">交卷</div>
+                  <el-button
+                    type="primary"
+                    :loading="loading"
+                    class="submit"
+                    @click="submit"
+                    >交卷</el-button
+                  >
                 </div>
               </div>
             </div>
@@ -922,7 +928,35 @@ export default {
       goodsDetail: {},
       bankList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
+      loading: false,
       needPhoto: false,
       lastTime: 0, //剩余考试时长
       allTimes: 0, //总考试时长
@@ -1089,15 +1123,13 @@ export default {
       let questionOverNum = this.questionOverNum(true); //获取已经回答的题目数(包括简答和案例)
       if (this.questionList.length == questionOverNum) {
         //全部做完弹窗
-        this.cgType = 9;
         this.$confirm("您已完成所有题目，快去交卷吧！", "提示", {
           confirmButtonText: "立即交卷",
           cancelButtonText: "暂不交卷",
           type: "warning",
         })
           .then(() => {
-            // confirmButton回调
-            next();
+            this.examSubmit();
           })
           .catch(() => {});
       }
@@ -1457,6 +1489,7 @@ export default {
     radioSelect(question, questionIndex, optionsId) {
       if (this.questionList[questionIndex].ques) return;
       this.$set(this.questionList[questionIndex], "ques", optionsId);
+      this.isDoOver();
 
       if (
         this.questionList[questionIndex].ques !=
@@ -1483,6 +1516,7 @@ export default {
     radioSelectChild(questionIndex, jsonIndex, optionsId) {
       if (this.questionList[questionIndex].ques[jsonIndex]) return;
       this.$set(this.questionList[questionIndex].ques, jsonIndex, optionsId);
+      this.isDoOver();
     },
     /**
      * 多选点击确认
@@ -1503,6 +1537,7 @@ export default {
         return;
       }
       this.$set(this.questionList[questionIndex], "ques", arr);
+      this.isDoOver();
 
       let isWrong = this.questionList[questionIndex].ques.some(
         (quesItem, quesIndex) => {
@@ -1551,6 +1586,7 @@ export default {
       }
 
       this.$set(this.questionList[questionIndex].ques, ansIndex, arr);
+      this.isDoOver();
     },
     /**
      * 判断点击确认
@@ -1558,6 +1594,7 @@ export default {
     judgeSelect(question, questionIndex, index) {
       if (question.ques) return;
       this.$set(this.questionList[questionIndex], "ques", index + "");
+      this.isDoOver();
 
       if (
         this.questionList[questionIndex].ques !=
@@ -1580,6 +1617,7 @@ export default {
       console.log(this.questionList[questionIndex].ques[jsonIndex]);
       if (this.questionList[questionIndex].ques[jsonIndex]) return;
       this.$set(this.questionList[questionIndex].ques, jsonIndex, index + "");
+      this.isDoOver();
     },
 
     /**
@@ -1694,6 +1732,8 @@ export default {
       question.ques.imageList = question.ansText.imageList;
       question.ques.text = question.ansText.text;
 
+      this.isDoOver();
+
       console.log(question.ques);
     },
     ansSubmitChild(question, questionIndex, jsonIndex) {
@@ -1717,6 +1757,8 @@ export default {
           this.questionList[questionIndex].jsonStr[jsonIndex].ansText.text ||
           "",
       });
+
+      this.isDoOver();
     },
 
     changeIndex(index) {
@@ -1983,6 +2025,7 @@ export default {
      * 交卷，跳转报告页
      */
     examSubmit() {
+      this.loading = true;
       let score = 0; //计算总分
       let reportStatus = 0;
       let number = 0; //做对的题目数量
@@ -2148,6 +2191,7 @@ export default {
         })
         .then((res) => {
           this.isSubmit = true;
+          this.loading = false;
           clearInterval(this.timer);
           this.$message({
             type: "success",
@@ -2155,7 +2199,7 @@ export default {
           });
 
           setTimeout(() => {
-            this.$router.push({
+            this.$router.replace({
               path: "/bank-report/" + this.goodsId,
               query: {
                 orderGoodsId: this.orderGoodsId,
@@ -2166,7 +2210,8 @@ export default {
               },
             });
           }, 1000);
-        });
+        })
+        .catch((err) => {});
 
       //错题集id提交（客观题）
       this.$request
@@ -2641,12 +2686,13 @@ export default {
                     margin: 0 auto;
                     width: 140px;
                     height: 32px;
+                    padding: 0;
+                    color: #fff;
                     background: #3f8dfd;
                     box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.2);
                     border-radius: 16px;
                     text-align: center;
                     line-height: 32px;
-                    color: #fff;
                     font-size: 16px;
                   }
 
@@ -2843,12 +2889,11 @@ export default {
                 cursor: pointer;
                 width: 140px;
                 height: 32px;
-                background: #3f8dfd;
+                padding: 0;
                 box-shadow: 0px 0px 6px 0px rgba(0, 0, 0, 0.2);
                 border-radius: 16px;
                 line-height: 32px;
                 text-align: center;
-                color: #fff;
                 font-size: 16px;
               }
             }

src/pages/course-detail/index.vue

@@ -1531,6 +1531,11 @@
                                         预览
                                       </div>
                                       <div
+                                        v-if="
+                                          courseHandoutsData.canDownload == 1
+                                            ? true
+                                            : false
+                                        "
                                         class="btn"
                                         @click="
                                           printView(
@@ -1543,6 +1548,11 @@
                                         打印
                                       </div>
                                       <div
+                                        v-if="
+                                          courseHandoutsData.canDownload == 1
+                                            ? true
+                                            : false
+                                        "
                                         class="btn"
                                         @click="
                                           download(
@@ -2192,6 +2202,7 @@ export default {
       // 单击内部链接时触发 (目前我没有遇到使用场景)
       page: 0,
       bgColor: "#ccc",
+      answerTimer: null,
       recordObj: {},
       showInfoDetailModal: false,
       showStampDetailModail: false,
@@ -2251,6 +2262,7 @@ export default {
       photoList: [],
       noteTotal: 0,
       duration: 0,
+      answerTimer: null,
       noteParams: {
         pageNum: 1,
         // pageSize: 4,
@@ -2573,6 +2585,7 @@ export default {
     //     .then((res) => {});
     // }
     this.clears();
+    clearInterval(this.answerTimer);
     clearInterval(this.postTimer);
     clearInterval(this.livingTimer);
   },
@@ -4005,6 +4018,9 @@ export default {
       this.courseDetail(); //课程详情
       this.getGoodsDetail(); //商品详情
       this.getAnswerList(); //答疑列表
+      this.answerTimer = setInterval(() => {
+        this.getAnswerList();
+      }, 5000);
       this.getMenuList(); //学习目录
       this.getReMenuList(); //获取重修目录
       this.getNoteList(); //获取节笔记
@@ -4838,6 +4854,7 @@ export default {
       let self = this;
       var polyvPlayerContext = this.player;
       if (polyvPlayerContext) {
+        console.log(polyvPlayerContext, "polyvPlayerContext");
         this.playTime = polyvPlayerContext.j2s_getCurrentTime(); //播放时刻
         //	console.log(this.playTime,789,this.photoHistoryList)
         //判断是否需要拍照
@@ -5775,9 +5792,12 @@ export default {
           });
           copydata2.forEach((it) => {
             for (let i = 0; i < data1.length; i++) {
-              const STATUS = data1[i].newArraysAnswerList.some((items) => {
-                return items.answerId === it.assignAnswerId;
-              });
+              let STATUS = null;
+              if (data1[i].newArraysAnswerList) {
+                STATUS = data1[i].newArraysAnswerList.some((items) => {
+                  return items.answerId === it.assignAnswerId;
+                });
+              }
               if (STATUS) {
                 data1[i].newArraysAnswerList.push(it);
                 break;
@@ -5868,11 +5888,11 @@ export default {
       var polyvPlayerContext = this.player;
       let noteDate = this.$tools.getZeroTime();
       let noteSecond = polyvPlayerContext.j2s_getCurrentTime();
+      console.log(noteSecond, "noteSecond");
       if (!noteSecond) {
         if (noteSecond == 0) {
           //播放结束
-          noteSecond = polyvPlayerContext.j2s_getDuration();
-          console.log(noteSecond, 63398);
+          noteSecond = polyvPlayerContext.j2s_getCurrentTime();
         }
         if (!noteSecond) {
           this.$message({

src/pages/course-exam/index.vue

@@ -923,7 +923,34 @@ export default {
       goodsDetail: {},
       bankList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       needPhoto: false,
       lastTime: 0, //剩余考试时长
       allTimes: 0, //总考试时长

src/pages/goods-detail/bank-detail.vue

@@ -1051,7 +1051,34 @@ export default {
         current: 0,
       },
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       recommendList: [],
     };
   },

src/pages/goods-detail/course-detail.vue

@@ -470,7 +470,34 @@ export default {
         current: 0,
       },
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       goodsAuditionConfigIdList: [], //试听列表
       listenConfigList: [],
       vid: "",

src/pages/home/index.vue

@@ -181,6 +181,7 @@
                       <el-input
                         autocomplete="new-password"
                         v-model="loginForm.account"
+                        @keyup.enter.native="login"
                         placeholder="请输入手机号或身份证号"
                       ></el-input>
                     </el-form-item>
@@ -192,6 +193,7 @@
                         type="password"
                         v-model="loginForm.pwd"
                         placeholder="请输入密码"
+                        @keyup.enter.native="login"
                       ></el-input>
                     </el-form-item>
                   </div>
@@ -900,6 +902,7 @@ export default {
               if (res.data.full_info) {
                 localStorage.setItem("user_account", res.data.user_account);
                 localStorage.setItem("token", res.data.token);
+                this.$tools.setUuid(new Date().valueOf() + "");
                 this.getInfo();
               } else {
                 this.indexUserAccount = res.data.user_account;
@@ -956,6 +959,7 @@ export default {
               });
               localStorage.setItem("user_account", this.indexUserAccount);
               localStorage.setItem("token", this.indexToken);
+              this.$tools.setUuid(new Date().valueOf() + "");
               this.getInfo();
             })
             .catch((err) => {

src/pages/login/index.vue

@@ -50,6 +50,7 @@
                           autocomplete="new-password"
                           placeholder="手机号/身份证号"
                           v-model="loginForm.account"
+                          @keyup.enter.native="login"
                         ></el-input>
                       </el-form-item>
                     </div>
@@ -60,6 +61,7 @@
                           placeholder="密码"
                           :type="loginPwdShow ? 'text' : 'password'"
                           v-model="loginForm.pwd"
+                          @keyup.enter.native="login"
                         >
                           <i
                             @click="loginPwdShow = !loginPwdShow"
@@ -956,7 +958,7 @@ export default {
               if (res.data.full_info) {
                 localStorage.setItem("user_account", res.data.user_account);
                 localStorage.setItem("token", res.data.token);
-
+                this.$tools.setUuid(new Date().valueOf() + "");
                 this.getInfo();
               } else {
                 this.user_account = res.data.user_account;
@@ -995,7 +997,7 @@ export default {
                   message: `验证码已发送`,
                   type: "success",
                 });
-                this.countDown = 5;
+                this.countDown = 60;
                 this.countDownTimer = setInterval(() => {
                   if (this.countDown == 0) {
                     clearInterval(this.countDownTimer);
@@ -1030,7 +1032,7 @@ export default {
                   message: `验证码已发送`,
                   type: "success",
                 });
-                this.forgetCountDown = 5;
+                this.forgetCountDown = 60;
                 this.forgetCountDownTimer = setInterval(() => {
                   if (this.forgetCountDown == 0) {
                     clearInterval(this.forgetCountDownTimer);
@@ -1063,6 +1065,7 @@ export default {
               if (res.data.full_info) {
                 localStorage.setItem("user_account", res.data.user_account);
                 localStorage.setItem("token", res.data.token);
+                this.$tools.setUuid(new Date().valueOf() + "");
                 this.getInfo();
               } else {
                 this.user_account = res.data.user_account;
@@ -1150,7 +1153,7 @@ export default {
                   message: `验证码已发送`,
                   type: "success",
                 });
-                this.registerCountDown = 5;
+                this.registerCountDown = 60;
                 this.registerCountDownTimer = setInterval(() => {
                   self.registerCountDown--;
                   if (self.registerCountDown == 0) {
@@ -1182,6 +1185,7 @@ export default {
             //信息完善，获取用户信息
             localStorage.setItem("user_account", res.data.user_account);
             localStorage.setItem("token", res.data.token);
+            this.$tools.setUuid(new Date().valueOf() + "");
             this.getInfo();
           } else {
             //不完善，跳转完善信息页面
@@ -1214,7 +1218,10 @@ export default {
               });
               this.$refs.forgetForm.resetFields();
             })
-            .catch((err) => (this.isForget = false));
+            .catch((err) => {
+              this.isForget = false;
+              this.$message.warning(err.msg);
+            });
         }
       });
     },
@@ -1242,6 +1249,7 @@ export default {
 
               localStorage.setItem("user_account", this.user_account);
               localStorage.setItem("token", this.token);
+              this.$tools.setUuid(new Date().valueOf() + "");
               this.getInfo();
               if (JSON.stringify(this.currentRouter) != {}) {
                 this.$router.push(this.currentRouter);

src/pages/payment/index.vue

@@ -126,7 +126,7 @@ export default {
     console.log(this.checkGoodsList);
     this.isBK = this.$route.query.isBK;
     if (this.checkGoodsList.length <= 0 && !this.$route.params.orderSn) {
-      this.$router.back(-1);
+      this.$router.push({ path: "/" });
       return;
     } else {
       if (this.$route.params.orderSn) {

src/pages/person-center/my-bank/bank-explain-detail/index.vue

@@ -702,7 +702,34 @@ export default {
       orderGoodsId: "",
       examId: "",
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
     };
   },
   mounted() {

src/pages/person-center/my-course/index.vue

@@ -725,6 +725,7 @@ export default {
         this.$request
           .lockLockStatus({
             action: "jxjy",
+            uuid: sessionStorage.getItem("uuid"),
           })
           .then((res) => {
             //有其他端在操作，不能学习

src/pages/subject/collect-bank.vue

@@ -863,7 +863,34 @@ export default {
       questionList: [],
       bankList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       current: 0,
       examId: "",
       explain: "",

src/pages/subject/collect-type-bank.vue

@@ -862,7 +862,34 @@ export default {
       questionList: [],
       bankList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       current: 0,
       type: "",
       explain: "",

src/pages/subject/wrong-bank.vue

@@ -863,7 +863,34 @@ export default {
       orderGoodsId: "",
       bankList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       current: 0,
       examId: "",
       explain: "",

src/pages/subject/wrong-type-bank.vue

@@ -862,7 +862,34 @@ export default {
       questionList: [],
       bankList: [],
       judge: ["错误", "正确"],
-      ast: ["A", "B", "C", "D", "E", "F", "G"],
+      ast: [
+        "A",
+        "B",
+        "C",
+        "D",
+        "E",
+        "F",
+        "G",
+        "H",
+        "I",
+        "J",
+        "K",
+        "L",
+        "M",
+        "N",
+        "O",
+        "P",
+        "Q",
+        "R",
+        "S",
+        "T",
+        "U",
+        "V",
+        "W",
+        "X",
+        "Y",
+        "Z",
+      ],
       current: 0,
       type: "",
       explain: "",

src/router/index.js

@@ -3,6 +3,7 @@ import Router from 'vue-router'
 import store from '../store/index'
 import request from '@/request'
 import { Notification, MessageBox, Message } from 'element-ui'
+import tools from '../common/tools'
 Vue.use(Router)
 
 let bankAdmin = ['/person-center/bank-record','/person-center/my-bank/index','/person-center/my-collect','/person-center/my-wrong','/person-center/my-bank/bank-detail/','/person-center/my-bank/bank-statistics/','/person-center/my-bank/bank-explain-detail/','/bank-exam-continue/','/bank-exam/','/subject/collect-bank/','/bank-exam-explain/','/bank-report/'];
@@ -325,7 +326,7 @@ router.beforeEach((to,from,next) => {
         store.dispatch('getUserInfo')
       }
 
-      // //题库页面要检测是否需要锁定
+      // // //题库页面要检测是否需要锁定
       // let isBankLock = bankAdmin.some(item => {
       //   return to.path.indexOf(item) != -1
       // })
@@ -337,6 +338,7 @@ router.beforeEach((to,from,next) => {
       //     request
       //       .lockLockStatus({
       //         action: "bank",
+      //         uuid:tools.getUuid()
       //       })
       //       .then((res) => {
       //         //有其他端在操作，不能学习
@@ -353,12 +355,14 @@ router.beforeEach((to,from,next) => {
       //         //可以学习，开启锁定
       //           canToBank = 1;
       //         request.lockLockAction({
-      //           action:'bank'
+      //           action:'bank',
+      //           uuid:tools.getUuid()
       //         }).then(res => {
       //         })
       //         canToBank = setInterval(() => {
       //           request.lockLockAction({
-      //             action:'bank'
+      //             action:'bank',
+      //             uuid:tools.getUuid()
       //           }).then(res => {
                   
       //           })
@@ -385,7 +389,8 @@ router.beforeEach((to,from,next) => {
       //     clearInterval(canToBank)
       //     canToBank = null;
       //     request.lockDelLock({
-      //       action:'bank'
+      //       action:'bank',
+      //       uuid:tools.getUuid()
       //     }).then(res => {
             
       //     })
@@ -401,12 +406,14 @@ router.beforeEach((to,from,next) => {
         
       //   //没有执行定时器，开启锁定
       //   if(!canToCourse) {
+          
       //     request.goodsDetail(to.params.goodsId).then(res => {
       //       //继续教育锁定
       //       if(res.data.educationName == '继续教育') {
       //         request
       //           .lockLockStatus({
       //             action: "jxjy",
+      //             uuid:tools.getUuid()
       //           })
       //           .then((res) => {
       //             //有其他端在操作，不能学习
@@ -423,12 +430,14 @@ router.beforeEach((to,from,next) => {
       //             //可以学习，开启锁定
       //             canToCourse = 1;
       //             request.lockLockAction({
-      //               action:'jxjy'
+      //               action:'jxjy',
+      //               uuid:tools.getUuid()
       //             }).then(res => {
       //             })
       //             canToCourse = setInterval(() => {
       //               request.lockLockAction({
-      //                 action:'jxjy'
+      //                 action:'jxjy',
+      //                 uuid:tools.getUuid()
       //               }).then(res => {
                       
       //               })
@@ -459,7 +468,8 @@ router.beforeEach((to,from,next) => {
       //     clearInterval(canToCourse)
       //     canToCourse = null;
       //     request.lockDelLock({
-      //       action:'jxjy'
+      //       action:'jxjy',
+      //       uuid:tools.getUuid()
       //     }).then(res => {
             
       //     })

src/store/index.js

@@ -3,6 +3,7 @@ import Vuex from 'vuex'
 import login from '@/apis/login'
 import user from '@/apis/user'
 import common from '@/apis/common'
+import tools from '@/common/tools'
 
 Vue.use(Vuex);
 
@@ -100,6 +101,9 @@ export default new Vuex.Store({
       return new Promise(resolve => {
         login.getInfo().then(res => {
           context.commit('setUserInfo', res.data)
+          if(!tools.getUuid()) {
+            tools.setUuid(new Date().valueOf() + "")
+          }
           resolve()
         }).catch(err => {})
       })