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

common/httpList/grade.js

@@ -8,6 +8,12 @@ export default {
 			method: 'get',
 			data: data
 		})
+	},
+	goodsGradeInfo(data) {
+		return myRequest({
+			url: '/grade/grade/'+data,
+			method: 'get'
+		})
 	}
 	
 }

pages2/class/detail.vue

@@ -233,7 +233,9 @@ export default {
 			noteValue: '',
 			noteId: 0,
 			recordObj: 0,
-			needSeek: false //第一次播放是否需要跳转
+			gradeDetail:{},
+			needSeek: false, //第一次播放是否需要跳转
+			needProfileModal:false //是否需要资料审核弹框
 		};
 	},
 	computed: { ...mapGetters(['userInfo', 'playSectionId']) },
@@ -260,14 +262,14 @@ export default {
 		var self = this;
 		//相机授权
 		this.getCameraSetting()
-		return
 		this.$api.getbaseprofiletplists({ goodsId: self.goodsId }).then(res => {
 			if (res.data.code === 200 && res.data.rows.length) {
 				if (res.data.rows[0].keyValue) {
 					self.$api.getbaseprofiletpgetInfo({ goodsId: self.goodsId }).then(result => {
 						if (result.data.code === 200) {
-							if (!result.data.data || (result.data.data.status === 3 && result.data.data.changeStatus === 1)) {
+							if (!result.data.data || (result.data.data.status === 3 && result.data.data.changeStatus === 1)) {								
 								if (!result.data.data) {
+									self.needProfileModal = true
 									uni.showModal({
 										content: '请前往填写资料',
 										cancelText: '返回',
@@ -283,6 +285,7 @@ export default {
 										}
 									});
 								} else {
+									self.needProfileModal = true
 									uni.showModal({
 										content: '资料审核不通过，请前往重新填写',
 										cancelText: '返回',
@@ -303,6 +306,7 @@ export default {
 									if (k.data.code === 200) {
 										if (!k.data.data || (k.data.data.status === 3 && k.data.data.changeStatus === 1)) {
 											if (!k.data.data) {
+												self.needProfileModal = true
 												uni.showModal({
 													cancelText: '返回',
 													content: '请前往填写盖章资料',
@@ -318,6 +322,7 @@ export default {
 													}
 												});
 											} else {
+												self.needProfileModal = true
 												uni.showModal({
 													cancelText: '返回',
 													content: '资料盖章审核不通过，请前往重新填写',
@@ -524,6 +529,35 @@ export default {
 				}
 			});
 		},
+		getGradeInfo() {
+			let self = this;
+			
+			this.$api.goodsGradeInfo(this.gradeId).then(res => {
+				if (res.data.code == 200) {
+					self.gradeDetail = res.data.data;
+					if(self.gradeDetail.learningStatus==2){
+						uni.showModal({
+							showCancel:false,
+							cancelText: '返回',
+							content: '当前课程正在申请中，请耐心等待',
+							success: function(resultst) {
+								uni.navigateBack();
+							}
+						});
+					}
+					if(self.gradeDetail.learningStatus==3&&(Number(self.gradeDetail.learningTimeStart)>Number((new Date())/1000))){
+						uni.showModal({
+							showCancel:false,
+							cancelText: '返回',
+							content: '当前课程正在申请中，请耐心等待',
+							success: function(resultst) {
+								uni.navigateBack();
+							}
+						});
+					}
+				}
+			});
+		},
 		getNoteList() {
 			let self = this;
 			self.noteList = [];
@@ -799,6 +833,7 @@ export default {
 				console.log(self.gradeId, 698);
 				self.getMenuList();
 				self.getReMenuList(); //获取重修目录
+				self.getGradeInfo()
 				//获取节笔记
 				this.getNoteList();
 				if (self.goodsData.goodsPlayConfig) {

pages2/learn/my_learn.vue

@@ -131,7 +131,7 @@ export default {
 		jumpPage(v, int) {
 			//int 1.课程学习 2.预约考试 3.进入刷题 4.查看详情 5.重修目录
 			if (int === 1) {
-				this.$navTo.togo('/pages2/wd/course?id=' + v.goodsId);
+				this.$navTo.togo(`/pages2/wd/course?id=${v.goodsId}&gid=${v.gradeId}`);
 			}
 			if (int === 2) {
 				this.$navTo.togo(`/pages2/appointment/index?goodsId=${v.goodsId}&gradeId=${v.gradeId}`);