Skip to content

V0.2.1 #59

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pulseum merged 5 commits into from
Aug 20, 2022
Merged

V0.2.1 #59

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2999e26
perf(vueblog): 博客详情目录滚动优化
Aug 20, 2022
358579b
fix(vueblog): 修复写博客页面点击文章管理不能跳转
Aug 20, 2022
6813a6e
perf(vueblog): 优化首页推荐高度不一致
Aug 20, 2022
46758bf
perf(vueblog): 优化登录注册方式，点击回车可以进行登录或注册
Aug 20, 2022
110bbcc
Merge branch 'main' of https://github.com/stick-i/blog-campus into ma…
Aug 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
perf(vueblog): 优化首页推荐高度不一致
  • Loading branch information
yinlian committed Aug 20, 2022
commit 6813a6e1c5cd80d745e58df3b1916603f6a681ac
11 changes: 8 additions & 3 deletions vueblog/src/views/home/childComps/FollowArticleItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export default {
headers: { token: localStorage.getItem("token") },
})
.then((res) => {
console.log(res);
// console.log(res);
// console.log(res.data.data.userAction)
if (res.data.data.userAction == null) {
this.isShow = false;
Expand All @@ -159,7 +159,7 @@ export default {
...this.userAction,
...res.data.data.userAction,
};
console.log(this.blogList);
// console.log(this.blogList);
$state.loaded();
} else {
$state.complete();
Expand All @@ -177,7 +177,7 @@ export default {
margin-left: 3px;
/* border-bottom: 1px solid #f0f0f2; */
background-color: #ffffff;
padding: 15px 0px 0 15px;
padding: 15px 15px 0 15px;
margin-bottom: 15px;

/* display: inline-block; */
Expand Down Expand Up @@ -244,6 +244,7 @@ export default {
.article-content-item {
display: flex;
padding-bottom: 15px;
height: 130px;
}
.article-content-right {
display: flex;
Expand All @@ -262,6 +263,10 @@ export default {
font-size: 14px;
font-weight: 400;
line-height: 22px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
overflow: hidden;
}

/*评价*/
Expand Down
11 changes: 8 additions & 3 deletions vueblog/src/views/home/childComps/NewArticleItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export default {
headers: { token: localStorage.getItem("token") },
})
.then((res) => {
console.log(res);
// console.log(res);
// console.log(res.data.data.userAction)
if (res.data.data.userAction == null) {
this.isShow = false;
Expand All @@ -159,7 +159,7 @@ export default {
...this.userAction,
...res.data.data.userAction,
};
console.log(this.blogList);
// console.log(this.blogList);
$state.loaded();
} else {
$state.complete();
Expand All @@ -177,7 +177,7 @@ export default {
margin-left: 3px;
/* border-bottom: 1px solid #f0f0f2; */
background-color: #ffffff;
padding: 15px 0px 0 15px;
padding: 15px 15px 0 15px;
margin-bottom: 15px;

/* display: inline-block; */
Expand Down Expand Up @@ -244,6 +244,7 @@ export default {
.article-content-item {
display: flex;
padding-bottom: 15px;
height: 130px;
}
.article-content-right {
display: flex;
Expand All @@ -262,6 +263,10 @@ export default {
font-size: 14px;
font-weight: 400;
line-height: 22px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
overflow: hidden;
}

/*评价*/
Expand Down
11 changes: 8 additions & 3 deletions vueblog/src/views/home/childComps/RecommendArticleItem.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ export default {
headers: { token: localStorage.getItem("token") },
})
.then((res) => {
console.log(res);
// console.log(res);
// console.log(res.data.data.userAction)
if (res.data.data.userAction == null) {
this.isShow = false;
Expand All @@ -159,7 +159,7 @@ export default {
...this.userAction,
...res.data.data.userAction,
};
console.log(this.blogList);
// console.log(this.blogList);
$state.loaded();
} else {
$state.complete();
Expand All @@ -177,7 +177,7 @@ export default {
margin-left: 3px;
/* border-bottom: 1px solid #f0f0f2; */
background-color: #ffffff;
padding: 15px 0px 0 15px;
padding: 15px 15px 0 15px;
margin-bottom: 15px;

/* display: inline-block; */
Expand Down Expand Up @@ -251,6 +251,7 @@ export default {
.article-content-item {
display: flex;
padding-bottom: 15px;
height: 130px;
}
.article-content-right {
display: flex;
Expand All @@ -269,6 +270,10 @@ export default {
font-size: 14px;
font-weight: 400;
line-height: 22px;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 4;
overflow: hidden;
}

/*评价*/
Expand Down