From ebf92f4fd0b2744e9540c132d53b03c0868684e2 Mon Sep 17 00:00:00 2001 From: zhaofang <752743406@qq.com> Date: Thu, 22 Sep 2022 17:25:01 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=96=99=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomePage/homePage.vue | 45 +++- src/components/UcHeader/Index.vue | 2 +- src/icons/svg/passWard-edit.svg | 13 ++ src/views/homepage/leavingMessage.vue | 4 +- src/views/user/Setting.vue | 299 ++++++++++++++++---------- 5 files changed, 242 insertions(+), 121 deletions(-) create mode 100644 src/icons/svg/passWard-edit.svg diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue index 433d6d82..dbb0b27d 100644 --- a/src/components/HomePage/homePage.vue +++ b/src/components/HomePage/homePage.vue @@ -6,27 +6,27 @@ -->
- +
-
+
-
{{userInfo.name}} +
{{userData.data.name}}
-
LV.1
- 经验值：367 +
{{userData.level}}
+ 经验值：{{userData.evalue}}
关注TA 已关注 去留言
-

你必须非常努力才能看起来毫不费力

+

{{userData.data.sign}}

@@ -67,6 +67,7 @@ import { mapGetters } from 'vuex' import apiStart from '@/api/phase2/stat.js'; import apiFollow from "@/api/phase2/userfollow.js" + import apiUser from "@/api/system/user.js"; export default { name: 'UcHeader', computed:{ @@ -89,6 +90,20 @@ sex:'', pageId:'', isFollowHas:false, + userData:{ + evalue: 0, + level: "", + data:{ + aid: "", + avatar: "", + code: "", + name: "", + orgInfo: "", + sex: 2, + sign: "", + } + + } } }, mounted() { @@ -100,12 +115,28 @@ } this.orgInfo=cutFullName(this.userInfo.departFullName,1); this.getInfo(); + this.getLevel(); if(this.pageId !== this.userInfo.aid) { this.followHas(); } }, methods:{ - followHas() { + getLevel(){//获取经验值和等级 + apiStart.getUserEValueAndLevel(this.pageId).then(res=>{ + if(res.status == 200) { + this.userData.evalue = res.result.evalue; + this.userData.level = res.result.level; + } + }); + apiUser.getByIds([this.pageId]).then(res => { + if (res.status == 200) { + this.userData.data = res.result[0]; + } else { + this.$message.error(res.message); + } + }); + }, + followHas() {//他人主页，判断关注状态 apiFollow.has(this.pageId).then(res=>{ if(res.status == 200) { this.isFollowHas = res.result; diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index 3e1bc21d..c0b6e183 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -179,7 +179,7 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; this.$store.dispatch('SetCurIdentity',iden); }, jumrank(){ - this.$router.push({ path: '/user/ranking' }); + this.$router.push('/user/ranking'); }, toPage(url){ diff --git a/src/icons/svg/passWard-edit.svg b/src/icons/svg/passWard-edit.svg new file mode 100644 index 00000000..3dbe390d --- /dev/null +++ b/src/icons/svg/passWard-edit.svg @@ -0,0 +1,13 @@ + + + 编组 26 + + + + + + + + + + \ No newline at end of file diff --git a/src/views/homepage/leavingMessage.vue b/src/views/homepage/leavingMessage.vue index ac9e9f56..35879ed1 100644 --- a/src/views/homepage/leavingMessage.vue +++ b/src/views/homepage/leavingMessage.vue @@ -146,6 +146,7 @@ apiGuestbook.answer(this.replysData).then(res=>{ if(res.status == 200) { this.$message.success('留言发布成功'); + // this.leavingList.push() this.leavingList.forEach(item=>{ item.isReplys = false; }) @@ -178,7 +179,8 @@ apiGuestbook.save(data).then(res=>{ if(res.status == 200) { this.textarea = ''; - this.leavingList.push(res.result); + // this.leavingList.push(res.result); + this.getList(); this.$message.success('留言发布成功'); } else { this.$message.error(res.message); diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue index e8d20b77..c0f72532 100644 --- a/src/views/user/Setting.vue +++ b/src/views/user/Setting.vue @@ -1,65 +1,77 @@