Skip to content

Commit

Permalink
Merge branch 'feat/tag' of https://github.com/Hazi7/weilai.team into dev
Browse files Browse the repository at this point in the history
Mq0501 committed Nov 30, 2024
2 parents 033a48a + 694ea67 commit f32b436
Showing 5 changed files with 115 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/composables/UseLogin.ts
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ export default function () {
// loginError.value = '密码不能为空'
} else {
// loginError.value = ''
await executeRequest({ url: `/index/login?account=${account}&password=${password}`, method: 'post', data: { account, password }, headers: { 'Content-Type': 'multipart/form-data' } }) // 在这里传入请求的 URL 和 method
await executeRequest({ url: `/index/login`, method: 'post', requestData: { account, password } }) // 在这里传入请求的 URL 和 method
const res = data.value as Data;
const resData = res.data;
if (res.code == 1000) {
32 changes: 28 additions & 4 deletions src/features/community/components/tag/TagContent.vue
Original file line number Diff line number Diff line change
@@ -62,11 +62,35 @@ watch(
width: 330px;
margin-left: 20px;
}
}
@media screen and (max-width: 1200px) {
.tag-container {
margin-top: 80px;
.all-article {
width: calc(100% - 300px);
}
.right-bar {
width: 300px;
margin-left: 20px;
}
}
}
@media screen and (max-width: 1040px) {
.tag-container {
margin-top: 90px;
.all-article {
width: calc(100% - 250px);
}
@media screen and (max-width: 1200px) {
// .right-bar {
// display: none;
// }
.right-bar {
width: 250px;
margin-left: 20px;
}
}
}
</style>
48 changes: 47 additions & 1 deletion src/features/community/components/tag/TagHeadBar.vue
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ getAllTagList()
.tag-head-bar {
max-width: 1336px;
position: absolute;
top: 70px;
top: 60px;
display: flex;
flex-wrap: wrap;
background-color: #ffffff;
@@ -96,4 +96,50 @@ getAllTagList()
opacity: 1;
}
}
@media screen and (max-width: 1200px) {
.tag-head-bar {
max-height: 60px;
top: 50px;
.tag-head-bar-item {
font-size: 12px;
}
.tag-head-bar-more,
.tag-head-bar-few {
width: 25px;
height: 10px;
background-color: #f4f4f4;
border-radius: 3px 3px 0 0;
text-align: center;
padding: 0 6px;
font-size: 12px;
color: #8a8a8a;
}
}
}
@media screen and (max-width: 1024px) {
.tag-head-bar {
max-height: 55px;
top: 60px;
.tag-head-bar-item {
font-size: 10px;
}
.tag-head-bar-more,
.tag-head-bar-few {
width: 25px;
height: 10px;
background-color: #f4f4f4;
border-radius: 3px 3px 0 0;
text-align: center;
padding: 0 6px;
font-size: 12px;
color: #8a8a8a;
}
}
}
</style>
34 changes: 33 additions & 1 deletion src/features/community/components/tag/TagRightBar.vue
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ getUseTagList()
<div class="article-rank">
<div class="rank-top">
<p>
<Icon icon="icon-park-outline:tag" font-size="20px" /> &nbsp;<span style="width: 5em">标签榜
<Icon icon="icon-park-outline:tag" class="tagHeadIcon" /> &nbsp;<span>标签榜
</span>
</p>
<Icon icon="material-symbols-light:navigate-next"
@@ -71,6 +71,10 @@ getUseTagList()
justify-content: space-between;
align-items: center;
.tagHeadIcon {
font-size: 20px;
}
p {
display: flex;
align-items: center;
@@ -134,4 +138,32 @@ ul {
}
}
}
@media screen and (max-width: 1200px) {
.rank-top {
font-size: 14px;
.tagHeadIcon {
font-size: 18px;
}
p {
height: 100%;
font-size: 14px;
line-height: 4rem;
}
}
.ranking{
font-size: 14px;
}
ul{
li{
font-size: 13px;
}
}
}
@media screen and (max-width: 1040px) {}
</style>
12 changes: 6 additions & 6 deletions src/features/community/pages/discussion/label.vue
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<script setup lang="ts">
import TagHeader from "@/components/community/tag/TagHeader.vue";
import TagHeadBar from '@/features/community/components/tag/TagHeadBar.vue';
// import RightBar from '../../components/tag/RightBar.vue';
</script>

<template>
<div>
<TagHeader></TagHeader>
<router-view />
<!-- <RightBar /> -->
</div>
<div>
<TagHeadBar></TagHeadBar>
<router-view />
<!-- <RightBar /> -->
</div>
</template>

<style scoped></style>

0 comments on commit f32b436

Please sign in to comment.