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

components/course/courseChapter.vue

@@ -18,7 +18,7 @@
 							<view class="eTag">{{itemM.doType==1?'练习':'考试'}}</view>
 							<view style="margin-left: 15rpx;">{{itemM.name}}</view>
 						</view>
-						<view v-if="itemM.learning==1" class="tagGreen">已看完</view>
+						<view v-if="itemM.learning==1" class="tagGreen">已做完</view>
 					</view>
 				</view>
 			</view>

pages2/plan/index.vue

@@ -231,7 +231,6 @@ export default {
 			let item = this.listItem.calendarStudyVo[this.monthIndex];
 			this.calendarStudyVo = item;
 			this.workList = this.calendarStudyVo.goodsVos;
-			console.log(this.monthIndex,98)
 			if (this.monthIndex > 0) {
 				this.havePreviousMonth = true;
 			}
@@ -252,7 +251,6 @@ export default {
 					if (item.month == currentMonth) {
 						this.monthIndex = i;
 						this.calendarStudyVo = item;
-
 						if (i > 0) {
 							this.havePreviousMonth = true;
 						}