diff --git a/public/images/gonggao/dlg_bg.png b/public/images/gonggao/dlg_bg.png new file mode 100644 index 00000000..4a928fbd Binary files /dev/null and b/public/images/gonggao/dlg_bg.png differ diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 5ec415c6..c1b630d5 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -1311,6 +1311,15 @@ export default { if (this.sysTypeList.length > 2) { this.courseInfo.sysType3 = this.sysTypeList[2]; //三级的id } + + //受众的处理 + let crowds=[]; + this.courseCrowds.forEach(item=>{ + crowds.push({ + groupId:item.key, + groupName:item.value + }) + }); let saveTeachers = []; this.teacherValues.forEach(item => { @@ -1318,7 +1327,8 @@ export default { }); let postData = { course: this.courseInfo, - teachers: saveTeachers + teachers: saveTeachers, + crowds:crowds }; this.btnLoading = true; let $this = this; diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue index 265823a2..cbb42c77 100644 --- a/src/components/Course/myNote.vue +++ b/src/components/Course/myNote.vue @@ -9,7 +9,7 @@
- {{formatSeconds(play_Time)}}1 + {{formatSeconds(play_Time)}}
diff --git a/src/components/Gonggao.vue b/src/components/Gonggao.vue new file mode 100644 index 00000000..45dd035b --- /dev/null +++ b/src/components/Gonggao.vue @@ -0,0 +1,59 @@ + + + + + diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue index 96b9d553..70b5e0a6 100644 --- a/src/components/HomePage/courseList.vue +++ b/src/components/HomePage/courseList.vue @@ -15,7 +15,7 @@
-
{{item.info.courseName || item.contentInfo}} +
{{item.info.courseName || item.contentInfo}} {{sysTypeName(item.info.sysType1)}} {{sysTypeName(item.info.sysType2)}} {{sysTypeName(item.info.sysType3)}} @@ -96,8 +96,9 @@ }, jumpDetail(data) { if(!data.contentId){ - return; + return; } + this.$router.push({ path: '/course/detail?id=', query: { id: data.contentId } }); } } diff --git a/src/components/HomePage/followList.vue b/src/components/HomePage/followList.vue index 27325b3c..0bfd1151 100644 --- a/src/components/HomePage/followList.vue +++ b/src/components/HomePage/followList.vue @@ -262,7 +262,7 @@ import apiUser from "@/api/system/user.js"; }) this.followMe.list = res.result.list; //console.log(this.mypageList,'this.mypageList'); - this.getUserData(res.result.list); + this.getUserData(res.result.list,2); }else{ console.log('加载关注我数据错误:'+res.message); } @@ -280,26 +280,26 @@ import apiUser from "@/api/system/user.js"; item.userFollow.authorInfo = { aid: "",name: "",orgInfo: "",avatar: "",sex: null ,sign:''} }) this.follow.list = res.result.list; - this.getUserData(res.result.list); + this.getUserData(res.result.list, 1); } }) }, - getUserData(list) { + // num 判断是哪个接口 + getUserData(list,num) { let ids = []; - if(this.active == 2) { + if(num == 2) { ids = list.map(item=> item.userFollow.aid); } else { ids = list.map(item=> item.userFollow.followId); } - apiUser.getByIds(ids).then(res => { if (res.status == 200) { list.forEach((item, index) => { res.result.some(author => { - if (this.active == 1 && author.aid == item.userFollow.followId) { + if (num == 1 && author.aid == item.userFollow.followId) { item.userFollow.authorInfo = author; return true; - } else if(this.active == 2 && author.aid == item.userFollow.aid){ + } else if(num == 2 && author.aid == item.userFollow.aid){ item.userFollow.authorInfo = author; return true; } else { diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index ddb4d6fe..86556ca9 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -44,14 +44,14 @@
- - + +
我的关注
- +
@@ -124,11 +124,13 @@
+ - + - \ No newline at end of file diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue index 7f476fe5..4198706c 100644 --- a/src/views/homepage/page.vue +++ b/src/views/homepage/page.vue @@ -6,7 +6,7 @@ --> - + 动态 - + 课程 - + 案例 - + 笔记 - + 提问 - + 回答 - + 文章 @@ -97,6 +97,13 @@ }, data(){ return{ + loading:false, + loading1:false, + loading2:false, + loading3:false, + loading4:false, + loading5:false, + loading6:false, intTabIndex:-1,//初始化显示哪个tab,71我关注的人，72关注我的人 page:{ pageIndex:1, @@ -193,13 +200,37 @@ aid:this.pageId, //指定用户的动态， hidden:this.pageId == this.userInfo.aid?'':false,//是否隐藏，不指定，查询全部 } + if(this.activeName == '1') { + this.loading1 = true; + } else if(this.activeName == '2') { + this.loading2 = true; + } else if(this.activeName == '3') { + this.loading3 = true; + } else if(this.activeName == '4') { + this.loading4 = true; + } else if(this.activeName == '5') { + this.loading5 = true; + } else if(this.activeName == '6') { + this.loading6 = true; + } else { + this.loading = true; + } + // this.loading = true; apiStat.userDynamicList(data).then(res=>{ + this.loading = false; + this.loading1 = false; + this.loading2 = false; + this.loading3 = false; + this.loading4 = false; + this.loading5 = false; + this.loading6 = false; if(res.status == 200) { this.page.count = res.result.count; let ids = res.result.list.map(item=>item.contentId); const noReapetIds = [...new Set(ids)]; res.result.list.forEach(item=>{ item.info = {}; + item.deleted=false; item.authorInfo = { aid: "", name: "", @@ -472,6 +503,7 @@ res.result.some(con => { if (con.courseId == item.contentId) { item.info = con; + item.deleted=con.deleted; return true; } else { return false; diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue index 13126339..1017b98b 100644 --- a/src/views/medal/Index.vue +++ b/src/views/medal/Index.vue @@ -17,7 +17,7 @@
- +

上线纪念

查看详情 @@ -47,7 +47,7 @@ @@ -68,9 +68,9 @@ -
+
-
感谢有你 一路相伴
+
感谢有您 一路相伴
勋章领取条件:
2022年11月4日-11月19日登录过平台学习的校友
diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index 6c88bd9f..e1f38439 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -75,7 +75,7 @@ - {{ item.sysCreateUname }} {{ item.orinfo }} + {{ item.sysCreateUname }} {{ item.orinfo }} diff --git a/src/views/portal/article/Index.vue b/src/views/portal/article/Index.vue index 0a38ff0a..6c2ee664 100644 --- a/src/views/portal/article/Index.vue +++ b/src/views/portal/article/Index.vue @@ -96,7 +96,7 @@ - {{ item.sysCreateUname }}{{ item.orinfo }} + {{ item.sysCreateUname }} {{ item.orinfo }} diff --git a/src/views/portal/follow/index.vue b/src/views/portal/follow/index.vue index e22d7d03..4c4035ea 100644 --- a/src/views/portal/follow/index.vue +++ b/src/views/portal/follow/index.vue @@ -13,7 +13,7 @@
--> - + -
+

暂时没有动态

- + - + - + - + - + - + @@ -101,8 +101,15 @@ components:{portalHeader,UcHeader,CaseList,CourseList,NoteList,PutList,AnswerList,ArticleList,FollowList,BookList}, data(){ return{ + loading:false, + loading1:false, + loading2:false, + loading3:false, + loading4:false, + loading5:false, + loading6:false, input:'', - loading:0,//加载中 + // loading:0,//加载中 activeName:'first', page:{ pageIndex:1, @@ -174,8 +181,29 @@ contentType:this.activeName == 0? '':this.activeName,//内容类型 aids:this.followIds // 数组 } + if(this.activeName == '1') { + this.loading1 = true; + } else if(this.activeName == '2') { + this.loading2 = true; + } else if(this.activeName == '3') { + this.loading3 = true; + } else if(this.activeName == '4') { + this.loading4 = true; + } else if(this.activeName == '5') { + this.loading5 = true; + } else if(this.activeName == '6') { + this.loading6 = true; + } else { + this.loading = true; + } apiStat.userDynamicfollows(data).then(res=>{ - this.loading=1; + this.loading = false; + this.loading1 = false; + this.loading2 = false; + this.loading3 = false; + this.loading4 = false; + this.loading5 = false; + this.loading6 = false; if(res.status == 200) { this.page.count = res.result.count; if(res.result.count==0){ diff --git a/src/views/portal/qa/Answer.vue b/src/views/portal/qa/Answer.vue index 5e361601..566ed72a 100644 --- a/src/views/portal/qa/Answer.vue +++ b/src/views/portal/qa/Answer.vue @@ -228,7 +228,6 @@ 提问题
-

贡献榜

    @@ -248,7 +247,7 @@ - {{ item.sysCreateUname }} {{ item.orinfo }} + {{ item.sysCreateUname }} {{ item.orinfo }}
diff --git a/src/views/portal/qa/Index.vue b/src/views/portal/qa/Index.vue index f03f7e21..90dd9ae5 100644 --- a/src/views/portal/qa/Index.vue +++ b/src/views/portal/qa/Index.vue @@ -102,7 +102,7 @@ - {{ item.sysCreateUname }}{{ item.orinfo }} + {{ item.sysCreateUname }} {{ item.orinfo }}
diff --git a/src/views/study/Courses.vue b/src/views/study/Courses.vue index 32a565e4..bd1b01a5 100644 --- a/src/views/study/Courses.vue +++ b/src/views/study/Courses.vue @@ -68,8 +68,8 @@ - 开始学习 - 继续学习 + + 继续学习 回顾 diff --git a/src/views/user/Noteedit.vue b/src/views/user/Noteedit.vue index b18b58ff..823816d1 100644 --- a/src/views/user/Noteedit.vue +++ b/src/views/user/Noteedit.vue @@ -200,13 +200,13 @@ export default { this.timer = null; this.$router.go(-1); } - } else { - this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新自动上传！'; + } + }).catch(()=>{ + this.isShowTip = '当前网络异常，内容已离线保存，请尝试连接网络后重新自动上传！'; setTimeout(()=>{ this.isShowTip = ''; },10000 * 2) - sessionStorage.setItem('isShowTip',this.editdata.content); - } + sessionStorage.setItem('isShowTip',this.editdata.content); }) } },