xuqiaoying 2 年之前
父節點
當前提交
c77c6b7961
共有 1 個文件被更改,包括 29 次插入10 次删除
  1. 29 10
      pages2/dailyPractice/index.vue

+ 29 - 10
pages2/dailyPractice/index.vue

@@ -48,7 +48,7 @@ export default {
             goodsId: '',
             orderGoodsId: '',
             dayExamDetail: {}, // 每日一练当天信息试卷
-            dayRecordList: [], // 每日一练试卷打卡记录
+            dayRecordList: [], // 每日一练试卷日历打卡记录
         }
     },
     onLoad(option) {
@@ -65,7 +65,7 @@ export default {
 			this.curMonth = date.getMonth() + 1 //获取当前月份
 			let dd = new Date(year, this.curMonth, 0) //获取当月总天数
 			let current_month = []
-			let weekList = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]
+			// let weekList = ["星期日", "星期一", "星期二", "星期三", "星期四", "星期五", "星期六"]
 			for (let i = 1; i <= dd.getDate(); i++) {
 				current_month.push({
 					date: i,
@@ -81,8 +81,8 @@ export default {
 					current_month.splice(index, 0, item)
 				}
 			}
-			// console.log('====:', current_month);
 			this.date_num = current_month
+            this.getDailyRecord()
         },
         // 获取每日一练当天的试卷信息
         getToDayExam() {
@@ -93,9 +93,6 @@ export default {
 			}).then((res) => {
                 if (res.data.code == 200) {
                     this.dayExamDetail = res.data.data || {}
-                    if (Object.keys(this.dayExamDetail).length) {
-                        this.getDailyRecord()
-                    }
                 }
             })
         },
@@ -106,13 +103,35 @@ export default {
                 method: 'get',
                 data: {
                     goodsId: this.goodsId,
-                    chapterExamId: this.dayExamDetail.chapterExamId || 0,
-                    moduleExamId: this.dayExamDetail.moduleExamId || 0,
-                    examId: this.dayExamDetail.examId,
+                    // chapterExamId: this.dayExamDetail.chapterExamId || 0,
+                    // moduleExamId: this.dayExamDetail.moduleExamId || 0,
+                    // examId: this.dayExamDetail.examId,
                 }
             }).then((res) => {
                 if (res.data.code == 200) {
-                    console.log('--res-', res)
+                    let data = res.data.data || []
+                    this.dayRecordList = data.map((item) => {
+                        let day = 0
+                        if (item.recordTime) {
+                            day = new Date(item.recordTime * 1000).getDate()
+                        }
+                        return {
+                            ...item,
+                            day: day
+                        }
+                    })
+                    if (this.dayRecordList.length) {
+                        this.date_num.forEach((item, index) => {
+                            let findV = this.dayRecordList.find(e => e.day == item.date)
+                            if (findV) {
+                                this.$set(this.date_num[index], 'sign', true)
+                            } else {
+                                this.$set(this.date_num[index], 'sign', false)
+                            }
+                            
+                        })
+                    }
+                    console.log('this.dayRecordList', this.dayRecordList, this.date_num);
                 }
             })
         },