修复bug

pages2/msg/detail.vue

@@ -42,6 +42,7 @@ export default {
 		return {
 			listData: {},
 			goodsData:{},
+			sysTime:0,
 			id: null,
 			img1: '/static/icon/msg_icon1.png',
 			img2: '/static/icon/msg_icon2.png',
@@ -50,6 +51,7 @@ export default {
 	},
 	onPullDownRefresh() {},
 	onLoad(option) {
+		this.sysTime = this.$method.timest();
 		this.id = Number(option.id);
 	},
 	onShow() {
@@ -66,6 +68,14 @@ export default {
 		};
 	},
 	methods: {
+		/**
+		 * 获取系统当前时间
+		 */
+		commonSystemTime() {
+			this.$api.commonSystemTime().then(res => {
+				this.sysTime = res.data.data;
+			})
+		},
 		//跳转页面
 		async jumpFuns(item,remindId) {
 			switch (remindId) {
@@ -82,99 +92,109 @@ export default {
 				case 12:
 				case 18:
 					
-					let currentTime = this.$method.getZeroTime();
-					console.log(currentTime)
-					console.log(item)
-					console.log(item.studyStartTime)
-					console.log(item.studyEndTime)
-					console.log(currentTime < item.studyStartTime || currentTime > item.studyEndTime)
-					if(currentTime < item.studyStartTime || currentTime > item.studyEndTime) {
-						uni.showToast({
-							title:'不在学习有效期，不可以学习了哦',
-							icon:'none'
-						})
-						return;
-					}
-					
-					if( (item.classStartTime && currentTime <= item.classStartTime) || (item.classEndTime && currentTime >= item.classEndTime) ) {
-						uni.showToast({
-							title:'不在班级有效期，不能进入学习',
-							icon:'none'
-						})
-						return;
-					}
-					
-					if(item.learningStatus == 2) {
-						uni.showToast({
-							title:'开放学习时间待定，不能进入学习',
-							icon:'none'
-						})
-						return;
-					}
-					
-					if(item.classStatus == 0 ) {
-						uni.showToast({
-							title:'尚未开班，不能进入学习',
-							icon:'none'
-						})
-						return;
-					}
-					
-					if(item.learningStatus == 3 && (currentTime < item.learningTimeStart) ) {
-						uni.showToast({
-							title:'不在开放学习时间,不能进入学习',
-							icon:'none'
-						})
-						return;
-					}
-					
-					if(item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > currentTime) &&  (item.classEndTime && (item.classEndTime < currentTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0) {
+					//课程
+					if(item.goodsType == 1) {
+						let currentTime = this.$method.timest();
+						console.log(currentTime)
+						console.log(item)
+						console.log(item.studyStartTime)
+						console.log(item.studyEndTime)
+						console.log(currentTime < item.studyStartTime || currentTime > item.studyEndTime)
+						if(currentTime < item.studyStartTime || currentTime > item.studyEndTime) {
+							uni.showToast({
+								title:'不在学习有效期，不可以学习了哦',
+								icon:'none'
+							})
+							return;
+						}
 						
-						uni.showModal({
-							title:'提示',
-							content:'班级已过期，需要重新选班',
-							showCancel:false,
-							success:() => {
-								uni.navigateTo({
-									url:"/pages2/wd/class"
-								})
-							}
-						})
-						return;
-					}
-					
-					let rebuildStatus = await this.courseGoodsRebuildStatus(item.goodsId,item.gradeId);
-					
-					if(rebuildStatus == 0) {
-						this.$navTo.togo('/pages2/learn/details', {
-							gradeId:item.gradeId,
-							goodsId: item.goodsId
-						})
-						return;
-					}
-					
-					if(item.courseNum == 1 ) {
+						if( (item.classStartTime && currentTime <= item.classStartTime) || (item.classEndTime && currentTime >= item.classEndTime) ) {
+							uni.showToast({
+								title:'不在班级有效期，不能进入学习',
+								icon:'none'
+							})
+							return;
+						}
 						
-						this.$api.courseCourseList({
-							pageNum:1,
-							pageSize:1,
-							goodsId:item.goodsId,
-							gradeId:item.gradeId
-						}).then(res => {
-							if(res.data.code == 200) {
-								uni.navigateTo({
-									url:`/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}`
-								})
-							}
+						if(item.learningStatus == 2) {
+							uni.showToast({
+								title:'开放学习时间待定，不能进入学习',
+								icon:'none'
+							})
+							return;
+						}
+						
+						if(item.classStatus == 0 ) {
+							uni.showToast({
+								title:'尚未开班，不能进入学习',
+								icon:'none'
+							})
+							return;
+						}
+						
+						if(item.learningStatus == 3 && (currentTime < item.learningTimeStart) ) {
+							uni.showToast({
+								title:'不在开放学习时间,不能进入学习',
+								icon:'none'
+							})
+							return;
+						}
+						
+						if(item.gradeStatus == 1 && item.status == 1 && (item.studyEndTime > currentTime) &&  (item.classEndTime && (item.classEndTime < currentTime)) && (item.periodStatus == 0 || item.periodStatus == -1) && item.studyCount > 0) {
+							
+							uni.showModal({
+								title:'提示',
+								content:'班级已过期，需要重新选班',
+								showCancel:false,
+								success:() => {
+									uni.navigateTo({
+										url:"/pages2/wd/class"
+									})
+								}
+							})
+							return;
+						}
+						
+						let rebuildStatus = await this.courseGoodsRebuildStatus(item.goodsId,item.gradeId);
+						
+						if(rebuildStatus == 0) {
+							this.$navTo.togo('/pages2/learn/details', {
+								gradeId:item.gradeId,
+								goodsId: item.goodsId
+							})
+							return;
+						}
+						
+						if(item.courseNum == 1 ) {
+							
+							this.$api.courseCourseList({
+								pageNum:1,
+								pageSize:1,
+								goodsId:item.goodsId,
+								gradeId:item.gradeId
+							}).then(res => {
+								if(res.data.code == 200) {
+									uni.navigateTo({
+										url:`/pages3/polyv/detail?id=${res.data.rows[0].courseId}&goodsId=${item.goodsId}`
+									})
+								}
+							});
+							return;
+						}
+						
+						this.$navTo.togo('/pages2/wd/course', {
+							id: item.goodsId,
+							gid: item.gradeId
+						});
+						// arsty = '立刻学习';
+						
+					//题库
+					} else if(item.goodsType ==2) {
+						this.$navTo.togo('/pages2/bank/question_detail', {
+							id: item.goodsId
 						});
-						return;
 					}
 					
-					this.$navTo.togo('/pages2/wd/course', {
-						id: item.goodsId,
-						gid: item.gradeId
-					});
-					// arsty = '立刻学习';
 					break;
 				case 2:
 				case 4:
@@ -294,23 +314,45 @@ export default {
 					}
 					this.listData = res.data.data;
 					if(res.data.data.goodsId) {
-						this.$api.goodsDetail(res.data.data.goodsId).then(rs => {
-							this.goodsData = rs.data.data
-							if (
-								rs.data.data.goodsType === 3 &&
-								(res.data.data.remindId === 1 ||
-									res.data.data.remindId === 3 ||
-									res.data.data.remindId === 5 ||
-									res.data.data.remindId === 6 ||
-									res.data.data.remindId === 7 ||
-									res.data.data.remindId === 19 ||
-									res.data.data.remindId === 21 ||
-									res.data.data.remindId === 22)
-							) {
-								this.statusGO = false;
-							}
-						});
+						if(res.data.data.gradeId) {
+							this.$api.goodsDetail(res.data.data.goodsId).then(rs => {
+								this.goodsData = rs.data.data
+								if (
+									rs.data.data.goodsType === 3 &&
+									(res.data.data.remindId === 1 ||
+										res.data.data.remindId === 3 ||
+										res.data.data.remindId === 5 ||
+										res.data.data.remindId === 6 ||
+										res.data.data.remindId === 7 ||
+										res.data.data.remindId === 19 ||
+										res.data.data.remindId === 21 ||
+										res.data.data.remindId === 22)
+								) {
+									this.statusGO = false;
+								}
+							});
+							
+							
+						} else {
+							this.$api.commonGoodsDetail(res.data.data.goodsId).then(rs => {
+								this.goodsData = rs.data.data
+								if (
+									rs.data.data.goodsType === 3 &&
+									(res.data.data.remindId === 1 ||
+										res.data.data.remindId === 3 ||
+										res.data.data.remindId === 5 ||
+										res.data.data.remindId === 6 ||
+										res.data.data.remindId === 7 ||
+										res.data.data.remindId === 19 ||
+										res.data.data.remindId === 21 ||
+										res.data.data.remindId === 22)
+								) {
+									this.statusGO = false;
+								}
+							});
+						}
 					}
+					
 				}
 			});
 		},

pages2/wd/class.vue

@@ -250,6 +250,7 @@ export default {
 		};
 	},
 	onLoad(option) {
+		this.sysTime = this.$method.timest();
 		this.courseGoodsList();
 	},
 	onShow() {