From 5934ff0b9367e14f7548990f4eda502167f94eb2 Mon Sep 17 00:00:00 2001 From: "34701892@qq.com" <34701892@qq.com> Date: Wed, 13 Aug 2025 11:53:14 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=9B=BE=E7=89=87=E6=94=B9?= =?UTF-8?q?=E5=AF=B9=E8=B1=A1=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 4 +- src/components/HotIndustryList.vue | 81 ++++------- src/components/IndexView copy.vue | 128 +++++++++-------- src/components/IndexView.vue | 121 ++++++++-------- src/components/InfoSummary.vue | 2 +- src/components/RankList.vue | 56 +++----- src/components/articleList/index.vue | 55 +++----- src/components/domestic.vue | 31 ++++- src/components/indexMenuTitle.vue | 5 +- src/components/mine.vue | 85 +++++------- src/components/mini/Navbar.vue | 49 +++++++ src/components/mini/Tabbar.vue | 69 ++++++++++ src/components/pay/index.vue | 19 ++- .../components/readable/index.vue | 47 ++++--- .../components/realTimeNewsItem/index.vue | 12 +- src/components/recommendedItem.vue | 11 +- src/components/swiperCom/index.vue | 15 +- src/components/vip.vue | 50 +++++-- src/mock/articleList.js | 130 +++++++++--------- src/mock/list.js | 8 +- src/pages.json | 6 +- src/pages/bookmark/components/articleList.vue | 16 ++- src/pages/detail/index.vue | 21 +-- src/pages/detail/indexNewsInfo.vue | 2 +- src/pages/flash/index.vue | 8 +- src/pages/knowEarlier/index.vue | 14 +- src/pages/login/index.vue | 10 +- src/pages/minihome/index.vue | 24 ++++ src/pages/news/index.vue | 12 +- src/pages/realtimeInfo/home.vue | 42 ++---- src/pages/realtimeInfo/index.vue | 89 ++++-------- .../realtimeInfo/pc/components/PageTop.vue | 2 +- src/pages/realtimeInfo/pc/indexPC.vue | 50 ++----- src/pages/realtimeInfo/pc/rank.vue | 32 ++--- src/pages/realtimeInfo/pc/top10.vue | 68 +++------ src/pages/subscribed/components/col.vue | 16 ++- 36 files changed, 724 insertions(+), 666 deletions(-) create mode 100644 src/components/mini/Navbar.vue create mode 100644 src/components/mini/Tabbar.vue create mode 100644 src/pages/minihome/index.vue diff --git a/package.json b/package.json index f42f961..ca2cb47 100644 --- a/package.json +++ b/package.json @@ -2,10 +2,10 @@ "name": "uni-preset-vue", "version": "0.0.1", "scripts": { + "dev:mp-weixin": "uni -p mp-weixin", "dev:h5": "uni", "build:h5": "uni build", "dev:h5:ssr": "uni --ssr", - "dev:mp-weixin": "uni -p mp-weixin", "dev:mp-alipay": "uni -p mp-alipay", "dev:app": "uni -p app", "dev:app-android": "uni -p app-android", @@ -84,4 +84,4 @@ "engines": { "node": ">=14.0.0" } -} +} \ No newline at end of file diff --git a/src/components/HotIndustryList.vue b/src/components/HotIndustryList.vue index 66ccbd8..a920f38 100644 --- a/src/components/HotIndustryList.vue +++ b/src/components/HotIndustryList.vue @@ -1,75 +1,40 @@ @@ -182,27 +147,32 @@ const handlePopupErrorCallback = () => { .hot-industry-container { padding: 10px; } + .header { display: flex; justify-content: space-between; align-items: center; margin-bottom: 10px; } + .title { font-size: 16px; font-weight: bold; color: #333; } + .view-all { font-size: 14px; color: #999; text-decoration: underline; } + .industry-list { display: flex; flex-direction: column; gap: 8px; } + .industry-item { display: flex; align-items: center; @@ -210,11 +180,13 @@ const handlePopupErrorCallback = () => { position: relative; height: 74rpx; } + .industry-icon { width: 24px; height: 24px; margin-right: 8px; } + .rank { margin-left: 30rpx; @@ -227,6 +199,7 @@ const handlePopupErrorCallback = () => { font-style: normal; margin-right: 40rpx; } + .industry-name { font-family: PingFangSC, PingFang SC; font-weight: 400; diff --git a/src/components/IndexView copy.vue b/src/components/IndexView copy.vue index 8dc37ac..684ad8f 100644 --- a/src/components/IndexView copy.vue +++ b/src/components/IndexView copy.vue @@ -5,7 +5,8 @@ - + @@ -66,7 +67,8 @@ - + @@ -74,7 +76,9 @@ - + @@ -85,7 +89,7 @@ import KnowEarlier from "@/pages/knowEarlier/index.vue"; import WorldlyAffairs from "@/pages/worldlyAffairs/index.vue"; import { getNewsFast, checkNews, getNewsColumn, getNewsTag, getNewsList, unlockColumn } from "@/api"; import { Session } from "@/utils/storage"; -import down from "@/assets/images/down.png"; +import down from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/down.png"; import VipHeader from "./vipHeader"; import { scrollToTop, formatTime } from "@/utils/util.ts"; import { useShareStore } from "@/stores/shareStore"; @@ -99,7 +103,7 @@ const props = defineProps({ }, columnState: { type: Object, - default: () => {}, + default: () => { }, }, }); @@ -462,8 +466,10 @@ onUnmounted(() => { background-color: #f6f6f6; box-sizing: border-box; overflow-y: auto; + .homeTopContainer { position: relative; + .sreach { width: 100%; display: flex; @@ -471,17 +477,19 @@ onUnmounted(() => { box-sizing: border-box; padding: 20rpx 30rpx; gap: 30rpx; - background-image: url(@/assets/images/vip_header_search_bg.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_search_bg.png); background-size: cover; position: fixed; left: 0; top: 0; z-index: 2; + .sreach_icon { width: 78rpx; height: 60rpx; margin-top: 3rpx; } + .sreach_input { background-color: #fff; border-radius: 36rpx; @@ -500,7 +508,7 @@ onUnmounted(() => { top: 0; width: 100%; height: 366rpx; - background-image: url(@/assets/images/vip_header_content_bg.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_content_bg.png); background-size: cover; margin-top: 100rpx; } @@ -521,12 +529,14 @@ onUnmounted(() => { box-sizing: border-box; padding-top: 20rpx; width: 100%; + .tabsList { display: flex; // background-color: aqua; background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%); border-top-left-radius: 32rpx; border-top-right-radius: 32rpx; + .tab_item { width: 52%; height: 126rpx; @@ -535,6 +545,7 @@ onUnmounted(() => { box-sizing: border-box; padding-top: 24rpx; color: #fff; + &.active { border-top-left-radius: 32rpx; border-top-right-radius: 32rpx; @@ -554,6 +565,7 @@ onUnmounted(() => { top: 0; margin-top: 106rpx; backdrop-filter: blur(60rpx); + // z-index: ; .newsBg { height: 79.52rpx; @@ -563,14 +575,16 @@ onUnmounted(() => { position: absolute; left: 0; top: 0; + .newsFontBg { width: 255.78rpx; height: 79.52rpx; - background-image: url(@/assets/images/newFontBg.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/newFontBg.png); background-size: cover; } } - .content{ + + .content { max-height: calc(100vh - 300rpx); // overflow-y: auto // height: 100vh; @@ -580,6 +594,7 @@ onUnmounted(() => { } } } + // .index-wrap { // min-height: calc(100vh - 130rpx); // background-color: #f6f6f6; @@ -638,57 +653,57 @@ onUnmounted(() => { // } // // 标签栏 - // .tabsListContainer { - // box-sizing: border-box; - // padding-right: 60rpx; - // padding-bottom: 12rpx; - // display: flex; - // overflow-x: auto; - // position: relative; - // // background-color: red; - // margin-top: 30rpx; +// .tabsListContainer { +// box-sizing: border-box; +// padding-right: 60rpx; +// padding-bottom: 12rpx; +// display: flex; +// overflow-x: auto; +// position: relative; +// // background-color: red; +// margin-top: 30rpx; - // .tabsList { - // display: flex; - // overflow-x: auto; +// .tabsList { +// display: flex; +// overflow-x: auto; - // .tabsItem { - // font-size: 12px; - // color: #595959; - // box-sizing: border-box; - // padding: 6rpx 20rpx; - // border: 1px solid #dbdbdb; - // margin-right: 21rpx; - // border-radius: 99rpx; - // flex-shrink: 0; +// .tabsItem { +// font-size: 12px; +// color: #595959; +// box-sizing: border-box; +// padding: 6rpx 20rpx; +// border: 1px solid #dbdbdb; +// margin-right: 21rpx; +// border-radius: 99rpx; +// flex-shrink: 0; - // &.active { - // background-color: rgba(255, 208, 212, 0.4); - // border-color: rgba(255, 208, 212, 0.4); - // color: #e7303f; - // } - // } - // } +// &.active { +// background-color: rgba(255, 208, 212, 0.4); +// border-color: rgba(255, 208, 212, 0.4); +// color: #e7303f; +// } +// } +// } - // .downContainer { - // position: absolute; - // right: 0; - // top: 50%; - // height: 40rpx; - // transform: translateY(-50%); - // background-color: #f6f6f6; - // padding: 3rpx 15rpx 15rpx 15rpx; - // display: flex; - // align-items: center; - // justify-content: center; - // background-image: url(@/assets/images/overlay_world.png); +// .downContainer { +// position: absolute; +// right: 0; +// top: 50%; +// height: 40rpx; +// transform: translateY(-50%); +// background-color: #f6f6f6; +// padding: 3rpx 15rpx 15rpx 15rpx; +// display: flex; +// align-items: center; +// justify-content: center; +// background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/overlay_world.png); - // .downPng { - // width: 30rpx; - // height: 30rpx; - // } - // } - // } +// .downPng { +// width: 30rpx; +// height: 30rpx; +// } +// } +// } // .tabsPopup { // width: 100%; @@ -889,5 +904,4 @@ onUnmounted(() => { // position: absolute; // width: 180rpx; // height: 48rpx; -// } - +// } diff --git a/src/components/IndexView.vue b/src/components/IndexView.vue index cb4f16f..f2e9148 100644 --- a/src/components/IndexView.vue +++ b/src/components/IndexView.vue @@ -3,31 +3,20 @@ - + - + - + {{ item.name }} @@ -46,13 +35,9 @@ {{ item.name }} - {{ childItem.name }} + @click="handleClickSubColumn(childItem.id)">{{ childItem.name }} @@ -62,28 +47,22 @@ - + + - + - {{ item.name }} + @click="handleClickSubColumn(item.id)">{{ item.name }} @@ -110,27 +89,12 @@ --> - - + + @@ -173,7 +137,7 @@ import KnowEarlier from "@/pages/knowEarlier/index.vue"; import WorldlyAffairs from "@/pages/worldlyAffairs/index.vue"; import { getNewsFast, checkNews, getNewsTag, getNewsList, unlockColumn } from "@/api"; import { Session } from "@/utils/storage"; -import down from "@/assets/images/down.png"; +import down from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/down.png"; import { scrollToTop, formatTime, jumpUrl } from "@/utils/util.ts"; import { useShareStore } from "@/stores/shareStore"; import { useTimerStore } from "@/stores/timerStore"; @@ -188,7 +152,7 @@ const props = defineProps({ }, columnState: { type: Object, - default: () => {}, + default: () => { }, }, }); const shareShow = ref(false); @@ -591,12 +555,15 @@ onUnmounted(() => { background-color: #f6f6f6; box-sizing: border-box; overflow-y: auto; + .increaseLevel { z-index: 103 !important; } + .searchIncreaseLevel { z-index: 104 !important; } + // 搜索框 .sreach { width: 100%; @@ -605,7 +572,7 @@ onUnmounted(() => { box-sizing: border-box; padding: 20rpx 30rpx; gap: 30rpx; - background-image: url(@/assets/images/vip_header_search_bg.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_search_bg.png); background-size: cover; position: fixed; left: 0; @@ -617,6 +584,7 @@ onUnmounted(() => { height: 60rpx; margin-top: 3rpx; } + .sreach_input { background-color: #fff; border-radius: 36rpx; @@ -628,6 +596,7 @@ onUnmounted(() => { color: #717171 !important; } } + // 渐变的背景 .vipContentBg { position: fixed; @@ -635,11 +604,12 @@ onUnmounted(() => { top: 0; width: 100%; height: 366rpx; - background-image: url(@/assets/images/vip_header_content_bg.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip_header_content_bg.png); background-size: cover; margin-top: 100rpx; z-index: 101; } + // banner .headerBanner { margin: 0rpx 26rpx; @@ -649,7 +619,7 @@ onUnmounted(() => { top: 0; margin-top: 116rpx; z-index: 101; - background-image: url(@/assets/images/swiper_vip.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/swiper_vip.png); background-size: contain; background-position: center; background-repeat: no-repeat; @@ -659,12 +629,14 @@ onUnmounted(() => { box-sizing: border-box; padding-top: 20rpx; width: 100%; + .tabsList { display: flex; background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%); border-top-left-radius: 27rpx; border-top-right-radius: 27rpx; position: relative; + &::before { content: ""; display: flex; @@ -676,6 +648,7 @@ onUnmounted(() => { top: 0; z-index: -1; } + .tab_item { width: 52%; height: 86rpx; @@ -686,19 +659,21 @@ onUnmounted(() => { // padding-top: 2rpx; color: #fff; font-family: "SourceHanSansCN-Medium"; + &.active { border-top-left-radius: 27rpx; border-top-right-radius: 27rpx; background: linear-gradient(90deg, #ff5e6a 0%, #e7303f 100%); box-shadow: 0px 0px 0px 0px rgba(0, 0, 0, 0.3), 0px 0px 3px 0px rgba(143, 15, 25, 0.3); position: relative; + &::after { content: ""; display: flex; width: 30rpx; height: 25rpx; // background-color: red; - background-image: url(@/assets/images/arrow.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/arrow.png); position: absolute; left: 50%; bottom: 0; @@ -709,8 +684,10 @@ onUnmounted(() => { background-repeat: no-repeat; z-index: -1; } + // box-shadow: 0px 0px 10px 0px rgba(0, 0, 0, 0.3), 1px 0px 2px 0px rgba(143, 15, 25, 0.3); } + .tab_item_icon { width: 40rpx; height: 40rpx; @@ -718,11 +695,13 @@ onUnmounted(() => { background-size: contain; background-position: center; background-repeat: no-repeat; + &.tab_item_13 { - background-image: url(@/assets/images/icon_know.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/icon_know.png); } + &.tab_item_14 { - background-image: url(@/assets/images/icon_worldly.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/icon_worldly.png); } } } @@ -731,6 +710,7 @@ onUnmounted(() => { .contenttab { position: relative; + &::before { content: ""; display: flex; @@ -744,10 +724,12 @@ onUnmounted(() => { z-index: 101; backdrop-filter: blur(60rpx); } + .tabsList { display: flex; background: linear-gradient(90deg, #ffc795 0%, #ffad9a 100%); position: relative; + // z-index: ; .tab_item { width: 52%; @@ -767,6 +749,7 @@ onUnmounted(() => { .Vipcontent { position: relative; box-sizing: border-box; + .content { position: relative; z-index: 101; @@ -786,6 +769,7 @@ onUnmounted(() => { padding: 0 30rpx; position: relative; z-index: 101; + .tabList { display: flex; overflow-x: auto; @@ -820,7 +804,7 @@ onUnmounted(() => { display: flex; align-items: center; justify-content: center; - background-image: url(@/assets/images/overlay_world.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/overlay_world.png); .downPng { width: 30rpx; @@ -840,9 +824,11 @@ onUnmounted(() => { top: 0; border-bottom-left-radius: 30rpx; border-bottom-right-radius: 30rpx; + .popupContainer { height: 300rpx; overflow-y: auto; + .tabsPopupItem { .title { font-size: 32rpx; @@ -884,6 +870,7 @@ onUnmounted(() => { height: 100%; background-color: rgba(0, 0, 0, 0.8); z-index: 9999; + .img { width: 100%; height: 350rpx; diff --git a/src/components/InfoSummary.vue b/src/components/InfoSummary.vue index 0a9f1a4..f92bc7f 100644 --- a/src/components/InfoSummary.vue +++ b/src/components/InfoSummary.vue @@ -2,7 +2,7 @@ - + ({{ dayjs(new Date().getTime()).format("MM/DD") }}) diff --git a/src/components/RankList.vue b/src/components/RankList.vue index b87c591..05cda9b 100644 --- a/src/components/RankList.vue +++ b/src/components/RankList.vue @@ -1,36 +1,22 @@ @@ -223,11 +204,16 @@ const handlePopupErrorCallback = () => { text-align: left; font-style: normal; - display: -webkit-box; /* 设置为WebKit内核的弹性盒子模型 */ - -webkit-box-orient: vertical; /* 垂直排列 */ - -webkit-line-clamp: 2; /* 限制显示三行 */ - overflow: hidden; /* 隐藏超出范围的内容 */ - text-overflow: ellipsis; /* 使用省略号 */ + display: -webkit-box; + /* 设置为WebKit内核的弹性盒子模型 */ + -webkit-box-orient: vertical; + /* 垂直排列 */ + -webkit-line-clamp: 2; + /* 限制显示三行 */ + overflow: hidden; + /* 隐藏超出范围的内容 */ + text-overflow: ellipsis; + /* 使用省略号 */ } .news-meta { diff --git a/src/components/articleList/index.vue b/src/components/articleList/index.vue index d73fbcc..7746966 100644 --- a/src/components/articleList/index.vue +++ b/src/components/articleList/index.vue @@ -1,50 +1,26 @@ @@ -188,7 +189,7 @@ const handlePopupSuccessCallback = () => { .vipHeader { height: 168rpx; - background-image: url(@/assets/images/headerBg.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/headerBg.png); background-size: cover; box-sizing: border-box; padding: 24rpx 32rpx 6rpx 40rpx; @@ -198,15 +199,18 @@ const handlePopupSuccessCallback = () => { position: sticky; top: 0; z-index: 9999; + .search { width: 100vw; display: flex; height: 60rpx; gap: 20rpx; + .logo { width: 124rpx; height: 72rpx; } + .search_icon { width: 80rpx; height: 60rpx; @@ -231,13 +235,16 @@ const handlePopupSuccessCallback = () => { justify-content: space-between; font-size: 14px; color: #fff; + .tabItem { box-sizing: border-box; padding-bottom: 9rpx; display: flex; align-items: center; + &.active { position: relative; + &::after { content: ""; position: absolute; @@ -246,7 +253,7 @@ const handlePopupSuccessCallback = () => { display: block; width: 44rpx; height: 6rpx; - background: url("@/assets/images/icon_dot.png") no-repeat center; + background: url("https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/icon_dot.png") no-repeat center; background-size: 100% 100%; } } @@ -268,11 +275,13 @@ const handlePopupSuccessCallback = () => { display: flex; align-items: center; justify-content: center; + .img { width: 68rpx; height: 68rpx; } } + .gridText { font-size: 12px; color: #333; @@ -292,6 +301,7 @@ const handlePopupSuccessCallback = () => { color: #333; font-size: 16px; font-weight: bold; + .recommendedIcon { width: 44rpx; height: 44rpx; @@ -320,37 +330,45 @@ const handlePopupSuccessCallback = () => { // padding: 20rpx 30rpx 0 30rpx; background-color: #fff; margin-top: 24rpx; + .articleListHeader { display: flex; align-items: center; justify-content: space-between; box-sizing: border-box; padding: 20rpx 30rpx 0 30rpx; + // padding-bottom: 21rpx; .headerLeft { display: flex; align-items: center; + .articleListTitle { font-size: 32rpx; color: #333; font-weight: bold; } + .articleListTabs { margin-left: 12rpx; + .articleListTabsItem { ::v-deep { .u-tabs__wrapper__nav__item { padding: 0 15rpx; } + .u-tabs__wrapper__nav__item__text { font-size: 24rpx; } } + // font-size: 60rpx !important; // background-color: red; } } } + .select { ::v-deep { .u-checkbox { @@ -358,6 +376,7 @@ const handlePopupSuccessCallback = () => { width: 24rpx !important; height: 24rpx !important; } + uni-text { span { font-size: 24rpx; @@ -375,11 +394,13 @@ const handlePopupSuccessCallback = () => { background-color: #d5f7ff; } } + &:nth-child(2) { .gridImg { background-color: #fff0c2; } } + &:nth-child(3) { .gridImg { background-color: #e2eeff; @@ -390,11 +411,13 @@ const handlePopupSuccessCallback = () => { } } } + &:nth-child(4) { .gridImg { background-color: #d5f7ff; } } + &:nth-child(5) { .gridImg { background-color: #fff0c2; @@ -418,8 +441,10 @@ const handlePopupSuccessCallback = () => { color: #8f212a; text-align: center; } + .need-pay-btn { margin-top: 24rpx; + .btn { width: 448rpx; height: 76rpx; diff --git a/src/components/indexMenuTitle.vue b/src/components/indexMenuTitle.vue index c2bd4a6..bed5f14 100644 --- a/src/components/indexMenuTitle.vue +++ b/src/components/indexMenuTitle.vue @@ -1,18 +1,17 @@ diff --git a/src/components/mine.vue b/src/components/mine.vue index 3a588a8..06479bb 100644 --- a/src/components/mine.vue +++ b/src/components/mine.vue @@ -33,53 +33,29 @@ - + }" @click="handleClick(-1)"> - + }" @click="handleClick(0)"> - + }" @click="handleClick(1)"> - + @@ -118,14 +90,14 @@ import { onMounted, ref } from "vue"; import { onPullDownRefresh, onShow } from "@dcloudio/uni-app"; import { Session } from "@/utils/storage"; import LoginPopup from "@/components/loginPopup/index.vue"; -import avatarImg from "@/assets/images/avatar.png"; -import column from "@/assets/images/column.png"; -import article from "@/assets/images/article.png"; -import balance from "@/assets/images/balance.png"; -import star from "@/assets/images/star.png"; -import like from "@/assets/images/like.png"; -import time from "@/assets/images/time.png"; -import vip from "@/assets/images/vip.png"; +import avatarImg from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/avatar.png"; +import column from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/column.png"; +import article from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/article.png"; +import balance from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/balance.png"; +import star from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/star.png"; +import like from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/like.png"; +import time from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/time.png"; +import vip from "https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/vip.png"; import { useShareStore } from "@/stores/shareStore"; const stores = useShareStore(); const curPages = getCurrentPages(); @@ -234,6 +206,7 @@ onPullDownRefresh(() => { // position: relative; position: relative; font-family: "SourceHanSansCN-Medium"; + // 个人信息 .userContainer { background-color: #fff; @@ -247,10 +220,12 @@ onPullDownRefresh(() => { flex-wrap: wrap; width: 216rpx; margin-left: 40rpx; + .phone { // font-size: 32rpx; font-size: var(--h1-font-size); } + .setUserData { display: flex; align-items: center; @@ -260,6 +235,7 @@ onPullDownRefresh(() => { } } } + // 订阅模块 .subscribeContainer { background-color: #fff; @@ -267,6 +243,7 @@ onPullDownRefresh(() => { padding: 21rpx 36rpx; box-sizing: border-box; border-radius: 8rpx; + .subTitle { // font-size: 32rpx; font-size: var(--h1-font-size); @@ -274,11 +251,13 @@ onPullDownRefresh(() => { margin-bottom: 30rpx; font-weight: bold; } + ::v-deep { .u-grid-item { margin-right: 30rpx; } } + .gridImg { width: 96rpx; height: 96rpx; @@ -288,26 +267,31 @@ onPullDownRefresh(() => { display: flex; align-items: center; justify-content: center; + .img { width: 64rpx; height: 64rpx; } } + .gridText { // font-size: 24rpx; font-size: var(--h4-font-size); color: #333; } } + // 其他功能区 .otherContainer { background-color: #fff; margin: 30rpx 20rpx; box-sizing: border-box; border-radius: 8rpx; + .recordText { display: flex; align-items: center; + .tips { // font-size: 24rpx; font-size: var(--h4-font-size); @@ -330,13 +314,15 @@ onPullDownRefresh(() => { bottom: 500rpx; left: 50%; transform: translateX(-50%); + .notLoginImg { width: 278rpx; height: 220rpx; // border: 1px solid; - background-image: url(@/assets/images/notLogin.png); + background-image: url(https://cankao.obs.cn-east-3.myhuaweicloud.com/mini/images/notLogin.png); background-size: cover; } + .notLoginText { width: 100%; text-align: center; @@ -366,6 +352,7 @@ onPullDownRefresh(() => { left: 50%; transform: translateX(-50%); font-family: "SourceHanSansCN-Regular"; + &.loginBtn { width: 256rpx; height: 100rpx; diff --git a/src/components/mini/Navbar.vue b/src/components/mini/Navbar.vue new file mode 100644 index 0000000..5183eb7 --- /dev/null +++ b/src/components/mini/Navbar.vue @@ -0,0 +1,49 @@ + + + + + diff --git a/src/components/mini/Tabbar.vue b/src/components/mini/Tabbar.vue new file mode 100644 index 0000000..bd2e4a8 --- /dev/null +++ b/src/components/mini/Tabbar.vue @@ -0,0 +1,69 @@ + + + + + diff --git a/src/components/pay/index.vue b/src/components/pay/index.vue index ce95539..e976226 100644 --- a/src/components/pay/index.vue +++ b/src/components/pay/index.vue @@ -11,7 +11,8 @@ ￥{{ item.value }} - + @@ -117,18 +118,22 @@ const handleSub = () => { diff --git a/src/pages/news/index.vue b/src/pages/news/index.vue index 1833190..129f191 100644 --- a/src/pages/news/index.vue +++ b/src/pages/news/index.vue @@ -9,7 +9,8 @@ - +