From ce651bbf5a5c716d9c3ff2ebb54d0d51c26b2015 Mon Sep 17 00:00:00 2001
From: jacobxu666 <jacobxu666@gmail.com>
Date: Thu, 16 Jul 2026 23:27:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E4=BC=98=E5=8C=96=20v1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json            | 11 +++++++++++
 pages/index/index.vue | 42 +++++++++++++++++++++++++++++++++++-------
 2 files changed, 46 insertions(+), 7 deletions(-)

diff --git a/pages.json b/pages.json
index f66619f..2cf6855 100644
--- a/pages.json
+++ b/pages.json
@@ -6,8 +6,19 @@
 		{
 			"path": "pages/index/index",
 			"style": {
+<<<<<<< Updated upstream
 				"navigationBarTitleText": "首页",
 				"navigationStyle": "custom"
+=======
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/index/login",
+			"style": {
+				"navigationBarTitleText": "登录"
+>>>>>>> Stashed changes
 			}
 		},
 		{
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 2bb38ae..8167bcb 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,6 +9,7 @@
 		<view class="king-area">
 			<view class="king-item" v-for="(item, index) in kingList" :key="index" @click="goPage(item.url)">
 				<image class="king-icon" :src="item.icon" mode="widthFix"></image>
+				<text class="king-text">{{ item.text }}</text>
 			</view>
 		</view>
 
@@ -37,10 +38,17 @@
 		data() {
 			return {
 				kingList: [
+<<<<<<< Updated upstream
 					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_wlcg.png', url: '/pages/venue/venue' },
 					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_shzk.png', url: '/pages/discount/discount' },
 					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_qyb.png', url: '/pages/rights/rights' },
 					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_zjmd.png', url: '/pages/winners/winners' }
+=======
+					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_wlcg.png', text: '文旅场馆', url: '/pages/venue/venue' },
+					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_shzk.png', text: '商户折扣', url: '/pages/discount/discount' },
+					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_qyb.png', text: '权益包', url: '/pages/rights/rights', isRights: true },
+					{ icon: 'https://aliyunoss.hn12301.net/hhrs/hhrs_zjmd.png', text: '中奖名单', url: '/pages/winners/winners' }
+>>>>>>> Stashed changes
 				],
 				guideList: [
 					{
@@ -69,9 +77,18 @@
 
 <style>
 	.page {
+<<<<<<< Updated upstream
 		min-height: 100vh;
 		background-color: #f5f5f5;
 		padding-bottom: 120rpx;
+=======
+		height: 100vh;
+		background-color: #F2F2F7;
+		font-family: 'Source Han Sans CN', 'Source Han Sans SC', 'Noto Sans CJK SC', 'PingFang SC', 'Helvetica Neue', Arial, sans-serif;
+		display: flex;
+		flex-direction: column;
+		overflow-y: auto;
+>>>>>>> Stashed changes
 	}
 
 	.banner-img {
@@ -93,6 +110,7 @@
 	.king-item {
 		width: 25%;
 		display: flex;
+		flex-direction: column;
 		justify-content: center;
 		align-items: center;
 	}
@@ -100,44 +118,54 @@
 	.king-icon {
 		width: 100rpx;
 		height: 132rpx;
+		margin-bottom: 12rpx;
+	}
+
+	.king-text {
+		font-size: 24rpx;
+		color: #333333;
+		text-align: center;
 	}
 
 	/* 活动指南 */
 	.guide-section {
 		background-color: #ffffff;
 		margin-top: 10rpx;
-		padding: 24rpx 20rpx 30rpx;
+		padding: 24rpx 20rpx;
+		flex: 1;
 	}
 
 	.section-title {
 		display: flex;
 		align-items: center;
-		margin-bottom: 20rpx;
+		justify-content: flex-start;
+		padding: 24rpx 0;
 	}
 
 	.title-line {
 		width: 6rpx;
 		height: 32rpx;
-		background-color: #1890ff;
+		background-color: #0088FF;
 		border-radius: 3rpx;
 		margin-right: 12rpx;
 	}
 
 	.title-text {
-		font-size: 30rpx;
-		font-weight: bold;
+		font-size: 28rpx;
+		font-weight: 400;
 		color: #333333;
 	}
 
 	.guide-list {
 		display: flex;
 		flex-direction: column;
-		gap: 20rpx;
+		gap: 24rpx;
+		padding: 0;
 	}
 
 	.guide-card {
 		position: relative;
-		width: 702rpx;
+		width: 100%;
 		height: 252rpx;
 		border-radius: 16rpx;
 		overflow: hidden;