Merge branch 'zcwyMaster' into 'dev0731'

Zcwy master

See merge request !23

components/system-news/system-news.vue

@@ -66,8 +66,6 @@
 		},
 		methods: {
 			returnRouter(item) {
-				console.log(item.pageParams,'aaa')
-				console.log(item,'bbb')
 				if(!item.isRead){
 					apiMessage.updateIsRead([item.id]).then(res=>{
                        if(res.status == 200) {
@@ -85,20 +83,20 @@
 								url: '/pages/resource/qaDetail?id=' + item.pageParams
 							});
 					} else {
-						// uni.navigateTo({
+						uni.navigateTo({
-						//  	url: '/pages/study/courseStudy?id='  + item.pageParams 
+							url: '/pages/resource/courseDetail?id=' + item.pageParams
-						// });
-						apiCourseStudy.hasSignup(item.pageParams).then(rs => {
-							if (rs.status == 200) {
-							  uni.navigateTo({
-							  	url: '/pages/study/courseStudy?id=' + item.pageParams
-							  })
-							} else {
-							  uni.navigateTo({
-							  	url: '/pages/resource/courseDetail?id=' + item.pageParams
-							  })
-							}
 						  })
+						// apiCourseStudy.hasSignup(item.pageParams).then(rs => {
+						// 	if (rs.status == 200) {
+						// 	  uni.navigateTo({
+						// 	  	url: '/pages/study/courseStudy?id=' + item.pageParams
+						// 	  })
+						// 	} else {
+						// 	  uni.navigateTo({
+						// 	  	url: '/pages/resource/courseDetail?id=' + item.pageParams
+						// 	  })
+						// 	}
+						//   })
 				    }
 				} else {
 					if (item.refType == 2) {
@@ -110,20 +108,20 @@
 								url: '/pages/resource/qaDetail?id=' + item.refId
 							});
 					} else {
-						// uni.navigateTo({
+						uni.navigateTo({
-						//  	url: '/pages/study/courseStudy?id='  + item.refId 
+							url: '/pages/resource/courseDetail?id=' + item.refId
-						// });
-						apiCourseStudy.hasSignup(item.refId).then(rs => {
-							if (rs.status == 200) {
-							  uni.navigateTo({
-							  	url: '/pages/study/courseStudy?id=' + item.refId
-							  })
-							} else {
-							  uni.navigateTo({
-							  	url: '/pages/resource/courseDetail?id=' + item.refId
-							  })
-							}
 						  })
+						// apiCourseStudy.hasSignup(item.refId).then(rs => {
+						// 	if (rs.status == 200) {
+						// 	  uni.navigateTo({
+						// 	  	url: '/pages/study/courseStudy?id=' + item.refId
+						// 	  })
+						// 	} else {
+						// 	  uni.navigateTo({
+						// 	  	url: '/pages/resource/courseDetail?id=' + item.refId
+						// 	  })
+						// 	}
+						//   })
 					}
 				}
 			},

pages/my/toMeShares.vue

@@ -262,15 +262,15 @@ export default {
 			//  	url: '/pages/study/courseStudy?id='  + citem.id
 			// });
 			apiCourseStudy.hasSignup(citem.id).then(rs => {
-				if (rs.status == 200) {
+				// if (rs.status == 200) {
-				  uni.navigateTo({
+				//   uni.navigateTo({
-				  	url: '/pages/study/courseStudy?id=' + citem.id
+				//   	url: '/pages/study/courseStudy?id=' + citem.id
-				  })
+				//   })
-				} else {
+				// } else {
 				  uni.navigateTo({
 				  	url: '/pages/resource/courseDetail?id=' + citem.id
 				  })
-				}
+				// }
 			  })
 			// if (citem.contentType == 10) {
 			// 	uni.navigateTo({

pages/resource/courseDetail.vue

@@ -353,14 +353,36 @@
 						this.sectionList = rs.result.sections;
 						//study info
 						this.loadStudyInfo();
+						this.isSignUp()
 					} else {
 						this.$refs.messager.show({
 							message: rs.message,
 							type: 'error'
 						});
 					}
+				}).catch(error=>{
+					setTimeout(function() {
+						uni.hideLoading();
+					}, 100);
+					this.$refs.messager.show({
+						message: '课程不存在或已被删除',
+						type: 'error'
+					});
 				});
 			},
+			isSignUp() {
+			     apiCourseStudy.hasSignup(this.courseId).then(res =>{
+			       if(res.result) {
+			         apiCourseStudy.lastStudy().then(rs=>{
+					   if(rs.status==200){
+						 this.studyName="继续学习";
+					   }
+					 });
+			       } else {
+			         //this.startSigningUp();
+			       }
+			     })
+			   },
 			loadAuthorInfo(list, ids) {
 				//加载作者信息，头像，机构信息
 				if (ids.length == 0) {

pages/resource/search.vue

@@ -582,7 +582,6 @@ import cellGroup from '../../uni_modules/uview-ui/libs/config/props/cellGroup'
 				let $this=this;
 				let dataList = [];
 				this.course.params.userId = this.userInfo.aid
-				console.log(this.userInfo.aid,'aaaaa')
 				await apiCoursePortal.courseSearch(this.course.params).then(rs=>{
 					setTimeout(function(){ uni.hideLoading();},100);
 					if(rs.status==200){
@@ -750,7 +749,6 @@ import cellGroup from '../../uni_modules/uview-ui/libs/config/props/cellGroup'
 			  });
 			},
 			toCoursePage(coure){
-				console.log(coure,'coure')
 				if(!coure.source){
 					uni.navigateTo({
 						url: '/pages/study/courseStudy?id=' + coure.id