updata

src/api/pay.js

@@ -16,21 +16,12 @@ export function getMyOrder() {
   return httpRequest.get('/zy/v2/mall/order/my')
 }
 
-/* 模拟考试设置角色 */
-export function setRole(data) {
-  return httpRequest.post('/zy/v2/examination/role', data, {
-    headers: { 'Content-Type': 'multipart/form-data' }
-  })
-}
-
-/* 获取考试状态 */
-export function getExamStatus(data) {
-  return httpRequest.get('/zy/v2/examination/examination-papers-status', data, {
-    headers: { 'Content-Type': 'multipart/form-data' }
-  })
-}
-
 /* 获取openid */
 export function getOpenid(data) {
   return httpRequest.get('/usercenter/user/get-user-openid', data)
 }
+
+/* 监听支付状态 */
+export function getOrderStatus() {
+  return httpRequest.get('/v2/mall/order/status')
+}

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

@@ -94,6 +94,20 @@ export default {
       bottomView.style.height = (clientHeight - topViewH) + 'px'
       console.log(bottomView.style.height)
     }
+  },
+  computed: {
+    changeData() {
+      return this.questionsData
+    }
+  },
+  watch: {
+    changeData: {
+      handler(newV, oldV) {
+        this.$forceUpdate()
+        console.log(newV)
+      },
+      deep: true
+    }
   }
 }
 </script>

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.chapter_id">查看解析</div>
+        <div class="analysis" @click="analyShow" v-if="$route.query.id || $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>
@@ -122,20 +122,22 @@ export default {
         observer: true,
         on: {
           slideChangeTransitionStart: function() {
-            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 = '已标记'
+            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 = '标记'
               }
-            } else {
-              _this.signText = '标记'
             }
             if (this.activeIndex === _this.questionsData.sheet.question_count) {
               _this.topicCard.isShow = true
@@ -290,7 +292,7 @@ export default {
     setClock(time) {
       let sec = parseInt(time)
       this.clockCount = setInterval(() => {
-        if (this.requestParam.course_id) {
+        if (this.requestParam.course_id || this.requestParam.tag_id) {
           this.remainingTime = this.secondToDate(sec)
           sec++
         } else {
@@ -436,7 +438,6 @@ export default {
         } else {
           this.questionsData = res
         }
-        console.log(this.questionsData)
         window.localStorage.userId = res.user_id
         this.remainingTime = this.secondToDate(times)
         this.setClock(times)

src/pages/pay/index.vue

@@ -27,10 +27,16 @@ export default {
         prepay_id: '', // 通过调用接口获取
         app_id: '', // 提前设定
         app_secret: '' // 提前设定
-      }
+      },
+      orderStatusTime: null
     }
   },
   mounted() {
+    window.addEventListener('pageshow', function (event) {
+      if ((event.persisted || window.performance) && window.performance.navigation.type === 2) {
+        Toast('页面返回')
+      }
+    }, false)
     this.getOpenid()
     this.getGoodsDetail()
   },
@@ -44,10 +50,19 @@ export default {
         })
       })
     },
-    getGoodsDetail() {
-      // api.getGoodsDetails('6682927830365372416').then(res => {
-      //   console.log(res)
-      // })
+    getOrderStatus() {
+      api.getOrderStatus().then(res => {
+        switch (res.status) {
+          case 1:
+            break
+          case -1:
+            break
+          case 100:
+            break
+          default:
+        }
+        Toast(res.status)
+      })
     },
     goPay () {
       // this.VueEvent.$emit('pay-wx-h5', {})
@@ -72,6 +87,10 @@ export default {
           },
           success: function (res) {}
         })
+        // clearInterval(this.orderStatusTime)
+        // this.orderStatusTime = setInterval(() => {
+        //   this.getOrderStatus()
+        // }, 1000)
       }
       // this.VueEvent.$emit('pay-wx-chart', {})
       // this.VueEvent.$off('pay-wx-chart-callback').$on('pay-wx-chart-callback', obj => {