hz/learning-system-mobile
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-mobile.git synced 2025-12-15 05:46:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zcwyMaster' into 'dev0731'

Browse Source 
Zcwy master

See merge request !23
This commit is contained in:
joshen
2023-11-23 16:45:33 +08:00
parent 7cf3ac3d35 ba7112b8c6
commit 11d25ce30e
4 changed files with 54 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
components/system-news/system-news.vue
View File

@@ -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({
// url: '/pages/study/courseStudy?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
})
}
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({
// url: '/pages/study/courseStudy?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
})
}
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
// })
// }
// })
}
}
},

12
pages/my/toMeShares.vue
View File

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

22
pages/resource/courseDetail.vue
View File

@@ -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) {

2
pages/resource/search.vue
View File

@@ -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