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

components/course/courseChapter.vue

@@ -79,11 +79,12 @@ export default {
 			if(!this.down&&this.list.length==0){
 				console.log(item.id,69)
 				if(this.isBuy){
+					let moduleId = item.moduleId?item.moduleId:0
 					if(this.isRebuild){
-						this.getReSectionList(item.id,item.courseId,item.moduleId)
+						this.getReSectionList(item.id,item.courseId,moduleId)
 					}else{
-						this.getBuySectionList(item.id,item.courseId,item.moduleId)
-						this.getMenuExamList(item.id,item.courseId,item.moduleId)
+						this.getBuySectionList(item.id,item.courseId,moduleId)
+						this.getMenuExamList(item.id,item.courseId,moduleId)
 					}
 				}else{
 					this.getSectionList(item.id)

pages2/exam/exam_appointment.vue

@@ -112,7 +112,7 @@
 				<u-line color="#EEEEEE" />
 				<view class="foot" v-if="activeList.subscribeStatus === 1">
 					<view class="btn" @click="hideModel">知道了</view>
-					<view class="btn cancel" @click="cancelBtn">取消预约</view>
+					<view class="btn cancel" v-if="isShowFun(activeList.applyEndTime)" @click="cancelBtn">取消预约</view>
 				</view>
 				<view class="foot" v-else><view class="abtns" @click="hideModel">知道了</view></view>
 			</view>
@@ -185,6 +185,14 @@ export default {
 		};
 	},
 	methods: {
+		isShowFun(times){
+			var timestamp=parseInt(new Date().getTime() / 1000)
+			if(times < timestamp){
+				return false
+			}else{
+				return true
+			}
+		},
 		showDetails(item) {
 			this.activeList = JSON.parse(JSON.stringify(item));
 			this.details_show = true;