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

pages2/course/detail.vue

@@ -40,8 +40,13 @@
 			
 		</view>
 		<view style="padding: 20rpx;position: relative;top: 680rpx;" v-show="current==0">
+<<<<<<< HEAD
+			<view class="content">
+				<view v-html="detail.mobileDetailHtml" style="width: 100%;overflow: hidden;"></view>
+=======
 			<view class="content" style="padding: 10rpx;">
 				<view v-html="detail.mobileDetailHtml" style="width: 100%;"></view>
+>>>>>>> 50b8991b1bbfc147f6098874fb80946439feb3c1
 			</view>
 		</view>
 		<view style="padding: 20rpx;padding-bottom: 100rpx;position: relative;top: 680rpx;" v-show="current==1">

pages2/plan/index.vue

@@ -272,9 +272,10 @@ export default {
 			this.calendarStudyVo.miniDayStudyList = []; //创建缩放的数组
 			let date = new Date();
 			let num = date.getDate();
-			for (let i = 0; i < firstItem.studyDay; i++) {
+			
+			/* for (let i = 0; i < firstItem.studyDay; i++) {
 				this.calendarStudyVo.dayStudyList.unshift({ date: 0 });
-			}
+			} */
 			let todayIndex;
 			let todayItem;
 			for (let i = 0; i < this.calendarStudyVo.dayStudyList.length; i++) {
@@ -298,7 +299,21 @@ export default {
 					item.dot = true;
 				}
 			}
-			let start = todayIndex - todayItem.studyDay;
+			
+			let start 
+			if(todayItem){
+				start = todayIndex - todayItem.studyDay;
+			}else{
+				//今天在下个月不存在，例如31号
+				todayIndex = this.calendarStudyVo.dayStudyList.length-1
+				todayItem = this.calendarStudyVo.dayStudyList[todayIndex]
+				start = todayIndex - todayItem.studyDay;
+			}
+			/* this.calendarStudyVo.miniDayStudyList = []
+			for(let i=start;i<start + 7;i++){
+				this.calendarStudyVo.miniDayStudyList.push(this.calendarStudyVo.dayStudyList[i])
+			} */
+			console.log(this.calendarStudyVo.miniDayStudyList,789)
 			this.calendarStudyVo.miniDayStudyList = this.calendarStudyVo.dayStudyList.slice(start, start + 7);
 			this.showDayList = this.calendarStudyVo.miniDayStudyList;
 		},
@@ -353,9 +368,9 @@ export default {
 			});
 		},
 		updateHomePlan() {
-			const pages = getCurrentPages(); //获取页面栈
+			/* const pages = getCurrentPages(); //获取页面栈
 			const beforePage = pages[pages.length - 2]; //前一个页面
-			beforePage.$vm.updateHomePlan();
+			beforePage.$vm.updateHomePlan(); */
 		},
 		newPlan() {
 			this.$navTo.togo('/pages2/plan/create');