Merge branch 'dev' of http://120.79.166.78:19005/zhongzheng-edu/saas_pc into dev

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

@@ -586,6 +586,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1271,6 +1282,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -1316,7 +1331,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

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

@@ -98,7 +98,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
                           >
@@ -802,6 +807,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1242,6 +1258,7 @@ export default {
 
     changeIndex(index) {
       this.current = index;
+      this.getCollectInfo(this.current);
     },
     nextQuestion() {
       if (this.current >= this.questionList.length - 1) {
@@ -1252,6 +1269,7 @@ export default {
         return;
       }
       this.current++;
+      this.getCollectInfo(this.current);
     },
     prevQuestion() {
       if (this.current == 0) {
@@ -1262,6 +1280,7 @@ export default {
         return;
       } else {
         this.current--;
+        this.getCollectInfo(this.current);
       }
     },
     isRight(item, index) {
@@ -1410,11 +1429,28 @@ export default {
       return count;
     },
 
-    collect() {
-      this.$message({
-        message: "试做题目，不支持收藏~",
-        type: "warning",
-      });
+    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;
     },
     submit() {
@@ -2089,6 +2125,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -2134,7 +2174,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

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

@@ -576,6 +576,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1322,6 +1333,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -1367,7 +1382,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

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

@@ -586,6 +586,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1294,6 +1305,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -1339,7 +1354,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

src/pages/bank-exam/index.vue

@@ -827,6 +827,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">
                   <div class="title">答题卡</div>
                   <div class="time" v-if="allTimes">
@@ -2688,6 +2699,10 @@ export default {
               line-height: 40px;
               border-bottom: 1px solid #eeeeee;
 
+              .back-btn {
+                width: 160px;
+              }
+
               .title {
                 float: left;
                 font-size: 16px;
@@ -2748,7 +2763,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

src/pages/course-detail/index.vue

@@ -1226,7 +1226,12 @@
                       <div class="course-menu clearfix">
                         <div class="left-box">
                           <div class="left-box__body">
-                            {{ goodsData.buyNote }}
+                            <div
+                              v-html="
+                                goodsData.buyNote &&
+                                goodsData.buyNote.replace(/\n|\r\n/g, '<br>')
+                              "
+                            ></div>
                           </div>
                         </div>
                         <div class="right-box">

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

@@ -176,7 +176,7 @@
                                 <el-button
                                   v-if="section.recordStatus == -1"
                                   type="primary"
-                                  @click="toDo(section, item.major, 0)"
+                                  @click="toDo(section, item.majorId, 0)"
                                   class="btn"
                                   >开始做题</el-button
                                 >

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

@@ -612,7 +612,32 @@ export default {
 
         if (item.learnStatus == 1) {
           //跳转第三方h5
-          window.open("http://admin.zhujianpeixun.com/", "_blank");
+
+          const confirmText = [
+            "您的学习账号已经开通，请按照步骤操作，进行学习。",
+            "1.点击【跳转学习网址】按钮",
+            "2.打开学习网址后，选择【个人用户】进行登录",
+            "(1)账号：您个人的身份证号码",
+            "(2)密码：身份证号码，再加111111",
+          ];
+          const newDatas = [];
+          const h = this.$createElement;
+          for (const i in confirmText) {
+            newDatas.push(h("p", null, confirmText[i]));
+          }
+          this.$confirm(h("div", null, newDatas), "温馨提示", {
+            confirmButtonText: "跳转学习网址",
+            cancelButtonText: "关闭",
+            closeOnClickModal: false,
+            closeOnPressEscape: false,
+            distinguishCancelAndClose: false,
+            showClose: false,
+          })
+            .then((_) => {
+              window.open("http://admin.zhujianpeixun.com/", "_blank");
+            })
+            .catch((_) => {});
+
           return;
         } else {
           this.$message({

src/pages/subject/collect-bank.vue

@@ -779,6 +779,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1843,6 +1854,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -1888,7 +1903,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

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

@@ -779,6 +779,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1840,6 +1851,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -1885,7 +1900,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

src/pages/subject/wrong-bank.vue

@@ -779,6 +779,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1852,6 +1863,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -1897,7 +1912,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {

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

@@ -779,6 +779,17 @@
                 </div>
               </div>
               <div class="right-box">
+                <div class="right-box__header">
+                  <el-button
+                    type="primary"
+                    round
+                    plain
+                    size="small"
+                    class="back-btn"
+                    @click="$router.back(-1)"
+                    >返回</el-button
+                  >
+                </div>
                 <div class="right-box__header">答题卡</div>
                 <div class="right-box__body">
                   <div class="card">
@@ -1842,6 +1853,10 @@ export default {
               color: #333333;
               text-align: center;
               border-bottom: 1px solid #eeeeee;
+
+              .back-btn {
+                width: 160px;
+              }
             }
 
             &__body {
@@ -1887,7 +1902,7 @@ export default {
                 }
 
                 &__content {
-                  height: 410px;
+                  height: 630px;
                   overflow-y: scroll;
 
                   &::-webkit-scrollbar {