From e6106c073f23e84837e7706bd57a3ecede70faed Mon Sep 17 00:00:00 2001 From: Qing Date: Wed, 12 Jul 2023 01:36:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Home/Home.vue | 21 ++--- src/components/OneFile/OneFile.vue | 2 +- src/components/OneFile/OneFileDetail.vue | 14 +-- src/components/Paper/ArticleDetail.vue | 6 +- src/components/Paper/ArticleList.vue | 31 ++++--- src/components/Project/ProjectDetail.vue | 68 ++++++++------- src/components/Project/ProjectList.vue | 23 +++-- .../System/Manage/commentManage.vue | 14 +-- .../System/Manage/projectManage.vue | 2 +- src/components/System/Manage/systemManage.vue | 4 +- src/components/User/UserArticles.vue | 34 +++++--- src/components/User/UserComments.vue | 24 ++++-- src/components/User/UserInfo.vue | 8 +- src/components/User/UserInfoPage.vue | 85 ++++++++++--------- src/components/User/UserProjects.vue | 32 ++++--- 15 files changed, 211 insertions(+), 157 deletions(-) diff --git a/src/components/Home/Home.vue b/src/components/Home/Home.vue index 39d4d9f..d27cfcb 100644 --- a/src/components/Home/Home.vue +++ b/src/components/Home/Home.vue @@ -70,7 +70,7 @@
- 登 录 + 登 录 @@ -79,11 +79,11 @@
用户总数 - {{userTotal}} + {{userTotal}}
开源项目 - {{projectTotal}} + {{projectTotal}}
@@ -165,11 +165,14 @@ export default { mounted() { // this.account(); //获取cookie的方法 this.ProjectLists(); - this.categoryList(); - this.getUserTotal(); - this.getProjectTotal(); }, created() { + + this.categoryList(); + setTimeout(()=>{ + this.getProjectTotal(); + },1000) + this.getUserTotal(); }, computed: { noMore() { @@ -290,9 +293,6 @@ export default { method: 'post', // 请求的地址 url: '/api/userNum', - // URL 中的查询参数 - params: { - } }).then((res)=>{ that.userTotal=res.data; }); @@ -304,9 +304,6 @@ export default { // 请求的地址 url: '/api/countNum', // URL 中的查询参数 - params: { - - } }).then((res)=>{ that.projectTotal=res.data; }); diff --git a/src/components/OneFile/OneFile.vue b/src/components/OneFile/OneFile.vue index ed44791..a204bf0 100644 --- a/src/components/OneFile/OneFile.vue +++ b/src/components/OneFile/OneFile.vue @@ -77,7 +77,7 @@
- 提交 + 提交
diff --git a/src/components/OneFile/OneFileDetail.vue b/src/components/OneFile/OneFileDetail.vue index 505f3ba..98c6df9 100644 --- a/src/components/OneFile/OneFileDetail.vue +++ b/src/components/OneFile/OneFileDetail.vue @@ -15,25 +15,25 @@
- + {{oneFileName}} : - + {{description}}
发布于: - {{userName}} + {{userName}} · - 主语言 {{language}} + 主语言 {{language}} · - {{formatNumber(lookNum)}} + {{formatNumber(lookNum)}} 次查看
- 访问 + 访问 复制
@@ -42,6 +42,7 @@
-
+
{{ArticleTitle}}
- +
加载中...
@@ -21,7 +21,7 @@ - +
diff --git a/src/components/Paper/ArticleList.vue b/src/components/Paper/ArticleList.vue index b8bb38e..33bfaef 100644 --- a/src/components/Paper/ArticleList.vue +++ b/src/components/Paper/ArticleList.vue @@ -9,17 +9,17 @@
作者: - {{articleList.username}} + {{articleList.username}} ● 发布于 - {{articleList.publishtime}} + {{articleList.publishtime}} ● 阅读: - {{ formatNumber(articleList.ReadCount) }} + {{ formatNumber(articleList.ReadCount) }}
- +
@@ -37,7 +37,11 @@ export default { }, computed:{ brief: function() { - return this.articleList.ArticleContent.substr(0, 100) + '...'; + if(this.articleList.ArticleContent){ + return this.articleList.ArticleContent.substr(0, 100) + '...'; + }else{ + return false; + } }, }, methods:{ @@ -45,12 +49,17 @@ export default { return num >= 1e3 && num < 1e4 ? (num / 1e3).toFixed(1) + 'k' : num >= 1e4 ? (num / 1e4).toFixed(1) + 'w' : num }, goArticleDetail(){ - this.$router.push({ - path:'/ArticleDetail', - query: { - id: this.articleList.ArticleId, - refresh: true - }}) + if(this.articleList.ArticleId){ + this.$router.push({ + path:'/ArticleDetail', + query: { + id: this.articleList.ArticleId, + refresh: true + }}) + }else{ + return false; + } + // console.log(this.$route.query.id) }, } diff --git a/src/components/Project/ProjectDetail.vue b/src/components/Project/ProjectDetail.vue index 83c2c9f..ca166ab 100644 --- a/src/components/Project/ProjectDetail.vue +++ b/src/components/Project/ProjectDetail.vue @@ -21,7 +21,7 @@ {{ briefTopName }} - + {{projectTitle}} @@ -34,7 +34,7 @@ - + {{ commentNum }} 个评分 @@ -218,10 +218,10 @@
- {{item.commentTime}} + {{item.commentTime}}
- {{ formatNumber(item.likeNum) }} - 点赞 + {{ formatNumber(item.likeNum) }} + 点赞
@@ -252,15 +252,15 @@
- {{item.content}} + {{item.content}}
- {{item.commentTime}} + {{item.commentTime}}
- {{ formatNumber(item.likeNum) }} - 点赞 + {{ formatNumber(item.likeNum) }} + 点赞
@@ -392,22 +392,32 @@ export default { }, methods:{ toUserPage() { - this.$router.push({ - path: '/UserInfoPage', - query: { - name: this.username, - refresh: true - } - }) + if(this.username){ + this.$router.push({ + path: '/UserInfoPage', + query: { + name: this.username, + refresh: true + } + }) + }else { + return false; + } + }, toUserPage2(username) { - this.$router.push({ - path: '/UserInfoPage', - query: { - name: username, - refresh: true - } - }) + if(username){ + this.$router.push({ + path: '/UserInfoPage', + query: { + name: username, + refresh: true + } + }) + }else { + return false; + } + }, toComment(id){ document.querySelector(id).scrollIntoView(true) @@ -447,9 +457,12 @@ export default { that.username=res.data.project.username; that.fileAddress=res.data.project.fileAddress; // that.userUri=res.data.project.userUri; - that.getDetailByGitHub(); - // that.getGithub(); - that.changeAvatarByLocal(); + if(res.data){ + that.getDetailByGitHub(); + // that.getGithub(); + that.changeAvatarByLocal(); + } + }); }, reload() { @@ -698,9 +711,6 @@ export default { // 请求的地址 url: '/github/'+this.projectName, // URL 中的查询参数 - params: { - - } }).then((res)=>{ if(res.data){ that.github.starNum=res.data.stargazers_count; diff --git a/src/components/Project/ProjectList.vue b/src/components/Project/ProjectList.vue index 3005539..8bb2a56 100644 --- a/src/components/Project/ProjectList.vue +++ b/src/components/Project/ProjectList.vue @@ -1,11 +1,11 @@