修复bug

pages/index/index.vue

@@ -189,8 +189,7 @@ export default {
 		this.getAdvertising();
 	},
 	onShow() {
-		if (uni.getStorageSync('updateHome')|| !this.isOld){
-			this.isOld = true;
+		if (uni.getStorageSync('updateHome')){
 			this.init()
 			uni.removeStorageSync('updateHome'); //消费首页刷新事件
 		}
@@ -275,25 +274,32 @@ export default {
 		},
 		
 		getUserSubscribeRecentExam() {
-			this.$api.getUserSubscribeRecentExam().then(res => {
-				if(res.data.code == 200) {
-					if(res.data.data) {
-						let day = this.$method.timestampToTime(res.data.data.applySiteExamTime,true).replace(/-/g,'/')
-						let dayTime = day + ' ' + res.data.data.applySiteStartTime
-						let NowTime = new Date(); //考试时间
-						let examTime = new Date(dayTime); //考试时间
-						let t = (examTime.getTime() / 1000) - (NowTime.getTime() / 1000).toFixed(0);
-						if(t > 0) {
-							let day = +this.$method.GetRTime(examTime.getTime() / 1000,true)
-							this.nearByDay = day;
-						} 
-	
+			return new Promise(resolve => {
+				this.$api.getUserSubscribeRecentExam().then(res => {
+					if(res.data.code == 200) {
+						if(res.data.data) {
+							let day = this.$method.timestampToTime(res.data.data.applySiteExamTime,true).replace(/-/g,'/')
+							let dayTime = day + ' ' + res.data.data.applySiteStartTime
+							let NowTime = new Date(); //考试时间
+							let examTime = new Date(dayTime); //考试时间
+							let t = (examTime.getTime() / 1000) - (NowTime.getTime() / 1000).toFixed(0);
+							if(t > 0) {
+								let day = +this.$method.GetRTime(examTime.getTime() / 1000,true)
+								this.nearByDay = day;
+							} 
+					
+							
+						}
 						
+						resolve()
 					}
-				}
-				
-				console.log(res)
+					
+					console.log(res)
+					
+					
+				})
 			})
+			
 		},
 		
 		advertisingHomeLocation() {
@@ -474,7 +480,7 @@ export default {
 				this.$navTo.togo('/pages2/plan/index', {});
 			}
 		},
-		init() {
+		async init() {
 			if (!this.$method.isLogin()) {
 				//未登录
 				this.date_num = [];
@@ -485,8 +491,8 @@ export default {
 				this.date_num = [];
 				this.workList = [];
 				this.planGoodsList = [];
-				this.userPlanSeven();
-				this.getUserSubscribeRecentExam();
+				await this.userPlanSeven();
+				await this.getUserSubscribeRecentExam();
 			}
 		},
 		getMonDate() {
@@ -546,48 +552,53 @@ export default {
 			
 		},
 		userPlanSeven() {
-			let self = this;
-			this.$api.userPlanSeven().then(result => {
-				if (result.data.data && result.data.data.length>0) {
-					
-					self.workList = result.data.data
-					self.planGoodsList = self.workList[0].goodsVos;
-					if (self.planGoodsList != null && self.planGoodsList.length > 0) {
-						self.goodsItem = self.planGoodsList[0];
-					}
-					self.dealRL(result.data.data[0].calendarStudyVo)
-					/* let date = new Date();
-					let num = date.getDate();
-					let month = date.getMonth() + 1;
-					let list = [];
-					for (let i = 0; i < result.data.data[0].calendarStudyVo.length; i++) {
-						let item = result.data.data[0].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;
+			return new Promise(resolve => {
+				let self = this;
+				this.$api.userPlanSeven().then(result => {
+					if (result.data.data && result.data.data.length>0) {
+						
+						self.workList = result.data.data
+						self.planGoodsList = self.workList[0].goodsVos;
+						if (self.planGoodsList != null && self.planGoodsList.length > 0) {
+							self.goodsItem = self.planGoodsList[0];
 						}
-						item.note = item.studyCourseKnob;
-						if (item.note > 0) {
-							item.dot = true;
+						self.dealRL(result.data.data[0].calendarStudyVo)
+						/* let date = new Date();
+						let num = date.getDate();
+						let month = date.getMonth() + 1;
+						let list = [];
+						for (let i = 0; i < result.data.data[0].calendarStudyVo.length; i++) {
+							let item = result.data.data[0].calendarStudyVo[i];
+							if (item.month == month) {
+								list = item.dayStudyList;
+							}
 						}
-						self.date_num.push(item);
-					} */
-				} else {
-					self.initDay();
-				}
-			});
+						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);
+						} */
+					} else {
+						self.initDay();
+					}
+					
+					resolve()
+				});
+			})
+			
 		},
 		swiperChange(e) {
 			this.current = e.detail.current;