feat: 答题兼容其他模式

src/common/http.interceptor.js

-const globalUrl = process.uniEnv || {};
+const globalUrl = process.uniEnv || {}
 // 这里的vm，就是我们在vue文件里面的this，所以我们能在这里获取vuex的变量，比如存放在里面的token变量
 const install = (Vue, vm) => {
-  const systemApiUrl = globalUrl.apiUrl;
+  const systemApiUrl = globalUrl.apiUrl
   // 此为自定义配置参数，具体参数见上方说明
   Vue.prototype.$u.http.setConfig({
     baseUrl: systemApiUrl,
     header: {
-      'channel': 'Applets',
-      'tenant': 'weixiuhui',
+      channel: 'Applets',
+      tenant: 'weixiuhui',
       'content-type': 'application/json; charset=utf-8',
     },
     loadingTime: 800,
     originalData: true,
-  });
+  })
 
   // 请求拦截，配置Token等参数
   Vue.prototype.$u.http.interceptor.request = (config) => {
@@ -29,46 +29,48 @@ const install = (Vue, vm) => {
     // 	}
     // }
     // 最后需要将config进行return
-    return config;
+    return config
     // 如果return一个false值，则会取消本次请求
     // if(config.url == '/user/rest') return false; // 取消某次请求
-  };
+  }
 
   // 响应拦截，判断状态码是否通过
   Vue.prototype.$u.http.interceptor.response = (res) => {
-    const data = res.data;
+    const data = res.data
+    let pages = getCurrentPages()
+    let route = pages[pages.length - 1].route
     if (res.statusCode === 200) {
       if (data.code === 0) {
-        return data.data;
+        return data.data
       } else if (data.code === 401) {
-        vm.$u.toast(data.msg);
-        let pages = getCurrentPages();
-        let route = pages[pages.length - 1].route;
+        vm.$u.toast(data.msg)
         // 如果不是在登录页，则跳转到登录页
         if (route !== 'pages/login/index') {
           setTimeout(() => {
-            vm.$u.route('/pages/login/index');
-          }, 1500);
+            vm.$u.route('/pages/login/index')
+          }, 1500)
         }
-        return false;
+        return false
       } else {
         // 如果返回false，则会调用Promise的reject回调，
-        vm.$u.toast(data.msg);
-        return false;
+        vm.$u.toast(data.msg)
+        return false
       }
     } else if (res.statusCode === 401) {
       // 登录过期
       vm.$u.toast(data.msg)
-      setTimeout(() => {
-        vm.$u.route('/pages/login/index')
-      }, 1500);
-    }else {
+      if (route !== 'pages/login/index') {
+        setTimeout(() => {
+          vm.$u.route('/pages/login/index')
+        }, 1500)
+      }
+    } else {
       // HTTP状态非200
-      vm.$u.toast(data.msg || '服务器错误');
+      vm.$u.toast(data.msg || '服务器错误')
     }
-  };
-};
+  }
+}
 
 export default {
   install,
-};
+}

src/pages/learn/answer.vue

@@ -51,7 +51,7 @@
         <view class="u-flex">
           <view class="c-list">
             <u-icon name="grid" color="#5A6073" size="40"></u-icon>
-            <text>{{ currentIndex + 1 }}/{{ total }}</text>
+            <text>{{ currentNumber }}/{{ total }}</text>
           </view>
         </view>
         <view class="u-flex">
@@ -143,6 +143,7 @@ export default {
       requesting: false,
       // 科目ID
       questionWarehouseId: null,
+      // 1.顺序答题 2.随机练习 3.模拟考试 4.收藏答题 5.错题答题 6.专项练习-单选 7.专项练习-多选 8.专项练习-判断 9.专项练习-答案是
       source: 0,
       recordId: 0
     }
@@ -157,35 +158,67 @@ export default {
       }
       return process.uniEnv.qn_base_url + name
     },
+    currentNumber() {
+      let index = this.currentIndex
+      return index === -2 ? this.total : index + 1
+    }
   },
   onLoad(e) {
-    this.questionWarehouseId = e?.questionWarehouseId || 1414854649273384960
-    if (e?.source) this.source = e.source
-    if (e?.recordId) this.recordId = e.recordId
-    const params = {
-      questionWarehouseId: this.questionWarehouseId,
-      recordId: this.recordId,
-      source: this.source
+    this.questionWarehouseId = parseInt(e?.questionWarehouseId) || 1414854649273384960
+    if (e?.source) this.source = parseInt(e.source)
+    if (e?.recordId) this.recordId = parseInt(e.recordId)
+
+    switch (this.source) {
+      case 1:
+      case 2:
+      case 6:
+      case 7:
+      case 8:
+      case 9:
+        this.type = 1
+        break;
+      case 3:
+        this.type = 2
+        break;
+      case 4:
+        this.type = 3
+        break;
+      case 5:
+        this.type = 4
+        break;
+      default:
+        this.type = 1
+        break;
     }
-    this.$u.api.getQuestionTotal(params).then(res => {
-      // 列表总长度，一定要在第一次请求列表数据前明确该值
-      // 否则无法知道下一页是否还有数据
-      let total = parseInt(res) || 0
-      this.total = total
-      // 初始化答题卡列表
-      Utils.initAnswerCardList(total, this)
-      this.cachePageDataMap = new Map()
-      
-      // 上次答到了第几题
-      let index = 18
-      this.refresh(index)
-    })
+
     // 第一次进入，显示提示
     if (this.questionList.length === 0) {
       this.show = true
     }
+    
+    this.init()
   },
   methods: {
+    init() {
+      const params = {
+        questionWarehouseId: this.questionWarehouseId,
+        recordId: this.recordId,
+        source: this.source
+      }
+      this.$u.api.getQuestionTotal(params).then(res => {
+        // 列表总长度，一定要在第一次请求列表数据前明确该值
+        // 否则无法知道下一页是否还有数据
+        let total = parseInt(res) || 0
+        this.total = total
+        // 练习模式-初始化答题卡列表
+        if (type === 1) Utils.initAnswerCardList(total, this)
+        this.cachePageDataMap = new Map()
+        
+        // 上次答到了第几题
+        let index = this.type === 1 ? (this.lastIndex || 0) : 0
+        this.refresh(index)
+      })
+    },
     swiperChange(e) {
       let current = e.current
       this.currentIndex = current
@@ -211,17 +244,9 @@ export default {
               url: 'pages/learn/source',
             })
           } else {
-            uni.showModal({
-              title: '提示',
-              content: '已经是最后一题了',
-              success: (res) => {
-                if (res.confirm) {
-                  this.$u.route({
-                    url: '/pages/index/index',
-                    type: 'tab',
-                  })
-                }
-              },
+            return uni.showToast({
+              title: '已经是最后一题了',
+              icon: 'none',
             })
           }
         }
@@ -305,34 +330,35 @@ export default {
     // 作答完毕
     answerChange(status, lists) {
       // 保存答题状态
-      this.$set(this.list[this.currentIndex], 'submitStatus', true)
-      this.$set(this.list[this.currentIndex], 'answerList', lists)
-      this.$set(this.list[this.currentIndex], 'result', status)
-      this.$set(
-        this.list[this.currentIndex],
-        'errShow',
-        this.type === 2 ? true : status === 'fail'
-      )
+      const item = this.list.find(v => v.index === this.currentIndex)
+      item.submitStatus = true
+      item.answerList = lists
+      item.result = status
+      item.errShow = this.type === 2 ? true : status === 'fail'
       
       // 更新答题卡
-      this.questionList[this.currentIndex] = this.list[this.currentIndex]
+      this.questionList[this.currentIndex] = item
       this.$u.vuex('questionList', this.questionList)
-      this.$u.vuex('lastIndex', this.currentIndex + 1)
+      this.$u.vuex('lastIndex', this.currentIndex)
+
       // 每日一练数量统计
       if (this.type === 1 && this.daily) {
-        if (this.dailyCount < 3) this.dailyCount++
-        if (this.dailyCount === 3) {
+        if (this.dailyCount < 9) this.dailyCount++
+        if (this.dailyCount === 9) {
           this.completeType = 'daily'
           this.visible = true
           return
         }
       }
+
       // 如果回答错误或者是考试模式，自动进入下一题
       if (status === 'pass' || this.type === 2) {
         if (this.currentIndex + 1 > this.total - 1) {
           return
         }
-        this.current = this.currentIndex + 1
+        this.$nextTick(() => {
+          this.current = this.currentIndex + 1
+        })
       }
     },
     // 交卷
@@ -449,9 +475,23 @@ export default {
         list = list.concat(resultItem.questionList)
       })
       this.list = list
-      this.$nextTick(() => {
-        this.$refs.swiper.init(currentIndex)
-      })
+      
+      if (this.list.length === 0) {
+        uni.showToast({
+          title: '暂无数据',
+          icon: 'none',
+        })
+        setTimeout(() => {
+          this.$u.route({
+            delta: 1,
+            type: 'back'
+          })
+        }, 1500)
+      } else {
+        this.$nextTick(() => {
+          this.$refs.swiper.init(currentIndex)
+        })
+      }
     }
   },
 }

src/pages/learn/utils.js

@@ -112,38 +112,46 @@ function request({ currentPage, size, onSuccess, onFailed }, vm) {
     let questionList = []
     for (let i = 0; i < size; i++) {
       const info = list[i]
-      const content = JSON.parse(info.content)
-      const answerList = content.choiceList.map(v => {
-        return {
-          sort: v.value,
-          text: v.label
-        }
-      })
+      if (info) {
+        const content = JSON.parse(info.content)
+        const answerList = content.choiceList.map(v => {
+          return {
+            sort: v.value,
+            text: v.label
+          }
+        })
 
-      let type
-      switch (info.echoMap.questionTypeId) {
-        case '单选题':
-          type = 1
-          break;
-        case '判断题':
-          type = 2
-          break;
-        case '多选题':
-          type = 3
-          break;
-      }
-      let item = {
-        index: i + (currentPage - 1) * size,
-        currentPage: currentPage,
-        total: data.total,
-        title: content.title,
-        answerList: answerList,
-        answer: info.answer,
-        rightKey: info.answer.split(','),
-        explain: info.analysis,
-        type: type
+        let type
+        switch (info.echoMap.questionTypeId) {
+          case '单选题':
+            type = 1
+            break;
+          case '判断题':
+            type = 2
+            break;
+          case '多选题':
+            type = 3
+            break;
+        }
+        let item = {
+          index: i + (currentPage - 1) * size,
+          currentPage: currentPage,
+          total: data.total,
+          title: content.title,
+          answerList: answerList,
+          answer: info.answer,
+          rightKey: info.answer.split(','),
+          explain: info.analysis,
+          type: type
+        }
+        // 回显已答题目
+        if (vm.type === 1) { // 练习模式回显
+          const ansItem = vm.questionList.find(v => v.index === item.index)
+          questionList.push(ansItem ? ansItem : item)
+        } else {
+          questionList.push(item)
+        }
       }
-      questionList.push(item)
     }
     data.questionList = questionList
     onSuccess(data)
@@ -202,7 +210,7 @@ const getInitPageList = function(currentIndex, size, currentPage, total) {
 }
 
 function initAnswerCardList(total, vm) {
-  if (!vm.questionList) {
+  if (!vm.questionList || vm.questionList.length === 0) {
     let list = []
     for (let i = 0; i < total; i++) {
       list.push({})

src/pages/login/index.vue

@@ -42,7 +42,8 @@ export default {
                   this.$u.vuex('openId', res.openId)
                   this.$u.vuex('userInfo', userInfo)
                   this.$u.route({
-                    type: 'back',
+                    url: '/pages/index/index',
+                    type: 'tab',
                   })
                 })
               }