diff --git a/src/assets/less/color.less b/src/assets/less/color.less index a644ae0..c0ffcae 100644 --- a/src/assets/less/color.less +++ b/src/assets/less/color.less @@ -1,20 +1,25 @@ -@main-bg: rgb(22, 23, 38); +@main-bg: rgb(21, 23, 36); @active-main-bg: rgb(31, 37, 52); @second-text-color: rgb(143, 143, 158); @second-btn-color: rgb(58, 58, 70); @second-btn-color-tran: rgba(58, 58, 70, .4); @line-color: rgb(37, 45, 66); @line-color2: rgb(56, 54, 67); -@footer-color:#020202; +@footer-color: black; @primary-btn-color: rgb(252, 47, 86); @disable-primary-btn-color: rgba(252, 47, 86, .5); @mask-dark: #000000bb; -@mask-light:transparent; -@mask-white:transparent; -@mask-lightgray:rgba(0, 0, 0, 0.25); +@mask-light: transparent; +@mask-white: transparent; +@mask-lightgray: rgba(0, 0, 0, 0.25); .second-text-color { color: @second-text-color; } + +//消息页面 +@msg-bg: rgb(22,22,22); +@msg-subpage-card-bg: rgb(28, 30, 43); //二级页面,卡片背景 + diff --git a/src/assets/less/custom.less b/src/assets/less/custom.less index 17cd310..011e3aa 100644 --- a/src/assets/less/custom.less +++ b/src/assets/less/custom.less @@ -76,20 +76,20 @@ .not-read { - @width: .7rem; + @width: 7rem; width: @width; height: @width; border-radius: 50%; - background: yellow; + background: @primary-btn-color; } .badge { font-size: 12rem; display: block; - color: black; + color: white; padding: 1rem 6rem; border-radius: 10rem; - background: yellow; + background: @primary-btn-color; } .badge2 { diff --git a/src/components/BaseHeader.vue b/src/components/BaseHeader.vue index 694ba8b..db2c5bf 100644 --- a/src/components/BaseHeader.vue +++ b/src/components/BaseHeader.vue @@ -1,5 +1,5 @@ @@ -17,6 +21,8 @@ import {reactive} from "vue"; import {useNav} from "@/utils/hooks/useNav"; import InfiniteList from "@/pages/slideHooks/InfiniteList.vue"; +import api from "@/api"; +import SlideList from "@/pages/home/slide/SlideList.vue"; const nav = useNav() diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue index 7dd3f7e..81b8626 100644 --- a/src/pages/home/index.vue +++ b/src/pages/home/index.vue @@ -114,8 +114,8 @@ import ConfirmDialog from "../../components/dialog/ConfirmDialog.vue"; import FollowSetting2 from "@/pages/home/components/FollowSetting2.vue"; import ShareToFriend from "@/pages/home/components/ShareToFriend.vue"; import UserPanel from "@/components/UserPanel.vue"; -import Community from "@/pages/home/components/Community.vue"; -import Shop from "@/pages/home/components/Shop.vue"; +import Community from "@/pages/home/slide/Community.vue"; +import Shop from "@/pages/home/slide/Shop.vue"; import Slide0 from "@/pages/home/slide/Slide0.vue"; import Slide2 from "@/pages/home/slide/Slide2.vue"; import Slide4 from "@/pages/home/slide/Slide4.vue"; diff --git a/src/pages/home/components/Community.vue b/src/pages/home/slide/Community.vue similarity index 100% rename from src/pages/home/components/Community.vue rename to src/pages/home/slide/Community.vue diff --git a/src/pages/home/components/Shop.vue b/src/pages/home/slide/Shop.vue similarity index 100% rename from src/pages/home/components/Shop.vue rename to src/pages/home/slide/Shop.vue diff --git a/src/pages/home/slide/SlideList.vue b/src/pages/home/slide/SlideList.vue index 473ecd1..3ee70ff 100644 --- a/src/pages/home/slide/SlideList.vue +++ b/src/pages/home/slide/SlideList.vue @@ -31,7 +31,7 @@ const props = defineProps({ return {} } }, - active: { + active: { type: Boolean, default: false }, diff --git a/src/pages/message/Message.vue b/src/pages/message/Message.vue index 792804e..c651cf6 100644 --- a/src/pages/message/Message.vue +++ b/src/pages/message/Message.vue @@ -36,7 +36,7 @@
- 粉丝 + 新朋友
xxx 关注了你 @@ -357,7 +357,6 @@
-
@@ -400,7 +399,6 @@
- @@ -508,7 +506,7 @@ export default { left: 0; right: 0; font-size: 14rem; - background: @main-bg; + background: @msg-bg; color: white; .no-search { @@ -830,7 +828,7 @@ export default { } &:active { - background: @active-main-bg; + background: rgb(57, 57, 57); } .avatar { @@ -858,14 +856,12 @@ export default { } } - .content { flex: 1; display: flex; justify-content: space-between; @padding: 14rem; padding: @padding 0 @padding 0; - border-bottom: 1px solid @line-color2; .left { .name { @@ -909,7 +905,7 @@ export default { } .right { - margin-right: 30rem; + margin-right: 20rem; display: flex; align-items: center; @@ -922,6 +918,10 @@ export default { width: 20rem; height: 20rem; } + + .not-read { + margin-right: 5rem; + } } } } diff --git a/src/pages/message/chat/Chat.vue b/src/pages/message/chat/Chat.vue index 7ed7ace..64fcdc7 100644 --- a/src/pages/message/chat/Chat.vue +++ b/src/pages/message/chat/Chat.vue @@ -19,27 +19,16 @@ -