From 4de66a290dfb618dedb33e331470af09cf31ce70 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 4 Nov 2022 10:56:29 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/Index.vue | 2 +- src/views/medal/Index.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/Index.vue b/src/views/Index.vue index 56fafca4..48374339 100644 --- a/src/views/Index.vue +++ b/src/views/Index.vue @@ -442,7 +442,7 @@
-
感谢有你 一路相伴
+
感谢有您 一路相伴
勋章领取条件:
2022年11月4日-11月19日登录过平台学习的校友
diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue index 13126339..1f8140a6 100644 --- a/src/views/medal/Index.vue +++ b/src/views/medal/Index.vue @@ -47,7 +47,7 @@ @@ -70,7 +70,7 @@
-
感谢有你 一路相伴
+
感谢有您 一路相伴
勋章领取条件:
2022年11月4日-11月19日登录过平台学习的校友
From 5cf98ed2e1ab1bd5b5e5b12a78b8a0cb82e25448 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 4 Nov 2022 11:05:55 +0800 Subject: [PATCH 2/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/user/Noteedit.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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); }) } }, From 14a8947cdf4eea1fe08eb6a3cef6466074de5463 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 4 Nov 2022 11:19:55 +0800 Subject: [PATCH 3/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomePage/followList.vue | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 { From eec444170c2f057e0356bd8a53dcb6eebfea02a9 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 4 Nov 2022 11:43:18 +0800 Subject: [PATCH 4/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/medal/Index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/medal/Index.vue b/src/views/medal/Index.vue index 1f8140a6..85433ba1 100644 --- a/src/views/medal/Index.vue +++ b/src/views/medal/Index.vue @@ -47,7 +47,7 @@ From bd09be3d4f5eb40e093639db4a40ecfd39572ed2 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 4 Nov 2022 12:04:21 +0800 Subject: [PATCH 5/9] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5loading?= =?UTF-8?q?=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/homepage/page.vue | 50 +++++++++++++++++++++++++++++++------ 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue index 7f476fe5..1285314d 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,7 +200,36 @@ aid:this.pageId, //指定用户的动态， hidden:this.pageId == this.userInfo.aid?'':false,//是否隐藏，不指定，查询全部 } + console.log(this.activeName,'this.activeName'); + 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); From 8e664c3ca7d95312df0b4d4e4df55e7d8dff973e Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Fri, 4 Nov 2022 13:49:14 +0800 Subject: [PATCH 6/9] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/UserCenter/menu.vue | 4 ++-- src/views/homepage/page.vue | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/UserCenter/menu.vue b/src/components/UserCenter/menu.vue index d239cbc0..a1408825 100644 --- a/src/components/UserCenter/menu.vue +++ b/src/components/UserCenter/menu.vue @@ -93,14 +93,14 @@ 问答管理 - + - +