From 216ac6b0a39e2eccfae1887aa76b0f42689b9173 Mon Sep 17 00:00:00 2001 From: daihh Date: Fri, 14 Oct 2022 16:17:18 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=B8=AA=E4=BA=BA=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5=E4=B8=8D=E5=AF=B9=E7=9A=84=EF=BC=8C=E6=88=96=E6=9C=AA?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=9A=84=E5=9C=B0=E6=96=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/HomePage/homePage.vue | 296 +++++++++++++++++++-------- src/components/Portal/authorInfo.vue | 12 +- src/components/Portal/comments.vue | 6 +- src/components/PortalHeader.vue | 38 ++-- src/components/UcHeader/Index.vue | 1 - src/router/index.js | 4 +- src/views/error/401.vue | 19 +- src/views/error/404.vue | 54 ++--- src/views/error/500.vue | 51 ++--- src/views/homepage/Index.vue | 31 ++- src/views/homepage/page.vue | 11 +- src/views/portal/article/Detail.vue | 3 +- src/views/portal/case/Detail.vue | 3 +- 13 files changed, 342 insertions(+), 187 deletions(-) diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue index 67dd64de..c3e37d4d 100644 --- a/src/components/HomePage/homePage.vue +++ b/src/components/HomePage/homePage.vue @@ -1,67 +1,67 @@ - + - - - \ No newline at end of file diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue index 1b3dceca..9deef95e 100644 --- a/src/components/Portal/authorInfo.vue +++ b/src/components/Portal/authorInfo.vue @@ -73,7 +73,12 @@ import { userAvatarText } from "@/utils/tools.js"; methods:{ toHome() { // ,query:{id:item.objId || item.id} - this.$router.push({path:'/home/index?id='+this.aid}) + if(this.aid){ + this.$router.push({path:'/home/index?id='+this.aid}) + }else{ + this.$message.error("参数错误"); + } + } }, watch:{ @@ -85,6 +90,11 @@ import { userAvatarText } from "@/utils/tools.js"; this.userAvatar=this.baseUrl+newVal; } }, + aid(newVal,oldVal){ + if(newVal){ + this.aid=newVal; + } + }, sex(newVal,oldVal){ this.usersex=newVal; }, diff --git a/src/components/Portal/comments.vue b/src/components/Portal/comments.vue index 00441374..40f29474 100644 --- a/src/components/Portal/comments.vue +++ b/src/components/Portal/comments.vue @@ -72,7 +72,7 @@
- +
@@ -114,7 +114,7 @@
- + @@ -168,7 +168,7 @@
- + 回复 {{reply.replyName || reply.toAname}}
diff --git a/src/components/PortalHeader.vue b/src/components/PortalHeader.vue index 1ad28210..f03a6c27 100644 --- a/src/components/PortalHeader.vue +++ b/src/components/PortalHeader.vue @@ -97,11 +97,11 @@
- +
-
-
+
+
{{userInfo.name}}
@@ -488,22 +488,22 @@ export default { cursor: pointer; color: #000000; } - // .uavatar{ - // div{ - // border-radius: 50%; - // img{ - // border-radius: 50%; - // width: 30px; - // height: 30px; - // } - // } - // width: 30px; - // height: 30px; - // line-height: 30px; - // font-size: 14px; - // margin-right: 8px; - // border-radius: 50%; - // } + .uavatar{ + div{ + border-radius: 50%; + img{ + border-radius: 50%; + width: 30px; + height: 30px; + } + } + width: 30px; + height: 30px; + line-height: 30px; + font-size: 14px; + margin-right: 8px; + border-radius: 50%; + } .user-avatar{ display: inline-block; border-radius: 50%; diff --git a/src/components/UcHeader/Index.vue b/src/components/UcHeader/Index.vue index 9fd40317..3f8fd660 100644 --- a/src/components/UcHeader/Index.vue +++ b/src/components/UcHeader/Index.vue @@ -282,7 +282,6 @@ import {userAvatarText,cutFullName} from "@/utils/tools.js"; .uc-header{ height: 210px; - background-color: #fff; background-image: url('../../../public/images/userbgimg.png') ; background-repeat: no-repeat; diff --git a/src/router/index.js b/src/router/index.js index 442caea7..f7dfcdca 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -155,13 +155,13 @@ export const constantRoutes = [{ component: (resolve) => require(['@/views/homepage/Index'], resolve), name: 'homePage', redirect: '/home/index', - meta: { title: '主页', icon: 'dashboard', noCache: true, affix: false }, + meta: { title: '个人主页', icon: 'dashboard', noCache: true, affix: false }, children: [{ path: 'index', hidden: true, component: (resolve) => require(['@/views/homepage/page'], resolve), name: 'page', - meta: { title: '主页', icon: 'dashboard', noCache: true, affix: true } + meta: { title: '个人主页', icon: 'dashboard', noCache: true, affix: true } }, { path: 'leaving', diff --git a/src/views/error/401.vue b/src/views/error/401.vue index 243c97df..2804b6e8 100644 --- a/src/views/error/401.vue +++ b/src/views/error/401.vue @@ -1,8 +1,8 @@ - + - \ No newline at end of file diff --git a/src/views/homepage/page.vue b/src/views/homepage/page.vue index 975ed233..31a69580 100644 --- a/src/views/homepage/page.vue +++ b/src/views/homepage/page.vue @@ -126,8 +126,17 @@ // } // } // }, - mounted() { + created(){ + if(this.$route.query.id && this.$route.query.id!=''){ this.init(); + }else{ + //this.$message.error("参数错误"); + //跳转到错误页面 + this.$router.push({path:'/404'}) + } + }, + mounted() { + }, methods:{ init(){ diff --git a/src/views/portal/article/Detail.vue b/src/views/portal/article/Detail.vue index 0bff7c24..b4620b64 100644 --- a/src/views/portal/article/Detail.vue +++ b/src/views/portal/article/Detail.vue @@ -18,7 +18,7 @@
{{articleDetailData.title}}
- +
{{authorSign}} @@ -147,6 +147,7 @@ export default { articleId:'', shareUsers:[], articleDetailData:{ + sysCreateAid:'', avatar:'', name:'', orgInfo:'', diff --git a/src/views/portal/case/Detail.vue b/src/views/portal/case/Detail.vue index 6a9d11f2..636ad162 100644 --- a/src/views/portal/case/Detail.vue +++ b/src/views/portal/case/Detail.vue @@ -18,7 +18,7 @@ {{ caseDetail.sysCreateTime.substring(0,10) }}
- + 案主：{{ authorInfo.name }} ({{authorInfo.orgInfo}})