updata

src/modules/exam-module/components/answerCard.vue

@@ -104,7 +104,6 @@ export default {
     changeData: {
       handler(newV, oldV) {
         this.$forceUpdate()
-        console.log(newV)
       },
       deep: true
     }

src/modules/exam-module/src/ExamTopic.vue

@@ -63,7 +63,7 @@
     </div>
     <div class="btn-box" v-show="!topicCard.isShow">
       <div class="padd">
-        <div class="analysis" @click="analyShow" v-if="$route.query.id || $route.query.course_id || $route.query.tag_id">查看解析</div>
+        <div class="analysis" @click="analyShow" v-if="$route.query.course_id || $route.query.tag_id">查看解析</div>
         <div class="btn left" @click="switchQuestions('left')" v-show="currentNum !== 1">上一题</div>
         <div class="btn right" @click="switchQuestions('right')" v-show="nextBtnShow">下一题</div>
       </div>
@@ -72,7 +72,7 @@
     <div class="exam_submit" v-if="isExamSubPop">
       <div class="pop">
         <div class="tit">交卷</div>
-        <div class="txt">您还有题目未回答，确定交卷吗？</div>
+        <div class="txt">{{ subPopText }}</div>
         <div class="btn_box">
           <div class="btn" @click="isExamSubPop = false">继续做题</div>
           <div class="btn btn2" @click="goExamResult;examSubmit(1, true)">交卷</div>
@@ -122,23 +122,7 @@ export default {
         observer: true,
         on: {
           slideChangeTransitionStart: function() {
-            if (_this.swiper.slides[_this.swiper.activeIndex].attributes['data-dId']) {
-              const itemDid = _this.swiper.slides[_this.swiper.activeIndex].attributes['data-dId'].nodeValue
-              const itemCid = _this.swiper.slides[_this.swiper.activeIndex].attributes['data-cId'].nodeValue
-              if (_this.requestData[itemCid]) {
-                if (_this.requestData[itemCid][itemDid]) {
-                  if (_this.requestData[itemCid][itemDid].sign) {
-                    _this.signText = '已标记'
-                  } else {
-                    _this.signText = '标记'
-                  }
-                } else {
-                  _this.signText = '标记'
-                }
-              } else {
-                _this.signText = '标记'
-              }
-            }
+            _this.getIsSign()
             if (this.activeIndex === _this.questionsData.sheet.question_count) {
               _this.topicCard.isShow = true
             } else {
@@ -166,7 +150,8 @@ export default {
       topicCard: {
         isShow: false
       },
-      signText: '标记'
+      signText: '标记',
+      subPopText: '您还有题目未回答，确定交卷吗？'
     }
   },
   computed: {
@@ -203,8 +188,31 @@ export default {
       this.initData(0)
     }
     this.scrollDom()
+    setTimeout(() => {
+      this.getIsSign()
+    }, 500)
   },
   methods: {
+    getIsSign() {
+      const _this = this
+      if (_this.swiper.slides[_this.swiper.activeIndex].attributes['data-dId']) {
+        const itemDid = _this.swiper.slides[_this.swiper.activeIndex].attributes['data-dId'].nodeValue
+        const itemCid = _this.swiper.slides[_this.swiper.activeIndex].attributes['data-cId'].nodeValue
+        if (_this.requestData[itemCid]) {
+          if (_this.requestData[itemCid][itemDid]) {
+            if (_this.requestData[itemCid][itemDid].sign) {
+              _this.signText = '已标记'
+            } else {
+              _this.signText = '标记'
+            }
+          } else {
+            _this.signText = '标记'
+          }
+        } else {
+          _this.signText = '标记'
+        }
+      }
+    },
     async submitShowPop() {
       const isLogin = await this.$store.dispatch('checkLogin')
       if (!isLogin) {
@@ -225,6 +233,17 @@ export default {
         }
         return false
       }
+      let count = 0
+      Object.keys(this.requestData).map((item, index) => {
+        for (let i = 0; i < Object.keys(this.requestData[item]).length; i++) {
+          count++
+        }
+      })
+      if (count === this.questionsData.sheet.question_count) {
+        this.subPopText = '确定交卷吗？'
+      } else {
+        this.subPopText = '您还有题目未回答，确定交卷吗？'
+      }
       this.isExamSubPop = true
     },
     // 答题结束禁止答题
@@ -241,6 +260,7 @@ export default {
             this.currentNum = this.swiper.activeIndex + 1
             this.topicCard.isShow = false
             this.currentNum === this.questionsData.sheet.question_count ? this.nextBtnShow = false : this.nextBtnShow = true
+            this.getIsSign()
           }, 100)
         }
       }

src/pages/my/index.vue

@@ -63,7 +63,13 @@ export default {
       })
     },
     go(url) {
+      if (this.isWeapp) {
+        wx.miniProgram.navigateTo({
+          url: `/pages/web/index?src=${window.location.origin}${url}`
+        })
+      } else {
         this.$router.push(url)
+      }
     },
     goLogin() {
       if (this.isWeapp) {