Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

src/components/answer-sheet/index.vue

@@ -97,6 +97,10 @@ export default {
         this.lists.forEach((v) => {
           v.checked = false // 勾选
           v.confirm = false // 确认答案
+          if (this.rightKey.includes(v.sort)) {
+            this.$set(v, 'checked', true)
+            this.$set(v, 'confirm', true)
+          }
         })
         this.$set(this.lists[index], 'confirm', true)
         // 用户选的答案

src/pages/learn/answer.vue

@@ -113,6 +113,8 @@
       </dailyPop>
     </view>
 
+    <!-- 体验资格结束 -->
+    <experience-end-pop :visible.sync="experienceEnd" />
   </view>
 </template>
 
@@ -121,7 +123,7 @@ import swiperLimitedLoad from '@/components/swiper-limited-load/index.vue'
 import answerOperationTips from '@/components/answer-operation-tips/index.vue'
 import answerCompletePop from '@/components/answer-complete-pop/index.vue'
 import dailyPop from '@/components/daily-pop/index.vue'
-
+import experienceEndPop from '@/components/experience-end-pop/index.vue'
 import Utils from './utils.js'
 
 const NO_PREV_PAGE = -1
@@ -132,7 +134,8 @@ export default {
     swiperLimitedLoad,
     answerOperationTips,
     answerCompletePop,
-    dailyPop
+    dailyPop,
+    experienceEndPop
   },
   data() {
     return {
@@ -141,6 +144,8 @@ export default {
       type: 1,
       // 1 答题模式 2 学习模式
       model: 1,
+      // 体验资格
+      experienceEnd: false,
       // 每日一练
       daily: {
         status: false,
@@ -218,10 +223,6 @@ export default {
         break;
     }
     
-    // 第一次进入，显示提示
-    if (this.questionList.length === 0) {
-      this.show = true
-    }
     this.init()
   },
   methods: {
@@ -374,28 +375,26 @@ export default {
       item.result = status
       item.errShow = this.type === 2 ? true : status === 'fail'
       item.userAnswer = userAnswer
+      // 保存答案
       if(this.model === 1) this.saveAnswer(item)
+
+      // 滑动提示
+      if (!this.tipStatus && status === 'fail') {
+        this.$u.vuex('tipStatus', true)
+        this.show = true
+      }
+
       // 更新答题卡
       if (this.type === 1){
         this.questionList[this.currentIndex] = item
         this.$u.vuex('questionList', this.questionList)
         this.$u.vuex('lastIndex', this.currentIndex)
-
-        // 每日一练数量统计
-        if (this.daily.status) {
-          if (this.daily.count < 9) this.daily.count++
-          if (this.daily.count === 9) {
-            this.daily.visible = true
-            this.daily.status = false
-            return
-          }
-        }
       }
 
       // 如果回答错误或者是考试模式，自动进入下一题
       if ((status === 'pass' && this.model !== 2) || this.type === 2) {
         if (this.currentIndex + 1 > this.total - 1) { // 最后一题回答后
-          if (this.type === 2) {
+          if (this.type === 2) { // 统计分数，交卷
             this.handPapers(1)
             this.submit()
           }
@@ -418,6 +417,11 @@ export default {
       }
       this.$u.api.answer([params])
     },
+    // 每日一练达成
+    dailyComplete() {
+      this.daily.visible = true
+      this.daily.status = false
+    },
     // 统计分数
     handPapers(type) {
       const fail = this.list.filter((v) => v.result === 'fail').length // 错题数

src/pages/learn/utils.js

@@ -147,7 +147,8 @@ function request({ currentPage, size, onSuccess, onFailed }, vm) {
           answer: info.answer,
           rightKey: info.answer.split(','),
           explain: info.analysis,
-          type: type
+          type: type,
+          collectionFlag: info.collectionFlag
         }
         // 回显已答题目
         if (vm.type === 1) { // 练习模式回显

src/store/index.js

@@ -12,7 +12,7 @@ try{
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['userInfo', 'vuex_token', 'openId', 'searchHistory', 'questionList', 'lastIndex'];
+let saveStateKeys = ['userInfo', 'vuex_token', 'openId', 'searchHistory', 'questionList', 'lastIndex', 'tipStatus'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value){
@@ -38,6 +38,7 @@ const store = new Vuex.Store({
 		searchHistory: lifeData.searchHistory ? lifeData.searchHistory : [], // 搜索历史记录
 		questionList: lifeData.questionList ? lifeData.questionList : [], // 练习列表
 		lastIndex: lifeData.lastIndex ? lifeData.lastIndex : 0, // 上次做到第几题
+		tipStatus: lifeData.tipStatus ? lifeData.tipStatus : false, // 滑动提示
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
 		vuex_version: '1.0.0',
 	},