Merge branch 'master' of https://gitee.com/he2802/saas_applet

pages/index/index.vue

@@ -304,30 +304,29 @@ export default {
 			let num = date.getDate();
 			let month = date.getMonth() + 1;
 			let list = [];
-			for (let i = 0; i < calendarStudyVo.length; i++) {
-				let item = calendarStudyVo[i];
-				if (item.month == month) {
-					list = item.dayStudyList;
-				}
-			}
-			for (let i = 0; i < list.length; i++) {
-				let item = list[i];
-				item.color = 0;
-				if (item.date == num) {
-					item.color = 3;
-				}
-				if (item.perform == 1) {
-					item.color = 1;
-				}
-				if (item.perform == 2) {
-					item.color = 2;
-				}
-				item.note = item.studyCourseKnob;
-				if (item.note > 0) {
-					item.dot = true;
+			for (let j = 0; j < calendarStudyVo.length; j++) {
+				let item = calendarStudyVo[j];
+				list = item.dayStudyList;
+				for (let i = 0; i < list.length; i++) {
+					let item = list[i];
+					item.color = 0;
+					if (item.date == num) {
+						item.color = 3;
+					}
+					if (item.perform == 1) {
+						item.color = 1;
+					}
+					if (item.perform == 2) {
+						item.color = 2;
+					}
+					item.note = item.studyCourseKnob;
+					if (item.note > 0) {
+						item.dot = true;
+					}
+					self.date_num.push(item);
 				}
-				self.date_num.push(item);
 			}
+			
 		},
 		userPlanSeven() {
 			let self = this;