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

pages2/class/detail.vue

@@ -57,8 +57,8 @@
 				<view v-if="noteList.length == 0" style="text-align: center;">暂无笔记</view>
 				<view class="inputBottom">
 					<view style="width: 10%;"><image src="/static/icon/note3.png" style="width: 39rpx;height: 39rpx;margin:0 29rpx;"></image></view>
-					<view style="width: 73%;height: 88rpx;margin-bottom: 15rpx;">
-						<u-input class="input" fixed="true" placeholder="您可以在这里输入笔记内容" type="textarea" :custom-style="inputStyle" v-model="noteValue" />
+					<view style="width: 73%;height: 100%;padding: 10rpx 0;">
+						<u-input class="input" height="60" fixed="true" placeholder="您可以在这里输入笔记内容" type="textarea" :custom-style="inputStyle" v-model="noteValue" />
 					</view>
 					<view style="color: #007AFF;font-size: 30rpx;font-weight: bold;width: 15%;text-align: center;" @click="postNote">提交</view>
 				</view>
@@ -135,7 +135,7 @@
 				<view style="width: 457rpx;color: #666666;font-size: 30rpx;margin-top: 30rpx;">学习过程中需要拍照验证学员身份，
 拍照功能需要使用您的相机。
 是否授权使用？</view>
-				<view style="margin: 30rpx 0;">
+				<view style="margin: 40rpx 0;">
 					<button open-type="openSetting" @bindopensetting="openSetting" class="btnSet">去授权</button>
 				</view>
 			</view>
@@ -883,13 +883,13 @@ export default {
 
 <style lang="scss" scope>
 	.btnSet{
-		height: 50px;
-		width: 400rpx;
+		width: 440rpx;
+		height: 80rpx;
 		background: #007AFF;
-		border-radius: 25rpx;
+		border-radius: 40rpx;
 		color: #FFFFFF;
 		font-size: 28rpx;
-		line-height: 50px;
+		line-height: 80rpx;
 	}
 .btnReply {
 	width: 80rpx;

pages2/course/detail.vue

@@ -172,6 +172,7 @@ export default {
 			
 		},
 		closePlay(){
+			this.$store.commit('setPlaySectionId', {playSectionId  :0});
 			this.vid = ""
 			this.startStatus = false
 		},

pages2/order/index.vue

@@ -32,7 +32,7 @@
 						<view style="display: flex;align-items: center;">
 							<view class="btn2" v-if="item.orderStatus === 0&&item.orderFrom === 2" @click="resumeOrder(item)">继续支付</view>
 							<!-- <view class="btn2" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="againBuy(item)">重新购买</view> -->
-							<view class="btn2" v-if="item.orderStatus === 1 || item.orderStatus === 2">退款</view>
+							<!--<view class="btn2" v-if="item.orderStatus === 1 || item.orderStatus === 2" >退款</view> -->
 							<view class="btn1" v-if="item.orderStatus === -1 || item.orderStatus === -2" @click="delOrder(item)">删除订单</view>
 							<view class="btn1" @click="closeOrder(item)" v-if="item.orderStatus === 0">取消订单</view>
 						</view>

pages2/plan/index.vue

@@ -309,6 +309,12 @@ export default {
 				todayItem = this.calendarStudyVo.dayStudyList[todayIndex]
 				start = todayIndex - todayItem.studyDay;
 			}
+			if ((date.getMonth() + 1) != this.calendarStudyVo.month) {
+				todayIndex = 0
+				todayItem = this.calendarStudyVo.dayStudyList[todayIndex]
+				start = 0;
+			}
+			console.log(start,689)
 			/* this.calendarStudyVo.miniDayStudyList = []
 			for(let i=start;i<start + 7;i++){
 				this.calendarStudyVo.miniDayStudyList.push(this.calendarStudyVo.dayStudyList[i])