From e5441ad5de999b4e741bcd184ba4109983a8f541 Mon Sep 17 00:00:00 2001
From: davy <davy@example.com>
Date: Mon, 31 Mar 2025 14:32:08 +0800
Subject: [PATCH] feat: optimize pages style and functionality

---
 pages/activityList/index.vue |  2 +-
 pages/index/myJoin.vue       | 40 ++++++++++++++++++++----------------
 pagesMy/myAttention.vue      |  8 ++++----
 static/icons/filter.svg      |  2 +-
 4 files changed, 28 insertions(+), 24 deletions(-)

diff --git a/pages/activityList/index.vue b/pages/activityList/index.vue
index f4b86f7..20f73de 100644
--- a/pages/activityList/index.vue
+++ b/pages/activityList/index.vue
@@ -244,7 +244,7 @@
 		.choose-navs {
 			// 导航选项的样式
 			font-family: Roboto;
-			font-size: 12px;
+			font-size: 24rpx;
 			font-weight: 500;
 			
 			.choose-navs-txt {
diff --git a/pages/index/myJoin.vue b/pages/index/myJoin.vue
index a5dc48f..171c636 100644
--- a/pages/index/myJoin.vue
+++ b/pages/index/myJoin.vue
@@ -110,10 +110,10 @@
 					<!-- 兑换订单列表 -->
 					<view class="coin-item" v-for="(it, index) in myExchangeOrder" :key="index" @click="toOrderInfo(it)">
 						<view class="flex justify-between" style="margin-bottom: 16rpx;">
-							<text style="color: #0B0E26;font-size: 28rpx;">
+							<text style="color: #5E5F60;font-weight: 600;font-size: 28rpx;">
 								<image src="@/static/beerCoin.png" style="width: 24rpx;height: 24rpx;margin-right: 16rpx;"></image>
 								啤酒币兑换</text>
-							<text style="color: #5E5F60;font-size: 24rpx;">已完成</text>
+							<text style="color: #5E5F60;font-weight: 600;font-size: 24rpx;margin-top: 8rpx;">已完成</text>
 						</view>
 						<view class="flex justify-between">
 							<image :src="it.goodsCover" class="coverImg"></image>
@@ -438,7 +438,7 @@
 <style lang="scss" scoped>
 .activitypage {
 	height: 100vh;
-	background: #FFFFFF;
+	background: #F9F9F9;
 	display: flex;
 	flex-direction: column;
 
@@ -451,7 +451,7 @@
 		display: flex;
 		padding: 0 32rpx;
 		background: #FFFFFF;
-		border-bottom: 1rpx solid #F5F5F5;
+		// border-bottom: 1rpx solid #F5F5F5;
 		height: 88rpx;
 		align-items: center;
 
@@ -464,6 +464,9 @@
 			font-weight: 400;
 
 			&.nav-active {
+				font-size: 32rpx;
+				font-weight: 600;
+				padding: 32rpx;
 				color: #19367A;
 				font-weight: 600;
 
@@ -490,7 +493,8 @@
 		background: #FFFFFF;
 		white-space: nowrap;
 		padding: 20rpx 32rpx;
-		border-bottom: 1rpx solid #F5F5F5;
+		// border-bottom: 1rpx solid #F5F5F5;
+		// box-shadow: 0rpx 1rpx 3rpx 0rpx rgba(0, 0, 0, 0.1);
 
 		.status-nav-content {
 			display: inline-flex;
@@ -502,15 +506,14 @@
 				width: 147rpx;
 				height: 64rpx;
 				margin-right: 16rpx;
-				font-size: 28rpx;
+				font-size: 24rpx;
 				color: #606060;
 				background: #f9f9f9;
-				border-radius: 20rpx;
+				border-radius: 12rpx;
 
 				&.status-active {
-					color: #FFFFFF;
-					background: #19367A;
-					font-weight: 600;
+					color: #FFF;
+					background: #D42E78;
 				}
 			}
 		}
@@ -519,6 +522,7 @@
 	.bg-white {
 		flex: 1;
 		margin-top: 172rpx; // 88rpx(导航栏) + 84rpx(标签栏)
+		padding-top: 24rpx; // 添加内容区域的上边距
 		overflow: hidden;
 
 		scroll-view {
@@ -595,7 +599,7 @@
 			}
 
 			.zeng {
-				font-family: Source Han Sans;
+				font-family: roboto;
 				font-size: 20rpx;
 				font-weight: bold;
 				line-height: normal;
@@ -611,7 +615,7 @@
 
 	.coin-item {
 		border-radius: 12rpx;
-		background: #FDFDFD;
+		background: #ffffff;
 		padding: 24rpx;
 		box-sizing: border-box;
 		margin-bottom: 32rpx;
@@ -625,21 +629,21 @@
 		}
 
 		.title {
-			font-size: 24rpx;
-			font-weight: 500;
-			color: #0B0E26;
+			font-size: 32rpx;
+			font-weight: 600;
+			color: #030303;
 		}
 
 		.subTitle {
 			font-size: 20rpx;
 			font-weight: 500;
-			color: #979797;
+			color: #5E5F60;
 		}
 
 		.num {
 			font-size: 48rpx;
-			font-weight: 500;
-			color: #2B2D33;
+			font-weight: 600;
+			color: #030303;
 		}
 	}
 }
diff --git a/pagesMy/myAttention.vue b/pagesMy/myAttention.vue
index 119a5c1..5db70d1 100644
--- a/pagesMy/myAttention.vue
+++ b/pagesMy/myAttention.vue
@@ -219,17 +219,17 @@
 
 <style lang="scss" scoped>
 	.page-content {
-		background: #FDFDFD;
+		background: #F9F9F9;
 		height: 100vh;
 
 		.tab {
-			color: #A5A7B9;
+			color: #1A1A1A;
 			font-size: 32rpx;
-			font-weight: 500;
+			font-weight: normal;
 		}
 
 		.active {
-			color: #1A1A1A;
+			color: #4E63E0;
 		}
 
 		.my-container {
diff --git a/static/icons/filter.svg b/static/icons/filter.svg
index 82bff44..0311dfd 100644
--- a/static/icons/filter.svg
+++ b/static/icons/filter.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="20" viewBox="0 0 20 20"><g><g><g><g><path d="M11.99986609375,2.5L12.00016609375,2.5Q12.07402609375,2.5,12.14647609375,2.485589Q12.21892609375,2.471178,12.28717609375,2.44291Q12.35541609375,2.414641,12.41683609375,2.373602Q12.47825609375,2.332563,12.53048609375,2.28033Q12.58272609375,2.228097,12.62376609375,2.166678Q12.66480609375,2.105258,12.69306609375,2.037013Q12.72133609375,1.968767,12.73574609375,1.896318Q12.75016609375,1.8238685000000001,12.75016609375,1.75Q12.75016609375,1.6761314999999999,12.73575609375,1.603682Q12.72133609375,1.531233,12.69306609375,1.462987Q12.66480609375,1.394742,12.62376609375,1.333322Q12.58272609375,1.271903,12.53048609375,1.21967Q12.47825609375,1.167437,12.41683609375,1.126398Q12.35541609375,1.085359,12.28717609375,1.05709Q12.21892609375,1.028822,12.14647609375,1.014411Q12.07402609375,1,12.00016609375,1L11.99986609375,1L4.50016609375,1Q3.4882800937500003,1,2.78383799375,1.7287333Q2.08349609375,2.4532249999999998,2.08349609375,3.5L2.08349609375,5.41667Q2.08349609375,6.63948,3.04604709375,7.60653L6.1832660937499995,10.90886Q6.66682609375,11.5254,6.66682609375,12.1667L6.66682609375,16.5833Q6.66682609375,18.0229,7.95070609375,18.7042Q9.20521609375,19.3698,10.39323609375,18.6387L11.56335609375,17.8867Q12.66682609375,17.218,12.66682609375,15.8333L12.66682609375,12.25Q12.66682609375,11.37906,13.23029609375,10.9095Q13.23869609375,10.90253,13.24679609375,10.89533L16.83009609375,7.72866Q16.84749609375,7.71335,16.86379609375,7.697Q17.91679609375,6.64399,17.91679609375,5.25L17.91679609375,3.41667Q17.91679609375,2.418507,17.20759609375,1.7092529Q16.49829609375,1,15.50019609375,1Q15.42629609375,1,15.35379609375,1.014411Q15.28139609375,1.028822,15.21319609375,1.05709Q15.14489609375,1.085359,15.08349609375,1.126398Q15.02209609375,1.167437,14.96979609375,1.21967Q14.91759609375,1.271903,14.87659609375,1.333322Q14.83549609375,1.394742,14.80729609375,1.462987Q14.77899609375,1.531233,14.76459609375,1.603682Q14.75019609375,1.6761314999999999,14.75019609375,1.75Q14.75019609375,1.8238685000000001,14.76459609375,1.896318Q14.77899609375,1.968767,14.80729609375,2.037013Q14.83549609375,2.105258,14.87659609375,2.166678Q14.91759609375,2.228097,14.96979609375,2.28033Q15.02209609375,2.332563,15.08349609375,2.373602Q15.14489609375,2.414641,15.21319609375,2.44291Q15.28139609375,2.471178,15.35379609375,2.485589Q15.42629609375,2.5,15.50019609375,2.5L15.50029609375,2.5Q15.87699609375,2.500031,16.14689609375,2.7699100000000003Q16.41679609375,3.0398300000000003,16.41679609375,3.41667L16.41679609375,5.25Q16.41679609375,6.01298,15.81849609375,6.62091L12.26117609375,9.76457Q11.16682609375,10.68282,11.16682609375,12.25L11.16682609375,15.8333Q11.16682609375,16.3754,10.78095609375,16.6069Q10.77101609375,16.6128,10.76125609375,16.6191L9.60708609375,17.3613Q9.15007609375,17.6425,8.65378609375,17.3792Q8.16682609375,17.1208,8.16682609375,16.5833L8.16682609375,12.1667Q8.16682609375,10.98691,7.33581609375,9.94814Q7.31588609375,9.92323,7.29391609375,9.9001L4.12724609375,6.56677Q4.12062609375,6.5598,4.11382609375,6.553Q3.58349609375,6.02267,3.58349609375,5.41667L3.58349609375,3.5Q3.58349609375,2.5,4.50016609375,2.5L11.99986609375,2.5Z" fill-rule="evenodd" fill="#F7F8FA" fill-opacity="1"/></g><g><path d="M9.7446,2.147065Q9.858329999999999,1.96482,9.858329999999999,1.75Q9.858329999999999,1.6761314999999999,9.84392,1.603682Q9.829509999999999,1.531233,9.80124,1.462987Q9.77297,1.394742,9.73194,1.333322Q9.6909,1.271903,9.63866,1.21967Q9.58643,1.167437,9.52501,1.126398Q9.46359,1.085359,9.39535,1.05709Q9.3271,1.028822,9.25465,1.014411Q9.1822,1,9.108329999999999,1Q9.01287,1,8.92044,1.023917Q8.82802,1.047834,8.744530000000001,1.094142Q8.66105,1.140451,8.59183,1.206197Q8.52261,1.271944,8.472059999999999,1.352935L8.472,1.353034L4.363926,7.93596L4.36373,7.93627Q4.25,8.11851,4.25,8.33333Q4.25,8.4072,4.264411,8.47965Q4.278822,8.5521,4.30709,8.62035Q4.335359,8.68859,4.376398,8.75001Q4.417437,8.81143,4.46967,8.86366Q4.521903,8.9159,4.583322,8.95694Q4.644742,8.997969999999999,4.712987,9.02624Q4.781233,9.05451,4.853682,9.06892Q4.9261315,9.08333,5,9.08333Q5.0954682,9.08333,5.187892,9.05942Q5.280316,9.035499999999999,5.3638,8.98919Q5.447285,8.942879999999999,5.516506,8.87714Q5.585727,8.81139,5.63627,8.7304L5.636466,8.730080000000001L9.74454,2.147163L9.7446,2.147065Z" fill-rule="evenodd" fill="#F7F8FA" fill-opacity="1"/></g><g style="opacity:0;"></g></g></g></g></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" fill="none" version="1.1" width="20" height="20" viewBox="0 0 20 20"><g><g><g><g><path d="M12.000354375,2.5L12.000654375,2.5Q12.074514375,2.5,12.146964375,2.485589Q12.219414375,2.471178,12.287664375,2.44291Q12.355904375,2.414641,12.417324375,2.373602Q12.478744375,2.332563,12.530974375,2.28033Q12.583214375,2.228097,12.624254375,2.166678Q12.665294375,2.105258,12.693554375,2.037013Q12.721824375,1.968767,12.736234375,1.896318Q12.750654375,1.8238685000000001,12.750654375,1.75Q12.750654375,1.6761314999999999,12.736244375,1.603682Q12.721824375,1.531233,12.693554375,1.462987Q12.665294375,1.394742,12.624254375,1.333322Q12.583214375,1.271903,12.530974375,1.21967Q12.478744375,1.167437,12.417324375,1.126398Q12.355904375,1.085359,12.287664375,1.05709Q12.219414375,1.028822,12.146964375,1.014411Q12.074514375,1,12.000654375,1L12.000354375,1L4.500654375,1Q3.4887683750000003,1,2.784326275,1.7287333Q2.083984375,2.4532249999999998,2.083984375,3.5L2.083984375,5.41667Q2.083984375,6.63948,3.046535375,7.60653L6.1837543749999995,10.90886Q6.667314375,11.5254,6.667314375,12.1667L6.667314375,16.5833Q6.667314375,18.0229,7.951194375,18.7042Q9.205704375,19.3698,10.393724375,18.6387L11.563844375,17.8867Q12.667314375,17.218,12.667314375,15.8333L12.667314375,12.25Q12.667314375,11.37906,13.230784375,10.9095Q13.239184375,10.90253,13.247284375,10.89533L16.830584375,7.72866Q16.847984375,7.71335,16.864284375,7.697Q17.917284375,6.64399,17.917284375,5.25L17.917284375,3.41667Q17.917284375,2.418507,17.208084375,1.7092529Q16.498784375,1,15.500684375,1Q15.426784375,1,15.354284375,1.014411Q15.281884375,1.028822,15.213684375,1.05709Q15.145384375,1.085359,15.083984375,1.126398Q15.022584375,1.167437,14.970284375,1.21967Q14.918084375,1.271903,14.877084375,1.333322Q14.835984375,1.394742,14.807784375,1.462987Q14.779484375,1.531233,14.765084375,1.603682Q14.750684375,1.6761314999999999,14.750684375,1.75Q14.750684375,1.8238685000000001,14.765084375,1.896318Q14.779484375,1.968767,14.807784375,2.037013Q14.835984375,2.105258,14.877084375,2.166678Q14.918084375,2.228097,14.970284375,2.28033Q15.022584375,2.332563,15.083984375,2.373602Q15.145384375,2.414641,15.213684375,2.44291Q15.281884375,2.471178,15.354284375,2.485589Q15.426784375,2.5,15.500684375,2.5L15.500784375,2.5Q15.877484375,2.500031,16.147384375,2.7699100000000003Q16.417284375,3.0398300000000003,16.417284375,3.41667L16.417284375,5.25Q16.417284375,6.01298,15.818984375,6.62091L12.261664375,9.76457Q11.167314375,10.68282,11.167314375,12.25L11.167314375,15.8333Q11.167314375,16.3754,10.781444375,16.6069Q10.771504375,16.6128,10.761744375,16.6191L9.607574375,17.3613Q9.150564375,17.6425,8.654274375,17.3792Q8.167314375,17.1208,8.167314375,16.5833L8.167314375,12.1667Q8.167314375,10.98691,7.336304375,9.94814Q7.316374375,9.92323,7.294404375,9.9001L4.127734375,6.56677Q4.121114375,6.5598,4.114314375,6.553Q3.583984375,6.02267,3.583984375,5.41667L3.583984375,3.5Q3.583984375,2.5,4.500654375,2.5L12.000354375,2.5Z" fill-rule="evenodd" fill="#D42E78" fill-opacity="1"/></g><g><path d="M9.7446,2.147065Q9.858329999999999,1.96482,9.858329999999999,1.75Q9.858329999999999,1.6761314999999999,9.84392,1.603682Q9.829509999999999,1.531233,9.80124,1.462987Q9.77297,1.394742,9.73194,1.333322Q9.6909,1.271903,9.63866,1.21967Q9.58643,1.167437,9.52501,1.126398Q9.46359,1.085359,9.39535,1.05709Q9.3271,1.028822,9.25465,1.014411Q9.1822,1,9.108329999999999,1Q9.01287,1,8.92044,1.023917Q8.82802,1.047834,8.744530000000001,1.094142Q8.66105,1.140451,8.59183,1.206197Q8.52261,1.271944,8.472059999999999,1.352935L8.472,1.353034L4.363926,7.93596L4.36373,7.93627Q4.25,8.11851,4.25,8.33333Q4.25,8.4072,4.264411,8.47965Q4.278822,8.5521,4.30709,8.62035Q4.335359,8.68859,4.376398,8.75001Q4.417437,8.81143,4.46967,8.86366Q4.521903,8.9159,4.583322,8.95694Q4.644742,8.997969999999999,4.712987,9.02624Q4.781233,9.05451,4.853682,9.06892Q4.9261315,9.08333,5,9.08333Q5.0954682,9.08333,5.187892,9.05942Q5.280316,9.035499999999999,5.3638,8.98919Q5.447285,8.942879999999999,5.516506,8.87714Q5.585727,8.81139,5.63627,8.7304L5.636466,8.730080000000001L9.74454,2.147163L9.7446,2.147065Z" fill-rule="evenodd" fill="#D42E78" fill-opacity="1"/></g><g style="opacity:0;"></g></g></g></g></svg>
\ No newline at end of file