- {{item.commentTime}}
+ {{item.commentTime}}
@@ -252,15 +252,15 @@
- {{ formatNumber(item.likeNum) }}
- 点赞
+ {{ formatNumber(item.likeNum) }}
+ 点赞
- {{item.commentTime}}
+ {{item.commentTime}}
@@ -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 @@
- {{ formatNumber(item.likeNum) }}
- 点赞
+ {{ formatNumber(item.likeNum) }}
+ 点赞
- ![]()
+ ![]()
- {{projectLists.projectTitle}}
+ {{projectLists.projectTitle}}
{{projectLists.num}}
@@ -14,18 +14,18 @@
-
@@ -39,7 +39,7 @@ export default {
name: "ProjectList",
data(){
return{
- // 作答卡片颜色设置
+ // 颜色设置
colorlists: [
'hsl(62,90%,49%)',
'hsl(138,63%,59%)',
@@ -63,7 +63,7 @@ export default {
computed: {
// 对时间进行格式化
formatTime: function() {
- if (this.projectLists) {
+ if (this.projectLists.submitTime) {
const dt = new Date(this.projectLists.submitTime)
const year=dt.getFullYear()
const month = dt.getMonth()
@@ -74,7 +74,12 @@ export default {
},
// 截取文章内容的前 35 个字，并加上省略号
brief: function() {
- return this.projectLists.projectDescription.substr(0, 33) + '...';
+ if(this.projectLists.projectDescription){
+ return this.projectLists.projectDescription.substr(0, 33) + '...';
+ }else{
+ return false;
+ }
+
},
},
diff --git a/src/components/System/Manage/commentManage.vue b/src/components/System/Manage/commentManage.vue
index ca51b3e..bd46a28 100644
--- a/src/components/System/Manage/commentManage.vue
+++ b/src/components/System/Manage/commentManage.vue
@@ -54,12 +54,12 @@
:show-overflow-tooltip="true"
label="评论时间">
-
- {{ projectLists.projectName }} •
+ {{ projectLists.projectName }} •
- {{ formatTime }}
+ {{ formatTime }}
- {{ formatNumber(projectLists.lookCount) }}
+ {{ formatNumber(projectLists.lookCount) }}
-
@@ -288,7 +288,7 @@ export default {
// 删除按钮
handleDelete(index) {
var that=this;
- this.$confirm('此操作将永久删除该用户, 是否继续?', '提示', {
+ this.$confirm('此操作将永久删除, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
diff --git a/src/components/User/UserArticles.vue b/src/components/User/UserArticles.vue
index 6fe7445..334438e 100644
--- a/src/components/User/UserArticles.vue
+++ b/src/components/User/UserArticles.vue
@@ -2,10 +2,10 @@
文章管理
+ 系统管理
-
-
+
{{article.ArticleTitle}}
@@ -13,15 +13,15 @@
@@ -44,7 +44,12 @@ export default {
},
computed:{
brief: function() {
- return this.article.ArticleContent.substr(0, 48) + '...';
+ if (this.article.ArticleContent){
+ return this.article.ArticleContent.substr(0, 48) + '...';
+
+ }else{
+ return false;
+ }
},
},
methods:{
@@ -52,12 +57,17 @@ export default {
return num >= 1e3 && num < 1e4 ? (num / 1e3).toFixed(1) + 'k' : num >= 1e4 ? (num / 1e4).toFixed(1) + 'w' : num
},
goToArticleDetail(){
- this.$router.push({
- path:'/ArticleDetail',
- query: {
- id: this.article.ArticleId,
- refresh: true
- }})
+ if(this.article.ArticleId){
+ this.$router.push({
+ path:'/ArticleDetail',
+ query: {
+ id: this.article.ArticleId,
+ refresh: true
+ }})
+ }else{
+ return false;
+ }
+
// console.log(this.$route.query.id)
},
}
diff --git a/src/components/User/UserComments.vue b/src/components/User/UserComments.vue
index 8578129..79821b3 100644
--- a/src/components/User/UserComments.vue
+++ b/src/components/User/UserComments.vue
@@ -2,7 +2,7 @@
申诉
@@ -21,6 +21,7 @@
评分:
@@ -32,7 +33,7 @@
没用过
-
+
{{comments.content}}
@@ -71,7 +72,7 @@ export default {
},
computed:{
formatTime: function() {
- if (this.comments) {
+ if (this.comments.commentTime) {
const dt = new Date(this.comments.commentTime)
const year=dt.getFullYear()
const month = dt.getMonth()
@@ -83,11 +84,16 @@ export default {
},
methods:{
toCommentDeatil(){
- this.$router.push({
- path:'/ProjectDetail',
- query: {
- id: this.comments.projectId, refresh: true
- }})
+ if(this.comments.projectId){
+ this.$router.push({
+ path:'/ProjectDetail',
+ query: {
+ id: this.comments.projectId, refresh: true
+ }})
+ }else{
+ return false;
+ }
+
}
},
}
diff --git a/src/components/User/UserInfo.vue b/src/components/User/UserInfo.vue
index acb5cd0..3735b5f 100644
--- a/src/components/User/UserInfo.vue
+++ b/src/components/User/UserInfo.vue
@@ -10,15 +10,15 @@
-
+
作者: {{article.username}}
-
+
发布于: {{article.publishtime}}
- {{formatNumber(article.ReadCount)}}
+ {{formatNumber(article.ReadCount)}}
- {{index+1}}. 在 {{comments.commentTime}} 发布的评论
+ {{index+1}}. 在 {{comments.commentTime}} 发布的评论
@@ -46,7 +47,7 @@
非热评
•
点赞
- {{comments.likeNum}}
+ {{comments.likeNum}}
贡献值
- {{ContributionValue}}/100
+ {{ContributionValue}}/100
-
diff --git a/src/components/User/UserInfoPage.vue b/src/components/User/UserInfoPage.vue
index 8bc24d3..528e4d8 100644
--- a/src/components/User/UserInfoPage.vue
+++ b/src/components/User/UserInfoPage.vue
@@ -19,7 +19,7 @@
- {{username}}
+ {{username}}
Lv.{{userLevel}}
你是 HelloGitHub 社区的第 {{userId}} 位用户，于 {{creatTime}} 加入。
@@ -35,7 +35,7 @@
{{contributionValue}}
0
点贡献值.
-
+
{{Object.keys(article).length}}
篇文章。
@@ -194,42 +194,52 @@ export default {
window.history.go(-1);
},
getUserInfo(){
- var that=this;
- axios({
- method: 'post',
- // 请求的地址
- url: 'http://localhost:8082/helloGithub_war_exploded/retUser',
- // URL 中的查询参数
- params: {
- username:this.$route.query.name
- }
- }).then(function (res) {
- that.username=res.data.userName;
- that.contributionValue=res.data.contributionValue;
- that.creatTime=res.data.creatTime;
- that.projectNum=res.data.projectNum;
- that.userId=res.data.userId;
- // that.imageUrl=res.data.userAvatar;
- that.userLevel=res.data.userLevel;
- });
+ if(this.$route.query.name){
+ var that=this;
+ axios({
+ method: 'post',
+ // 请求的地址
+ url: 'http://localhost:8082/helloGithub_war_exploded/retUser',
+ // URL 中的查询参数
+ params: {
+ username:this.$route.query.name
+ }
+ }).then(function (res) {
+ that.username=res.data.userName;
+ that.contributionValue=res.data.contributionValue;
+ that.creatTime=res.data.creatTime;
+ that.projectNum=res.data.projectNum;
+ that.userId=res.data.userId;
+ // that.imageUrl=res.data.userAvatar;
+ that.userLevel=res.data.userLevel;
+ });
+ }else {
+ return false;
+ }
+
},
getUserDetail(){
- var that=this;
- axios({
- method: 'post',
- // 请求的地址
- url: 'http://localhost:8082/helloGithub_war_exploded/userDetail',
- // URL 中的查询参数
- params: {
- username:this.$route.query.name
- }
- }).then(function (res) {
- // console.log(res);
- that.projectList=JSON.parse(res.data.project);
- that.commentList=JSON.parse(res.data.comment);
- that.like=JSON.parse(res.data.like)
- that.article=JSON.parse(res.data.article);
- });
+ if(this.$route.query.name){
+ var that=this;
+ axios({
+ method: 'post',
+ // 请求的地址
+ url: 'http://localhost:8082/helloGithub_war_exploded/userDetail',
+ // URL 中的查询参数
+ params: {
+ username:this.$route.query.name
+ }
+ }).then(function (res) {
+ // console.log(res);
+ that.projectList=JSON.parse(res.data.project);
+ that.commentList=JSON.parse(res.data.comment);
+ that.like=JSON.parse(res.data.like)
+ that.article=JSON.parse(res.data.article);
+ });
+ }else {
+ return false;
+ }
+
},
updateUserLevel(){
if(this.$cookie.get("username")!=null){
@@ -238,9 +248,6 @@ export default {
// 请求的地址
url: 'http://localhost:8082/helloGithub_war_exploded/levelup',
// URL 中的查询参数
- params: {
-
- }
});
}else{
return;
diff --git a/src/components/User/UserProjects.vue b/src/components/User/UserProjects.vue
index 82106d7..ccd61a8 100644
--- a/src/components/User/UserProjects.vue
+++ b/src/components/User/UserProjects.vue
@@ -2,24 +2,24 @@
-
- {{project.projectName}}
+ {{project.projectName}}
{{brief}}
-
+
{{project.categoryName}}
●
- {{ formatNumber(project.lookCount) }}
+ {{ formatNumber(project.lookCount) }}
●
- {{project.submitTime}}
+ {{project.submitTime}}
●
待审核
已通过
@@ -57,7 +57,12 @@ export default {
},
computed:{
brief:function(){
- return this.project.projectDescription.substr(0, 38) + '...';
+ if(this.project.projectDescription){
+ return this.project.projectDescription.substr(0, 38) + '...';
+
+ }else{
+ return false;
+ }
},
},
methods:{
@@ -65,11 +70,16 @@ export default {
return num >= 1e3 && num < 1e4 ? (num / 1e3).toFixed(1) + 'k' : num >= 1e4 ? (num / 1e4).toFixed(1) + 'w' : num
},
toProjectDetail(){
- this.$router.push({
- path:'/ProjectDetail',
- query: {
- id: this.project.projectId, refresh: true
- }})
+ if(this.project.projectId){
+ this.$router.push({
+ path:'/ProjectDetail',
+ query: {
+ id: this.project.projectId, refresh: true
+ }})
+ }else {
+ return false;
+ }
+
}
}