diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index d43c75c..e608e7a 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -6,8 +6,8 @@
             "type" : "uni-app:app-ios"
         },
         {
-            "customPlaygroundType" : "device",
-            "playground" : "standard",
+            "customPlaygroundType" : "local",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/App.vue b/App.vue
index e436329..4f79456 100644
--- a/App.vue
+++ b/App.vue
@@ -163,6 +163,9 @@ export default {
 			Object.keys(storageData).forEach(key => {
 				uni.setStorageSync(key, storageData[key])
 			})
+			if (extraData['isCombo']) {
+				uni.setStorageSync('isCombo', extraData['isCombo'])
+			}
 		},
 
 		/**
diff --git a/common/global.css b/common/global.css
index c3d40fd..d74ed6e 100644
--- a/common/global.css
+++ b/common/global.css
@@ -130,401 +130,401 @@ text {
 }
 
 .codefun-ml-2 {
-    margin-left: 4rpx;
+    margin-left: 2px;
 }
 
 .codefun-mt-2 {
-    margin-top: 4rpx;
+    margin-top: 2px;
 }
 
 .codefun-ml-4 {
-    margin-left: 8rpx;
+    margin-left: 4px;
 }
 
 .codefun-mt-4 {
-    margin-top: 8rpx;
+    margin-top: 4px;
 }
 
 .codefun-ml-6 {
-    margin-left: 12rpx;
+    margin-left: 6px;
 }
 
 .codefun-mt-6 {
-    margin-top: 12rpx;
+    margin-top: 6px;
 }
 
 .codefun-ml-8 {
-    margin-left: 16rpx;
+    margin-left: 8px;
 }
 
 .codefun-mt-8 {
-    margin-top: 16rpx;
+    margin-top: 8px;
 }
 
 .codefun-ml-10 {
-    margin-left: 20rpx;
+    margin-left: 10px;
 }
 
 .codefun-mt-10 {
-    margin-top: 20rpx;
+    margin-top: 10px;
 }
 
 .codefun-ml-12 {
-    margin-left: 24rpx;
+    margin-left: 12px;
 }
 
 .codefun-mt-12 {
-    margin-top: 24rpx;
+    margin-top: 12px;
 }
 
 .codefun-ml-14 {
-    margin-left: 28rpx;
+    margin-left: 14px;
 }
 
 .codefun-mt-14 {
-    margin-top: 28rpx;
+    margin-top: 14px;
 }
 
 .codefun-ml-16 {
-    margin-left: 32rpx;
+    margin-left: 16px;
 }
 
 .codefun-mt-16 {
-    margin-top: 32rpx;
+    margin-top: 16px;
 }
 
 .codefun-ml-18 {
-    margin-left: 36rpx;
+    margin-left: 18px;
 }
 
 .codefun-mt-18 {
-    margin-top: 36rpx;
+    margin-top: 18px;
 }
 
 .codefun-ml-20 {
-    margin-left: 40rpx;
+    margin-left: 20px;
 }
 
 .codefun-mt-20 {
-    margin-top: 40rpx;
+    margin-top: 20px;
 }
 
 .codefun-ml-22 {
-    margin-left: 44rpx;
+    margin-left: 22px;
 }
 
 .codefun-mt-22 {
-    margin-top: 44rpx;
+    margin-top: 22px;
 }
 
 .codefun-ml-24 {
-    margin-left: 48rpx;
+    margin-left: 24px;
 }
 
 .codefun-mt-24 {
-    margin-top: 48rpx;
+    margin-top: 24px;
 }
 
 .codefun-ml-26 {
-    margin-left: 52rpx;
+    margin-left: 26px;
 }
 
 .codefun-mt-26 {
-    margin-top: 52rpx;
+    margin-top: 26px;
 }
 
 .codefun-ml-28 {
-    margin-left: 56rpx;
+    margin-left: 28px;
 }
 
 .codefun-mt-28 {
-    margin-top: 56rpx;
+    margin-top: 28px;
 }
 
 .codefun-ml-30 {
-    margin-left: 60rpx;
+    margin-left: 30px;
 }
 
 .codefun-mt-30 {
-    margin-top: 60rpx;
+    margin-top: 30px;
 }
 
 .codefun-ml-32 {
-    margin-left: 64rpx;
+    margin-left: 32px;
 }
 
 .codefun-mt-32 {
-    margin-top: 64rpx;
+    margin-top: 32px;
 }
 
 .codefun-ml-34 {
-    margin-left: 68rpx;
+    margin-left: 34px;
 }
 
 .codefun-mt-34 {
-    margin-top: 68rpx;
+    margin-top: 34px;
 }
 
 .codefun-ml-36 {
-    margin-left: 72rpx;
+    margin-left: 36px;
 }
 
 .codefun-mt-36 {
-    margin-top: 72rpx;
+    margin-top: 36px;
 }
 
 .codefun-ml-38 {
-    margin-left: 76rpx;
+    margin-left: 38px;
 }
 
 .codefun-mt-38 {
-    margin-top: 76rpx;
+    margin-top: 38px;
 }
 
 .codefun-ml-40 {
-    margin-left: 80rpx;
+    margin-left: 40px;
 }
 
 .codefun-mt-40 {
-    margin-top: 80rpx;
+    margin-top: 40px;
 }
 
 .codefun-ml-42 {
-    margin-left: 84rpx;
+    margin-left: 42px;
 }
 
 .codefun-mt-42 {
-    margin-top: 84rpx;
+    margin-top: 42px;
 }
 
 .codefun-ml-44 {
-    margin-left: 88rpx;
+    margin-left: 44px;
 }
 
 .codefun-mt-44 {
-    margin-top: 88rpx;
+    margin-top: 44px;
 }
 
 .codefun-ml-46 {
-    margin-left: 92rpx;
+    margin-left: 46px;
 }
 
 .codefun-mt-46 {
-    margin-top: 92rpx;
+    margin-top: 46px;
 }
 
 .codefun-ml-48 {
-    margin-left: 96rpx;
+    margin-left: 48px;
 }
 
 .codefun-mt-48 {
-    margin-top: 96rpx;
+    margin-top: 48px;
 }
 
 .codefun-ml-50 {
-    margin-left: 100rpx;
+    margin-left: 50px;
 }
 
 .codefun-mt-50 {
-    margin-top: 100rpx;
+    margin-top: 50px;
 }
 
 .codefun-ml-52 {
-    margin-left: 104rpx;
+    margin-left: 52px;
 }
 
 .codefun-mt-52 {
-    margin-top: 104rpx;
+    margin-top: 52px;
 }
 
 .codefun-ml-54 {
-    margin-left: 108rpx;
+    margin-left: 54px;
 }
 
 .codefun-mt-54 {
-    margin-top: 108rpx;
+    margin-top: 54px;
 }
 
 .codefun-ml-56 {
-    margin-left: 112rpx;
+    margin-left: 56px;
 }
 
 .codefun-mt-56 {
-    margin-top: 112rpx;
+    margin-top: 56px;
 }
 
 .codefun-ml-58 {
-    margin-left: 116rpx;
+    margin-left: 58px;
 }
 
 .codefun-mt-58 {
-    margin-top: 116rpx;
+    margin-top: 58px;
 }
 
 .codefun-ml-60 {
-    margin-left: 120rpx;
+    margin-left: 60px;
 }
 
 .codefun-mt-60 {
-    margin-top: 120rpx;
+    margin-top: 60px;
 }
 
 .codefun-ml-62 {
-    margin-left: 124rpx;
+    margin-left: 62px;
 }
 
 .codefun-mt-62 {
-    margin-top: 124rpx;
+    margin-top: 62px;
 }
 
 .codefun-ml-64 {
-    margin-left: 128rpx;
+    margin-left: 64px;
 }
 
 .codefun-mt-64 {
-    margin-top: 128rpx;
+    margin-top: 64px;
 }
 
 .codefun-ml-66 {
-    margin-left: 132rpx;
+    margin-left: 66px;
 }
 
 .codefun-mt-66 {
-    margin-top: 132rpx;
+    margin-top: 66px;
 }
 
 .codefun-ml-68 {
-    margin-left: 136rpx;
+    margin-left: 68px;
 }
 
 .codefun-mt-68 {
-    margin-top: 136rpx;
+    margin-top: 68px;
 }
 
 .codefun-ml-70 {
-    margin-left: 140rpx;
+    margin-left: 70px;
 }
 
 .codefun-mt-70 {
-    margin-top: 140rpx;
+    margin-top: 70px;
 }
 
 .codefun-ml-72 {
-    margin-left: 144rpx;
+    margin-left: 72px;
 }
 
 .codefun-mt-72 {
-    margin-top: 144rpx;
+    margin-top: 72px;
 }
 
 .codefun-ml-74 {
-    margin-left: 148rpx;
+    margin-left: 74px;
 }
 
 .codefun-mt-74 {
-    margin-top: 148rpx;
+    margin-top: 74px;
 }
 
 .codefun-ml-76 {
-    margin-left: 152rpx;
+    margin-left: 76px;
 }
 
 .codefun-mt-76 {
-    margin-top: 152rpx;
+    margin-top: 76px;
 }
 
 .codefun-ml-78 {
-    margin-left: 156rpx;
+    margin-left: 78px;
 }
 
 .codefun-mt-78 {
-    margin-top: 156rpx;
+    margin-top: 78px;
 }
 
 .codefun-ml-80 {
-    margin-left: 160rpx;
+    margin-left: 80px;
 }
 
 .codefun-mt-80 {
-    margin-top: 160rpx;
+    margin-top: 80px;
 }
 
 .codefun-ml-82 {
-    margin-left: 164rpx;
+    margin-left: 82px;
 }
 
 .codefun-mt-82 {
-    margin-top: 164rpx;
+    margin-top: 82px;
 }
 
 .codefun-ml-84 {
-    margin-left: 168rpx;
+    margin-left: 84px;
 }
 
 .codefun-mt-84 {
-    margin-top: 168rpx;
+    margin-top: 84px;
 }
 
 .codefun-ml-86 {
-    margin-left: 172rpx;
+    margin-left: 86px;
 }
 
 .codefun-mt-86 {
-    margin-top: 172rpx;
+    margin-top: 86px;
 }
 
 .codefun-ml-88 {
-    margin-left: 176rpx;
+    margin-left: 88px;
 }
 
 .codefun-mt-88 {
-    margin-top: 176rpx;
+    margin-top: 88px;
 }
 
 .codefun-ml-90 {
-    margin-left: 180rpx;
+    margin-left: 90px;
 }
 
 .codefun-mt-90 {
-    margin-top: 180rpx;
+    margin-top: 90px;
 }
 
 .codefun-ml-92 {
-    margin-left: 184rpx;
+    margin-left: 92px;
 }
 
 .codefun-mt-92 {
-    margin-top: 184rpx;
+    margin-top: 92px;
 }
 
 .codefun-ml-94 {
-    margin-left: 188rpx;
+    margin-left: 94px;
 }
 
 .codefun-mt-94 {
-    margin-top: 188rpx;
+    margin-top: 94px;
 }
 
 .codefun-ml-96 {
-    margin-left: 192rpx;
+    margin-left: 96px;
 }
 
 .codefun-mt-96 {
-    margin-top: 192rpx;
+    margin-top: 96px;
 }
 
 .codefun-ml-98 {
-    margin-left: 196rpx;
+    margin-left: 98px;
 }
 
 .codefun-mt-98 {
-    margin-top: 196rpx;
+    margin-top: 98px;
 }
 
 .codefun-ml-100 {
-    margin-left: 200rpx;
+    margin-left: 100px;
 }
 
 .codefun-mt-100 {
-    margin-top: 200rpx;
+    margin-top: 100px;
 }
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 87b19e5..da23e09 100644
--- a/pages.json
+++ b/pages.json
@@ -172,10 +172,16 @@
 					}
 				},
 				{
-					"path" : "card/card",
-					"style" : 
-					{
-						"navigationBarTitleText" : "身份证",
+					"path": "card/card",
+					"style": {
+						"navigationBarTitleText": "身份证",
+						"navigationStyle": "custom"
+					}
+				},
+				{
+					"path": "train-tickets/ctrip-train-tickets/ctrip-train-tickets",
+					"style": {
+						"navigationBarTitleText": "携程火车票",
 						"navigationStyle": "custom"
 					}
 				}
diff --git a/pages/common/recharge/index.vue b/pages/common/recharge/index.vue
index 6930d26..072f574 100644
--- a/pages/common/recharge/index.vue
+++ b/pages/common/recharge/index.vue
@@ -4,8 +4,19 @@
 		<view>
 			<image :src="data.banner" style="width: 100%;height: 244px;"></image>
 		</view>
-		<view style="margin-top:-90px;position: relative;">
+		<!-- <view style="margin-top:-90px;position: relative;">
 			<customTab :isHuise="shouldBeTrue(data.goods)" />
+		</view> -->
+		<view class="vipContent" style="margin-top:-90px;position: relative;">
+			<view class="top">
+				<image src="/static/image/recharge/vipContentTopBgImg.png" mode="widthFix"></image>
+			</view>
+			<view class="vipList">
+				<view class="item" v-for="(item, index) in data.benefitList" :key="index">
+					<image :src="item.url"></image>
+					<text>{{ item.name }}</text>
+				</view>
+			</view>
 		</view>
 		<scroll-view class="package-items-box" scroll-x="true" v-if="data.goodsList.length">
 			<view class="package-items-container">
@@ -361,43 +372,43 @@ const data = reactive({
 		url: "/static/image/recharge/icon2.png"
 	},
 	{
-		name: "专属客服",
+		name: "微信模拟",
 		url: "/static/image/recharge/icon3.png"
 	},
 	{
-		name: "多设备",
+		name: "小宝模拟",
 		url: "/static/image/recharge/icon4.png"
 	},
 	{
-		name: "AI聊天模板",
+		name: "机票",
 		url: "/static/image/recharge/icon5.png"
 	},
 	{
-		name: "聊天转账",
+		name: "高铁票",
 		url: "/static/image/recharge/icon6.png"
 	},
 	{
-		name: "限额设置",
+		name: "工资单",
 		url: "/static/image/recharge/icon7.png"
 	},
 	{
-		name: "零钱修改",
+		name: "群聊",
 		url: "/static/image/recharge/icon8.png"
 	},
 	{
-		name: "零钱通",
+		name: "豪车模拟",
 		url: "/static/image/recharge/icon9.png"
 	},
 	{
-		name: "分付",
+		name: "模拟来电",
 		url: "/static/image/recharge/icon10.png"
 	},
 	{
-		name: "账单",
+		name: "多设备",
 		url: "/static/image/recharge/icon11.png"
 	},
 	{
-		name: "朋友圈",
+		name: "其他权益",
 		url: "/static/image/recharge/icon12.png"
 	}
 	],
@@ -433,6 +444,7 @@ const data = reactive({
 	// 添加一个标志位来防止快速连续点击导致的价格显示错误
 	isProcessingClick: false,
 	banner: '/static/image/recharge/banner1.png',
+	isCombo: false,
 })
 
 let {
@@ -597,8 +609,24 @@ onLoad(async () => {
 
 })
 
-onShow(async () => {
-
+onShow(() => {
+	if (data.isCombo) {
+		uni.showModal({
+			title: '提示',
+			content: '是否支付成功？',
+			cancelText: '未支付',
+			confirmText: "已支付",
+			success: function (res) {
+				if (res.confirm) {
+					console.log('用户点击确定');
+					paymentResult(uni.getStorageSync('orderId'), paymentMethod.value)
+				} else if (res.cancel) {
+					console.log('用户点击取消');
+				}
+			}
+		});
+		data.isCombo = false
+	}
 })
 onUnload(() => {
 	// uni.offNativeEventReceive()
@@ -1106,11 +1134,11 @@ async function activateVip(type = '') {
 		"支付方式": paymentMethod.value == "wxpay" ? '微信' : "支付宝",
 	})
 
-
+	let isComBo = uni.getStorageSync('isCombo') == 'ok'
 	let paymentRes = await postJson('a', 'api/order', {
 		goods_id: data.goods.goods_id,
 		coupon: data.active_id ? data.active_id : '',
-		pay_type: paymentMethod.value == "wxpay" ? 'weixin' : "alipay",
+		pay_type: paymentMethod.value == "wxpay" ? (data.goods.weixinMpOriId && isComBo ? 'combo' : 'weixin') : "alipay",
 		"pay_source": "app",
 		source: "uni_alipay",
 	})
@@ -1120,23 +1148,38 @@ async function activateVip(type = '') {
 	if (paymentRes.code == 0) {
 		let payData = {}
 		if (paymentMethod.value == "wxpay") {
-			payData = {
-				"appid": paymentRes.data.appId, // 应用ID
-				"noncestr": paymentRes.data.nonceStr, // 随机字符串
-				"package": "Sign=WXPay", // 固定值
-				"partnerid": paymentRes.data.partnerId, // 商户号
-				"prepayid": paymentRes.data.prepayId, // 预支付交易会话ID
-				"timestamp": Number(paymentRes.data.timeStamp), // 时间戳（秒！）
-				"sign": paymentRes.data.sign // 签名
-			}
-			uni.setStorageSync('orderId', paymentRes.data.orderId)
-			//安卓wx支付开始传递开始
-			if (proxy.$system != 'iOS') {
-				uni.sendNativeEvent('wx_pay_start_alipay', paymentRes.data.orderId, ret => {
+
+			if (data.goods.weixinMpOriId && isComBo) {
+				console.log(paymentRes)
+				let SZappData = {
+					weixinMpOriId: data.goods.weixinMpOriId,
+					outTradeNo: paymentRes.data.outTradeNo
+				}
+				uni.setStorageSync('orderId', paymentRes.data.orderId)
+				uni.sendNativeEvent('start_combo_pay', SZappData, ret => {
 					console.log('宿主App回传的数据：' + ret);
 				});
+				data.isCombo = true
+				uni.hideLoading();
+				return
+			} else {
+				payData = {
+					"appid": paymentRes.data.appId, // 应用ID
+					"noncestr": paymentRes.data.nonceStr, // 随机字符串
+					"package": "Sign=WXPay", // 固定值
+					"partnerid": paymentRes.data.partnerId, // 商户号
+					"prepayid": paymentRes.data.prepayId, // 预支付交易会话ID
+					"timestamp": Number(paymentRes.data.timeStamp), // 时间戳（秒！）
+					"sign": paymentRes.data.sign // 签名
+				}
+				uni.setStorageSync('orderId', paymentRes.data.orderId)
+				//安卓wx支付开始传递开始
+				if (proxy.$system != 'iOS') {
+					uni.sendNativeEvent('wx_pay_start_alipay', paymentRes.data.orderId, ret => {
+						console.log('宿主App回传的数据：' + ret);
+					});
+				}
 			}
-
 		} else {
 			payData = paymentRes.data.payParam
 			uni.setStorageSync('orderId', paymentRes.data.orderId)
@@ -2411,4 +2454,46 @@ function shouldBeTrue(obj) {
 	left: 15px;
 	z-index: 999999;
 }
+
+.vipContent {
+	background-color: #fff;
+	margin-left: 16px;
+	width: calc(100% - 32px);
+	border-radius: 16px;
+	margin-bottom: 20px;
+
+	.top {
+		image {
+			width: 100%;
+		}
+	}
+
+	.vipList {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 10px;
+
+		.item {
+			width: 25%;
+			height: 75px;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			justify-content: center;
+
+			image {
+				width: 38px;
+				height: 38px;
+			}
+
+			text {
+				margin-top: 5px;
+				font-size: 10px;
+				color: #1A1A1A;
+				line-height: 15px;
+				text-align: center;
+			}
+		}
+	}
+}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.nvue b/pages/index/index.nvue
index 5207032..bcdf6f9 100644
--- a/pages/index/index.nvue
+++ b/pages/index/index.nvue
@@ -16,7 +16,6 @@
 
 		</view>
 		<view class="content-box" :style="{ height: windowHeight + 'px' }">
-
 			<scroll-view scroll-y="true" class="scroll-view"
 				:style="{ height: (windowHeight - statusBarHeight - 44) + 'px', marginTop: (statusBarHeight + 44) + 'px' }"
 				@scroll="handleScroll">
@@ -137,815 +136,814 @@
 	</view>
 </template>
 <script setup>
-import {
-	util,
-	uiUtil
-} from '@/utils/common.js'
-import {
-	storage
-} from '@/utils/storage.js'
-import {
-	get,
-	postJson
-} from '@/utils/requests.js'
-import {
-	ref,
-	reactive,
-	toRefs
-} from 'vue';
+	import {
+		util,
+		uiUtil
+	} from '@/utils/common.js'
+	import {
+		storage
+	} from '@/utils/storage.js'
+	import {
+		get,
+		postJson
+	} from '@/utils/requests.js'
+	import {
+		ref,
+		reactive,
+		toRefs
+	} from 'vue';
 
-import {
-	onLoad,
-	onShow,
-	onHide,
-	onUnload
-} from '@dcloudio/uni-app';
+	import {
+		onLoad,
+		onShow,
+		onHide,
+		onUnload
+	} from '@dcloudio/uni-app';
 
-// 内部埋点方法
-const apiUserEvent = async (type, adminData) => {
-	let uni_version = uni.getStorageSync("version")
-	if (type != 'uni') {
-		await postJson('a', 'api/user/event', {
-			type: adminData.type,
-			key: adminData.type + ".uni.alipay." + adminData.key,
-			value: adminData.value,
-			extra: JSON.stringify({
-				uni_version: uni_version,
-				...adminData.extra
-			}),
+	// 内部埋点方法
+	const apiUserEvent = async (type, adminData) => {
+		let uni_version = uni.getStorageSync("version")
+		if (type != 'uni') {
+			await postJson('a', 'api/user/event', {
+				type: adminData.type,
+				key: adminData.type + ".uni.alipay." + adminData.key,
+				value: adminData.value,
+				extra: JSON.stringify({
+					uni_version: uni_version,
+					...adminData.extra
+				}),
+			})
+		}
+	}
+
+	// 内部跳转充值页方法
+	const goRechargePage = () => {
+		// 进入页面
+		apiUserEvent('all', {
+			type: "event",
+			key: "payment_onload",
+			value: "进入充值页面",
+			extra: {
+				from: "支付宝模拟器首页"
+			}
 		})
-	}
-}
-
-// 内部跳转充值页方法
-const goRechargePage = () => {
-	// 进入页面
-	apiUserEvent('all', {
-		type: "event",
-		key: "payment_onload",
-		value: "进入充值页面",
-		extra: {
-			from: "支付宝模拟器首页"
-		}
-	})
-	uni.navigateTo({
-		url: '/pages/common/recharge/index'
-	});
-}
-
-// 菜单列表
-const menuList = [{
-	icon: "yuemoni",
-	name: "余额模拟",
-	isHot: false,
-	path: "/pages/balance/index"
-},
-{
-	icon: "zhangdanshencheng",
-	name: "账单生成",
-	isHot: false,
-	path: "/pages/bill/bill-list/bill-list"
-},
-{
-	icon: "licaiheika",
-	name: "理财黑卡",
-	isHot: true,
-	path: "/pages/finance-management/index"
-	// path: ""
-},
-{
-	icon: "huabei",
-	name: "花呗",
-	isHot: false,
-	path: "/pages/ant-credit-pay/index"
-},
-]
-
-
-const otherList = [{
-	icon: "/static/image/index/qita/jipiao.png",
-	name: "机票",
-	path: "/pages/other/tickets-app/index"
-},
-{
-	icon: "/static/image/index/qita/huochepiao.png",
-	name: "火车票",
-	path: "/pages/other/train-tickets/12306-tickets/12306-tickets"
-},
-{
-	icon: "/static/image/index/qita/gongzidan.png",
-	name: "工资单",
-	path: "/pages/other/splash/splash"
-},
-{
-	icon: "/static/image/index/qita/shipinqunliao.png",
-	name: "视频群聊",
-	path: "/pages/other/video-group-chat/video-group-chat"
-},
-{
-	icon: "/static/image/index/qita/card.png",
-	name: "身份证",
-	path: "/pages/other/card/card"
-},
-]
-
-const data = reactive({
-	navBarBgColor: 'transparent',
-	statusBarHeight: 0,
-	windowWidth: 0,
-	windowHeight: 0,
-	userInfo: {},
-	videoHelpList: [],
-	noticeInfo: {},
-	vision: "",
-	platform: '', // 添加平台信息,
-	qqgroup: {}
-})
-
-const {
-	statusBarHeight,
-	windowWidth,
-	windowHeight,
-	userInfo,
-	videoHelpList,
-	noticeInfo,
-	vision,
-	platform,
-	qqgroup
-} = toRefs(data);
-
-/**
- * 处理页面滚动事件
- */
-const handleScroll = (e) => {
-	const scrollTop = e.detail.scrollTop
-	// 滚动超过20px时显示蓝色背景，否则显示透明背景
-	if (scrollTop > 20) {
-		data.navBarBgColor = '#DDF0FD'
-	} else {
-		data.navBarBgColor = 'transparent'
-	}
-}
-
-onLoad(async () => {
-	// 获取平台信息
-	const systemInfo = uni.getSystemInfoSync()
-	data.platform = systemInfo.platform
-	data.vision = uni.getStorageSync('version')
-})
-
-onShow(() => {
-	// 启动时获取数据
-	fetchUserData()
-	// 每次显示时刷新数据
-	setUserData()
-	// 获取系统信息
-	const systemInfo = uni.getSystemInfoSync();
-	data.statusBarHeight = systemInfo.statusBarHeight;
-	data.windowWidth = systemInfo.windowWidth;
-	data.windowHeight = systemInfo.windowHeight;
-	// #ifdef APP-PLUS
-	util.setAndroidSystemBarColor('#F0F4F9')
-	setTimeout(() => {
-		plus.navigator.setStatusBarStyle("dark");
-	}, 500)
-	// #endif
-})
-
-/**
- * 获取用户数据(从服务器)
- */
-const fetchUserData = async () => {
-	try {
-		// 先设置默认值,避免页面显示异常
-		setUserData()
-
-		// 并行获取用户信息和配置
-		const [userResult, configResult] = await Promise.allSettled([
-			fetchUserInfo(),
-			fetchUserConfig()
-		])
-
-		// 处理用户信息结果
-		if (userResult.status === 'fulfilled') {
-			console.log('用户信息获取成功')
-		} else {
-			console.error('获取用户信息失败:', userResult.reason)
-		}
-
-		// 处理用户配置结果
-		if (configResult.status === 'fulfilled') {
-			console.log('用户配置获取成功')
-		} else {
-			console.error('获取用户配置失败:', configResult.reason)
-		}
-
-		// 刷新页面数据
-		setUserData()
-
-		// 检查是否有延迟跳转
-		const jumpTarget = uni.getStorageSync('jumpTarget_url');
-		if (jumpTarget) {
-			console.log('执行延迟跳转:', jumpTarget);
-			uni.removeStorageSync('jumpTarget_url');
-			uni.navigateTo({
-				url: '/' + jumpTarget
-			});
-		}
-	} catch (error) {
-		console.error('获取用户数据异常:', error)
-	}
-}
-
-/**
- * 获取用户信息
- */
-const fetchUserInfo = async () => {
-	const data = await get('', 'api/user', {})
-	if (data.code === 0) {
-		uni.setStorageSync('userInfo', data.data)
-		return data.data
-	} else {
-		throw new Error(data.message || '获取用户信息失败')
-	}
-}
-
-/**
- * 获取用户配置
- */
-const fetchUserConfig = async () => {
-	const data = await get('', 'api/user/config', {})
-	if (data.code === 0) {
-		uni.setStorageSync('config', data.data)
-		return data.data
-	} else {
-		throw new Error(data.message || '获取用户配置失败')
-	}
-}
-
-
-/**
- * 设置用户数据(从本地存储读取)
- */
-const setUserData = () => {
-	// 用户信息 - 提供默认值
-	const userInfoData = storage.get("userInfo")
-	data.userInfo = userInfoData || {
-		user_id: '加载中...',
-		avater: '/static/default-avatar.png',
-		vip: 0,
-		vip_expire: ''
-	}
-
-	// 配置信息 - 安全访问
-	const configData = storage.get("config")
-	if (configData && configData.config) {
-		console.log("公告牌配置信息", configData.config['client.uniapp.notice'])
-		data.noticeInfo = configData.config['client.uniapp.notice'] || {
-			text: '加载中...',
-			url: '',
-			enable: false
-		}
-		data.noticeInfo = configData.config['client.uniapp.notice'] || {
-			text: '加载中...',
-			url: '',
-			enable: false
-		}
-		// 启动走马灯
-		startMarquee();
-		data.videoHelpList = configData.config['client.uniapp.alipay.video_help'] || []
-		// data.videoHelpList.push(configData.config['client.uniapp.alipay.video_help'][0])
-		data.qqgroup = configData.config['client.uniapp.qqgroup'] || {
-			enable: false,
-			number: "",
-			text: ""
-		}
-
-	} else {
-		data.noticeInfo = {
-			text: '加载中...',
-			url: '',
-			enable: false
-		}
-		data.videoHelpList = []
-	}
-}
-
-const clickMenu = (item) => {
-	if (!item.path) {
-		uiUtil.showError('开发中')
-	} else {
-		const isOverdue = storage.get("huabei_info_storage").isOverdue || false
-		let url = item.path
-		if (item.name == "花呗" && isOverdue) {
-			url = "/pages/ant-credit-pay/overdue-payment/overdue-payment"
-		}
-		util.goPage(url)
-	}
-}
-
-
-// 开通vip
-const openVip = () => {
-	goRechargePage()
-}
-
-/**
- * 点击视频教程
- * @param item 
- */
-const clickVideoHelp = (item) => {
-	const url = item.url
-	util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${item.text}`)
-}
-
-/**
- * 点击公告
- */
-const clickNotice = () => {
-	console.log("点击公告", noticeInfo.value)
-	if (!noticeInfo.value.url) return
-	const url = noticeInfo.value.url + `&uni_id=${userInfo.value.user_id}`
-	util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}`)
-}
-
-/**
- * 终极兼容版复制函数
- */
-const copyNumber = (number) => {
-	if (!number) return;
-	const text = String(number);
-	uni.setClipboardData({
-		data: text,
-		success: function () {
-			uni.showToast({
-				title: '复制成功',
-				icon: 'none'
-			});
-		},
-		fail: function () {
-			uni.showToast({
-				title: '复制失败',
-				icon: 'none'
-			});
-		}
-	});
-}
-
-
-/**
- * 退出模拟器
- */
-const exit = () => {
-	console.log("退出模拟器")
-	// 判断是否为 iOS 环境
-	if (uni.getSystemInfoSync().platform === 'ios') {
-		uni.sendNativeEvent('closeUniAPP', "closeUniAPP", ret => {
-			console.log('宿主App回传的数据：' + ret);
+		uni.navigateTo({
+			url: '/pages/common/recharge/index'
 		});
-	} else {
-		plus.runtime.quit();
-	}
-}
-
-const noticeContainer = ref(null);
-const noticeInner = ref(null);
-const noticeBox = ref(null);
-
-// #ifndef H5
-const animation = uni.requireNativePlugin('animation');
-const dom = uni.requireNativePlugin('dom');
-// #endif
-
-let marqueeTimer = null;
-const currentMarqueeId = ref(0);
-const lastMarqueeText = ref('');
-
-/**
- * 开始走马灯
- */
-const startMarquee = () => {
-	// 避免不必要的重置：如果文本没有变化且正在运行，则忽略
-	if (lastMarqueeText.value === noticeInfo.value.text && currentMarqueeId.value > 0) {
-		return;
-	}
-	lastMarqueeText.value = noticeInfo.value.text;
-
-	// 清除待执行的启动定时器
-	if (marqueeTimer) {
-		clearTimeout(marqueeTimer);
-		marqueeTimer = null;
 	}
 
-	// 增加 ID 以使之前的动画循环失效
-	currentMarqueeId.value++;
-	const myId = currentMarqueeId.value;
+	// 菜单列表
+	const menuList = [{
+			icon: "yuemoni",
+			name: "余额模拟",
+			isHot: false,
+			path: "/pages/balance/index"
+		},
+		{
+			icon: "zhangdanshencheng",
+			name: "账单生成",
+			isHot: false,
+			path: "/pages/bill/bill-list/bill-list"
+		},
+		{
+			icon: "licaiheika",
+			name: "理财黑卡",
+			isHot: true,
+			path: "/pages/finance-management/index"
+			// path: ""
+		},
+		{
+			icon: "huabei",
+			name: "花呗",
+			isHot: false,
+			path: "/pages/ant-credit-pay/index"
+		},
+	]
+	const otherList = [{
+			icon: "/static/image/index/qita/jipiao.png",
+			name: "机票",
+			path: "/pages/other/tickets-app/index?type=airTicket"
+		},
+		{
+			icon: "/static/image/index/qita/huochepiao.png",
+			name: "火车票",
+			// path: "/pages/other/train-tickets/12306-tickets/12306-tickets"
+			path: "/pages/other/tickets-app/index?type=trainTicket"
+		},
+		{
+			icon: "/static/image/index/qita/gongzidan.png",
+			name: "工资单",
+			path: "/pages/other/splash/splash"
+		},
+		{
+			icon: "/static/image/index/qita/shipinqunliao.png",
+			name: "视频群聊",
+			path: "/pages/other/video-group-chat/video-group-chat"
+		},
+		{
+			icon: "/static/image/index/qita/card.png",
+			name: "身份证",
+			path: "/pages/other/card/card"
+		},
+	]
 
-	// 清除旧动画状态 (重置位置)
-	if (noticeInner.value) {
-		animation.transition(noticeInner.value, {
+	const data = reactive({
+		navBarBgColor: 'transparent',
+		statusBarHeight: 0,
+		windowWidth: 0,
+		windowHeight: 0,
+		userInfo: {},
+		videoHelpList: [],
+		noticeInfo: {},
+		vision: "",
+		platform: '', // 添加平台信息,
+		qqgroup: {}
+	})
+
+	const {
+		statusBarHeight,
+		windowWidth,
+		windowHeight,
+		userInfo,
+		videoHelpList,
+		noticeInfo,
+		vision,
+		platform,
+		qqgroup
+	} = toRefs(data);
+
+	/**
+	 * 处理页面滚动事件
+	 */
+	const handleScroll = (e) => {
+		const scrollTop = e.detail.scrollTop
+		// 滚动超过20px时显示蓝色背景，否则显示透明背景
+		if (scrollTop > 20) {
+			data.navBarBgColor = '#DDF0FD'
+		} else {
+			data.navBarBgColor = 'transparent'
+		}
+	}
+
+	onLoad(async () => {
+		// 获取平台信息
+		const systemInfo = uni.getSystemInfoSync()
+		data.platform = systemInfo.platform
+		data.vision = uni.getStorageSync('version')
+	})
+
+	onShow(() => {
+		// 启动时获取数据
+		fetchUserData()
+		// 每次显示时刷新数据
+		setUserData()
+		// 获取系统信息
+		const systemInfo = uni.getSystemInfoSync();
+		data.statusBarHeight = systemInfo.statusBarHeight;
+		data.windowWidth = systemInfo.windowWidth;
+		data.windowHeight = systemInfo.windowHeight;
+		// #ifdef APP-PLUS
+		util.setAndroidSystemBarColor('#F0F4F9')
+		setTimeout(() => {
+			plus.navigator.setStatusBarStyle("dark");
+		}, 500)
+		// #endif
+	})
+
+	/**
+	 * 获取用户数据(从服务器)
+	 */
+	const fetchUserData = async () => {
+		try {
+			// 先设置默认值,避免页面显示异常
+			setUserData()
+
+			// 并行获取用户信息和配置
+			const [userResult, configResult] = await Promise.allSettled([
+				fetchUserInfo(),
+				fetchUserConfig()
+			])
+
+			// 处理用户信息结果
+			if (userResult.status === 'fulfilled') {
+				console.log('用户信息获取成功')
+			} else {
+				console.error('获取用户信息失败:', userResult.reason)
+			}
+
+			// 处理用户配置结果
+			if (configResult.status === 'fulfilled') {
+				console.log('用户配置获取成功')
+			} else {
+				console.error('获取用户配置失败:', configResult.reason)
+			}
+
+			// 刷新页面数据
+			setUserData()
+
+			// 检查是否有延迟跳转
+			const jumpTarget = uni.getStorageSync('jumpTarget_url');
+			if (jumpTarget) {
+				console.log('执行延迟跳转:', jumpTarget);
+				uni.removeStorageSync('jumpTarget_url');
+				uni.navigateTo({
+					url: '/' + jumpTarget
+				});
+			}
+		} catch (error) {
+			console.error('获取用户数据异常:', error)
+		}
+	}
+
+	/**
+	 * 获取用户信息
+	 */
+	const fetchUserInfo = async () => {
+		const data = await get('', 'api/user', {})
+		if (data.code === 0) {
+			uni.setStorageSync('userInfo', data.data)
+			return data.data
+		} else {
+			throw new Error(data.message || '获取用户信息失败')
+		}
+	}
+
+	/**
+	 * 获取用户配置
+	 */
+	const fetchUserConfig = async () => {
+		const data = await get('', 'api/user/config', {})
+		if (data.code === 0) {
+			uni.setStorageSync('config', data.data)
+			return data.data
+		} else {
+			throw new Error(data.message || '获取用户配置失败')
+		}
+	}
+
+
+	/**
+	 * 设置用户数据(从本地存储读取)
+	 */
+	const setUserData = () => {
+		// 用户信息 - 提供默认值
+		const userInfoData = storage.get("userInfo")
+		data.userInfo = userInfoData || {
+			user_id: '加载中...',
+			avater: '/static/default-avatar.png',
+			vip: 0,
+			vip_expire: ''
+		}
+
+		// 配置信息 - 安全访问
+		const configData = storage.get("config")
+		if (configData && configData.config) {
+			console.log("公告牌配置信息", configData.config['client.uniapp.notice'])
+			data.noticeInfo = configData.config['client.uniapp.notice'] || {
+				text: '加载中...',
+				url: '',
+				enable: false
+			}
+			data.noticeInfo = configData.config['client.uniapp.notice'] || {
+				text: '加载中...',
+				url: '',
+				enable: false
+			}
+			// 启动走马灯
+			startMarquee();
+			data.videoHelpList = configData.config['client.uniapp.alipay.video_help'] || []
+			// data.videoHelpList.push(configData.config['client.uniapp.alipay.video_help'][0])
+			data.qqgroup = configData.config['client.uniapp.qqgroup'] || {
+				enable: false,
+				number: "",
+				text: ""
+			}
+
+		} else {
+			data.noticeInfo = {
+				text: '加载中...',
+				url: '',
+				enable: false
+			}
+			data.videoHelpList = []
+		}
+	}
+
+	const clickMenu = (item) => {
+		if (!item.path) {
+			uiUtil.showError('开发中')
+		} else {
+			const isOverdue = storage.get("huabei_info_storage").isOverdue || false
+			let url = item.path
+			if (item.name == "花呗" && isOverdue) {
+				url = "/pages/ant-credit-pay/overdue-payment/overdue-payment"
+			}
+			util.goPage(url)
+		}
+	}
+
+
+	// 开通vip
+	const openVip = () => {
+		goRechargePage()
+	}
+
+	/**
+	 * 点击视频教程
+	 * @param item 
+	 */
+	const clickVideoHelp = (item) => {
+		const url = item.url
+		util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${item.text}`)
+	}
+
+	/**
+	 * 点击公告
+	 */
+	const clickNotice = () => {
+		console.log("点击公告", noticeInfo.value)
+		if (!noticeInfo.value.url) return
+		const url = noticeInfo.value.url + `&uni_id=${userInfo.value.user_id}`
+		util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}`)
+	}
+
+	/**
+	 * 终极兼容版复制函数
+	 */
+	const copyNumber = (number) => {
+		if (!number) return;
+		const text = String(number);
+		uni.setClipboardData({
+			data: text,
+			success: function() {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			},
+			fail: function() {
+				uni.showToast({
+					title: '复制失败',
+					icon: 'none'
+				});
+			}
+		});
+	}
+
+
+	/**
+	 * 退出模拟器
+	 */
+	const exit = () => {
+		console.log("退出模拟器")
+		// 判断是否为 iOS 环境
+		if (uni.getSystemInfoSync().platform === 'ios') {
+			uni.sendNativeEvent('closeUniAPP', "closeUniAPP", ret => {
+				console.log('宿主App回传的数据：' + ret);
+			});
+		} else {
+			plus.runtime.quit();
+		}
+	}
+
+	const noticeContainer = ref(null);
+	const noticeInner = ref(null);
+	const noticeBox = ref(null);
+
+	// #ifndef H5
+	const animation = uni.requireNativePlugin('animation');
+	const dom = uni.requireNativePlugin('dom');
+	// #endif
+
+	let marqueeTimer = null;
+	const currentMarqueeId = ref(0);
+	const lastMarqueeText = ref('');
+
+	/**
+	 * 开始走马灯
+	 */
+	const startMarquee = () => {
+		// 避免不必要的重置：如果文本没有变化且正在运行，则忽略
+		if (lastMarqueeText.value === noticeInfo.value.text && currentMarqueeId.value > 0) {
+			return;
+		}
+		lastMarqueeText.value = noticeInfo.value.text;
+
+		// 清除待执行的启动定时器
+		if (marqueeTimer) {
+			clearTimeout(marqueeTimer);
+			marqueeTimer = null;
+		}
+
+		// 增加 ID 以使之前的动画循环失效
+		currentMarqueeId.value++;
+		const myId = currentMarqueeId.value;
+
+		// 清除旧动画状态 (重置位置)
+		if (noticeInner.value) {
+			animation.transition(noticeInner.value, {
+				styles: {
+					transform: 'translateX(0)'
+				},
+				duration: 0,
+				delay: 0
+			});
+		}
+
+		marqueeTimer = setTimeout(() => {
+			if (!noticeContainer.value || !noticeInner.value) return;
+			// 如果ID不匹配，说明有新的启动请求，放弃当前
+			if (myId !== currentMarqueeId.value) return;
+
+			// 获取容器宽度
+			dom.getComponentRect(noticeContainer.value, (resContainer) => {
+				const containerWidth = resContainer.size.width;
+				if (!containerWidth) return;
+
+				// 获取文本/内部容器宽度
+				dom.getComponentRect(noticeInner.value, (resText) => {
+					const textWidth = resText.size.width / 2; // 因为复制了一份
+					if (!textWidth) return;
+
+					// 执行滚动
+					runMarqueeAnimation(containerWidth, textWidth, myId);
+				});
+			});
+		}, 1000); // 增加延时确保渲染
+	}
+
+	/**
+	 * 执行滚动动画循环
+	 */
+	const runMarqueeAnimation = (containerWidth, textWidth, myId) => {
+		// ID 校验：如果当前ID不匹配，说明已被新动画取代，停止递归
+		if (myId !== currentMarqueeId.value) return;
+		if (!noticeInner.value) return;
+
+		// 动画的目标：移动 Inner 容器
+		const target = noticeInner.value;
+		const realScrollDistance = textWidth;
+
+		// 1. 重置位置到 0 (无感重置)
+		animation.transition(target, {
 			styles: {
-				transform: 'translateX(0)'
+				transform: `translateX(0)`
 			},
 			duration: 0,
 			delay: 0
-		});
-	}
+		}, () => {
+			// 再次校验ID
+			if (myId !== currentMarqueeId.value) return;
 
-	marqueeTimer = setTimeout(() => {
-		if (!noticeContainer.value || !noticeInner.value) return;
-		// 如果ID不匹配，说明有新的启动请求，放弃当前
-		if (myId !== currentMarqueeId.value) return;
+			// 计算时间
+			const speed = 50; // px/s
+			const duration = (realScrollDistance / speed) * 1000;
 
-		// 获取容器宽度
-		dom.getComponentRect(noticeContainer.value, (resContainer) => {
-			const containerWidth = resContainer.size.width;
-			if (!containerWidth) return;
-
-			// 获取文本/内部容器宽度
-			dom.getComponentRect(noticeInner.value, (resText) => {
-				const textWidth = resText.size.width / 2; // 因为复制了一份
-				if (!textWidth) return;
-
-				// 执行滚动
+			// 2. 向左滚动一个文本宽度的距离
+			animation.transition(target, {
+				styles: {
+					transform: `translateX(-${realScrollDistance}px)`
+				},
+				duration: duration,
+				timingFunction: 'linear',
+				delay: 0
+			}, () => {
+				// 3. 循环
 				runMarqueeAnimation(containerWidth, textWidth, myId);
 			});
 		});
-	}, 1000); // 增加延时确保渲染
-}
-
-/**
- * 执行滚动动画循环
- */
-const runMarqueeAnimation = (containerWidth, textWidth, myId) => {
-	// ID 校验：如果当前ID不匹配，说明已被新动画取代，停止递归
-	if (myId !== currentMarqueeId.value) return;
-	if (!noticeInner.value) return;
-
-	// 动画的目标：移动 Inner 容器
-	const target = noticeInner.value;
-	const realScrollDistance = textWidth;
-
-	// 1. 重置位置到 0 (无感重置)
-	animation.transition(target, {
-		styles: {
-			transform: `translateX(0)`
-		},
-		duration: 0,
-		delay: 0
-	}, () => {
-		// 再次校验ID
-		if (myId !== currentMarqueeId.value) return;
-
-		// 计算时间
-		const speed = 50; // px/s
-		const duration = (realScrollDistance / speed) * 1000;
-
-		// 2. 向左滚动一个文本宽度的距离
-		animation.transition(target, {
-			styles: {
-				transform: `translateX(-${realScrollDistance}px)`
-			},
-			duration: duration,
-			timingFunction: 'linear',
-			delay: 0
-		}, () => {
-			// 3. 循环
-			runMarqueeAnimation(containerWidth, textWidth, myId);
-		});
-	});
-}
-
-/**
- * 停止走马灯
- */
-const stopMarquee = () => {
-	// 清除定时器
-	if (marqueeTimer) {
-		clearTimeout(marqueeTimer);
-		marqueeTimer = null;
 	}
-	// 增加ID使其失效
-	currentMarqueeId.value++;
-}
 
-onHide(() => {
-	stopMarquee();
-})
+	/**
+	 * 停止走马灯
+	 */
+	const stopMarquee = () => {
+		// 清除定时器
+		if (marqueeTimer) {
+			clearTimeout(marqueeTimer);
+			marqueeTimer = null;
+		}
+		// 增加ID使其失效
+		currentMarqueeId.value++;
+	}
 
-onUnload(() => {
-	stopMarquee();
-})
+	onHide(() => {
+		stopMarquee();
+	})
+
+	onUnload(() => {
+		stopMarquee();
+	})
 </script>
 <style>
-.container {
-	background-color: #F0F4F9;
-}
+	.container {
+		background-color: #F0F4F9;
+	}
 
-.margin-l-6 {
-	margin-left: 6px;
-}
+	.margin-l-6 {
+		margin-left: 6px;
+	}
 
-.index-bg-img {
-	position: fixed;
-	top: 0;
-	left: 0;
-	z-index: 0;
-}
+	.index-bg-img {
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 0;
+	}
 
-.nav-bar-box {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	z-index: 9999;
-	background-color: transparent;
-}
+	.nav-bar-box {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 9999;
+		background-color: transparent;
+	}
 
-.content-box {
-	position: fixed;
-	top: 0rpx;
-	left: 0;
-	right: 0;
-	z-index: 1;
-	background-color: transparent;
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-}
+	.content-box {
+		position: fixed;
+		top: 0rpx;
+		left: 0;
+		right: 0;
+		z-index: 1;
+		background-color: transparent;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
 
 
-::v-deep .uni-scroll-view-content {
-	display: flex;
-	flex-direction: column;
-	justify-content: space-between;
-}
+	::v-deep .uni-scroll-view-content {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
 
-.status-box {
-	width: 100%;
-}
+	.status-box {
+		width: 100%;
+	}
 
-.nav-box {
-	height: 44px;
-	background-color: transparent;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-}
+	.nav-box {
+		height: 44px;
+		background-color: transparent;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+	}
 
-.left-box {
-	width: 60px;
-	height: 44px;
-	background-color: transparent;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	position: relative;
-	z-index: 10;
-}
+	.left-box {
+		width: 60px;
+		height: 44px;
+		background-color: transparent;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		z-index: 10;
+	}
 
-.title {
-	flex: 1;
-	height: 44px;
-	font-size: 32rpx;
-	font-weight: 500;
-	color: #1A1A1A;
-	font-weight: bold;
-	background-color: transparent;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+	.title {
+		flex: 1;
+		height: 44px;
+		font-size: 32rpx;
+		font-weight: 500;
+		color: #1A1A1A;
+		font-weight: bold;
+		background-color: transparent;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.right-box {
-	width: 60px;
-	height: 44px;
-	background-color: transparent;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
+	.right-box {
+		width: 60px;
+		height: 44px;
+		background-color: transparent;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
 
-.user-box {
-	position: relative;
-	margin: 24rpx 32rpx 0;
-	height: 120rpx;
-	z-index: 10;
-}
+	.user-box {
+		position: relative;
+		margin: 24rpx 32rpx 0;
+		height: 120rpx;
+		z-index: 10;
+	}
 
-.user-bg {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 120rpx;
-}
+	.user-bg {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 120rpx;
+	}
 
-.user-info-box {
-	position: absolute;
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	padding: 0 32rpx;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 120rpx;
-	z-index: 1;
-}
+	.user-info-box {
+		position: absolute;
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		padding: 0 32rpx;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 120rpx;
+		z-index: 1;
+	}
 
-.user-info {
-	flex: 1;
-}
+	.user-info {
+		flex: 1;
+	}
 
-.user-avatar {
-	width: 72rpx;
-	height: 72rpx;
-	border-radius: 50%;
-	margin-right: 20rpx;
-}
+	.user-avatar {
+		width: 72rpx;
+		height: 72rpx;
+		border-radius: 50%;
+		margin-right: 20rpx;
+	}
 
-.name-box {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-}
+	.name-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
 
-.phone-text {
-	font-size: 28rpx;
-	color: #FFFFFF;
-	font-weight: bold;
-	margin-right: 12rpx;
-}
+	.phone-text {
+		font-size: 28rpx;
+		color: #FFFFFF;
+		font-weight: bold;
+		margin-right: 12rpx;
+	}
 
-.vip-logo {
-	width: 60rpx;
-	height: 20rpx;
-}
+	.vip-logo {
+		width: 60rpx;
+		height: 20rpx;
+	}
 
-.vip-end-time {
-	font-size: 24rpx;
-	color: #FFFFFF;
-	margin-top: 8rpx;
-}
+	.vip-end-time {
+		font-size: 24rpx;
+		color: #FFFFFF;
+		margin-top: 8rpx;
+	}
 
-.open-vip-btn {
-	height: 40rpx;
-	width: 116rpx;
-}
+	.open-vip-btn {
+		height: 40rpx;
+		width: 116rpx;
+	}
 
-.notice-box {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	margin: 16rpx 32rpx 0;
-	background-color: #FFFFFF;
-	border-radius: 16rpx 16rpx 16rpx 16rpx;
-	padding: 0 16rpx;
-	height: 64rpx;
-	overflow: hidden;
-}
+	.notice-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin: 16rpx 32rpx 0;
+		background-color: #FFFFFF;
+		border-radius: 16rpx 16rpx 16rpx 16rpx;
+		padding: 0 16rpx;
+		height: 64rpx;
+		overflow: hidden;
+	}
 
-.sound-box {
-	height: 64rpx;
-	width: 50rpx;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	position: relative;
-	z-index: 10;
-}
+	.sound-box {
+		height: 64rpx;
+		width: 50rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		z-index: 10;
+	}
 
-.notice-content-wrapper {
-	flex: 1;
-	flex-direction: row;
-	overflow: hidden;
-}
+	.notice-content-wrapper {
+		flex: 1;
+		flex-direction: row;
+		overflow: hidden;
+	}
 
-.notice-inner {
-	flex-direction: row;
-	align-items: center;
-}
+	.notice-inner {
+		flex-direction: row;
+		align-items: center;
+	}
 
-.notice-content {
-	font-size: 24rpx;
-	color: #767676;
-}
+	.notice-content {
+		font-size: 24rpx;
+		color: #767676;
+	}
 
-.group-box {
-	margin: 32rpx;
-	margin-bottom: 0;
-}
+	.group-box {
+		margin: 32rpx;
+		margin-bottom: 0;
+	}
 
-.title-img {
-	width: 140rpx;
-	height: 44rpx;
-}
+	.title-img {
+		width: 140rpx;
+		height: 44rpx;
+	}
 
-.video-help-box {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	background-color: #FFFFFF;
-	padding: 24rpx 0;
-	border-radius: 24rpx;
-	margin-top: 16rpx;
-	flex-wrap: wrap;
-	padding-top: 8rpx;
-}
+	.video-help-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #FFFFFF;
+		padding: 24rpx 0;
+		border-radius: 24rpx;
+		margin-top: 16rpx;
+		flex-wrap: wrap;
+		padding-top: 8rpx;
+	}
 
-.video-help-item {
-	margin-top: 16rpx;
-	width: 25%;
-	text-align: center;
-	flex-direction: column;
-	display: flex;
-	align-items: center;
-}
+	.video-help-item {
+		margin-top: 16rpx;
+		width: 25%;
+		text-align: center;
+		flex-direction: column;
+		display: flex;
+		align-items: center;
+	}
 
-.video-help-img {
-	width: 96rpx;
-	height: 96rpx;
-}
+	.video-help-img {
+		width: 96rpx;
+		height: 96rpx;
+	}
 
-.video-help-title {
-	font-size: 24rpx;
-	color: #1A1A1A;
-	text-align: center;
-}
+	.video-help-title {
+		font-size: 24rpx;
+		color: #1A1A1A;
+		text-align: center;
+	}
 
-.menu-box {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	flex-wrap: wrap;
-	margin-top: 16rpx;
-}
+	.menu-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		margin-top: 16rpx;
+	}
 
-.item-box {
-	position: relative;
-	height: 156rpx;
-	display: flex;
-	flex-direction: column;
-	justify-content: flex-end;
-	margin-bottom: 32rpx;
-}
+	.item-box {
+		position: relative;
+		height: 156rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: flex-end;
+		margin-bottom: 32rpx;
+	}
 
-.menu-item {
-	display: flex;
-	position: relative;
-	flex-direction: row;
-	align-items: center;
-	justify-content: space-between;
-	background-color: #FFFFFF;
-	border-radius: 16rpx;
-	padding: 16rpx 32rpx;
-	height: 140rpx;
-}
+	.menu-item {
+		display: flex;
+		position: relative;
+		flex-direction: row;
+		align-items: center;
+		justify-content: space-between;
+		background-color: #FFFFFF;
+		border-radius: 16rpx;
+		padding: 16rpx 32rpx;
+		height: 140rpx;
+	}
 
 
-.menu-item-name {
-	font-weight: bold;
-	font-size: 32rpx;
-	color: #000000;
-}
+	.menu-item-name {
+		font-weight: bold;
+		font-size: 32rpx;
+		color: #000000;
+	}
 
-.name-img {
-	height: 28rpx;
-}
+	.name-img {
+		height: 28rpx;
+	}
 
-.hot-icon {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 68rpx;
-	height: 30rpx;
-	z-index: 99;
-}
+	.hot-icon {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 68rpx;
+		height: 30rpx;
+		z-index: 99;
+	}
 
-.activity-box {
-	margin: 0 32rpx;
-}
+	.activity-box {
+		margin: 0 32rpx;
+	}
 
-.footer-box {
-	display: flex;
-	flex-direction: row;
-	align-items: center;
-	justify-content: center;
-	margin-top: 40rpx;
-	margin-bottom: 10rpx;
-}
+	.footer-box {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		margin-top: 40rpx;
+		margin-bottom: 10rpx;
+	}
 
-.vision-text {
-	font-size: 24rpx;
-	color: #767676;
-}
+	.vision-text {
+		font-size: 24rpx;
+		color: #767676;
+	}
 
-.ios-padding-bottom {
-	margin-bottom: 50rpx;
-}
+	.ios-padding-bottom {
+		margin-bottom: 50rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/other/tickets-app/index.vue b/pages/other/tickets-app/index.vue
index 8703e41..724bf85 100644
--- a/pages/other/tickets-app/index.vue
+++ b/pages/other/tickets-app/index.vue
@@ -1,93 +1,133 @@
 <template>
 	<view class="container">
-		<NavBar title="选择机票" bgColor="#F0F4F9" isBack></NavBar>
+		<NavBar :title="`选择${type == 'airTicket' ? '机票' : '火车票'}`" bgColor="#F0F4F9" isBack></NavBar>
 
 		<view class="content">
-			<view class="app-card" v-for="(item, index) in appList" :key="index" @click="handleItemClick(item)">
-				<!-- Background Watermark -->
-				<image class="watermark" :src="item.bgImage" mode="heightFix"></image>
+			<template v-for="(item, index) in appList" :key="index">
+				<view class="app-card"
+					v-if="(type == 'airTicket' && item.airPath) || (type == 'trainTicket' && item.trainPath)"
+					@click="handleItemClick(item)">
+					<!-- Background Watermark -->
+					<image class="watermark" :src="item.bgImage" mode="heightFix"></image>
 
-				<!-- Front Content -->
-				<view class="card-left">
-					<view class="logo-box">
-						<image class="logo" :src="item.logo" mode="aspectFit"></image>
-						<!-- Hot Tag for Fliggy -->
-						<view v-if="item.isHot" class="hot-tag">
-							<image style="width: 72rpx;height:32rpx" src="/static/image/index/hot-icon.png"
-								mode="aspectFit"></image>
+					<!-- Front Content -->
+					<view class="card-left">
+						<view class="logo-box">
+							<image class="logo" :src="item.logo" mode="aspectFit"></image>
+							<!-- Hot Tag for Fliggy -->
+							<view v-if="item.isHot" class="hot-tag">
+								<image style="width: 72rpx;height:32rpx" src="/static/image/index/hot-icon.png"
+									mode="aspectFit"></image>
+							</view>
 						</view>
+						<text class="app-name">{{ item.name }}</text>
 					</view>
-					<text class="app-name">{{ item.name }}</text>
-				</view>
 
-				<uni-icons type="right" size="18" color="#CCCCCC"></uni-icons>
-			</view>
+					<uni-icons type="right" size="18" color="#CCCCCC"></uni-icons>
+				</view>
+			</template>
 		</view>
 	</view>
 </template>
 
 <script setup>
 import NavBar from '@/components/nav-bar/nav-bar.vue';
-import { reactive, toRefs, getCurrentInstance } from 'vue';
-import { onLoad } from '@dcloudio/uni-app';
-import { util } from '@/utils/common.js'; // Assuming util exists for navigation, similar to previous tasks
+import {
+	reactive,
+	toRefs,
+	getCurrentInstance,
+	ref
+} from 'vue';
+import {
+	onLoad
+} from '@dcloudio/uni-app';
+import {
+	util
+} from '@/utils/common.js'; // Assuming util exists for navigation, similar to previous tasks
 const {
 	appContext,
 	proxy
 } = getCurrentInstance();
 
-const appList = [
-	{
-		name: '去哪儿APP',
-		logo: '/static/image/other/tickets-app/qvnar-logo.png',
-		bgImage: '/static/image/other/tickets-app/qvnar-bg.png',
-		path: '/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets',
-		isHot: false
-	},
-	{
-		name: '飞猪APP',
-		logo: '/static/image/other/tickets-app/fliggy-logo.png',
-		bgImage: '/static/image/other/tickets-app/fliggy-bg.png',
-		path: '/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets',
-		isHot: true
-	},
-	{
-		name: '携程APP',
-		logo: '/static/image/other/tickets-app/trip-com-logo.png',
-		bgImage: '/static/image/other/tickets-app/trip-com-bg.png',
-		path: '/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets',
-		isHot: false
-	},
-	// {
-	// 	name: '铁路12306',
-	// 	logo: '/static/image/other/tickets-app/12306-logo.png',
-	// 	bgImage: '/static/image/other/tickets-app/12306-bg.png',
-	// 	path: '/pages/other/train-tickets/12306-tickets/12306-tickets',
-	// 	isHot: false
-	// }
+let type = ref('airTicket')
+
+const appList = [{
+	name: '去哪儿APP',
+	logo: '/static/image/other/tickets-app/qvnar-logo.png',
+	bgImage: '/static/image/other/tickets-app/qvnar-bg.png',
+	airPath: '/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets',
+	trainPath: "",
+	isHot: false
+},
+{
+	name: '飞猪APP',
+	logo: '/static/image/other/tickets-app/fliggy-logo.png',
+	bgImage: '/static/image/other/tickets-app/fliggy-bg.png',
+	airPath: '/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets',
+	trainPath: "",
+	isHot: true
+},
+{
+	name: '携程APP',
+	logo: '/static/image/other/tickets-app/trip-com-logo.png',
+	bgImage: '/static/image/other/tickets-app/trip-com-bg.png',
+	airPath: '/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets',
+	trainPath: "/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets",
+	isHot: false
+},
+{
+	name: '铁路12306',
+	logo: '/static/image/other/tickets-app/12306-logo.png',
+	bgImage: '/static/image/other/tickets-app/12306-bg.png',
+	airPath: '',
+	trainPath: "/pages/other/train-tickets/12306-tickets/12306-tickets",
+	isHot: false
+}
 ]
 
 onLoad((option) => {
-	// 进入机票页面埋点
-	proxy.$apiUserEvent('all', {
-		type: 'event',
-		key: 'ticket',
-		prefix: '.uni.other.',
-		value: "机票"
-	})
-})
-
-const handleItemClick = (item) => {
-	if (item.path) {
-		util.goPage(item.path)
+	const appType = option.type
+	if (appType == "trainTicket") {
+		type.value = "trainTicket"
 	} else {
-		uni.showToast({
-			title: '开发中',
-			icon: 'none'
+		type.value = "airTicket"
+		// 进入机票页面埋点
+		proxy.$apiUserEvent('all', {
+			type: 'event',
+			key: 'ticket',
+			prefix: '.uni.other.',
+			value: "机票"
 		})
 	}
-}
 
+})
+
+
+/**
+ * 跳转火车票/飞机票页面
+ */
+const handleItemClick = (item) => {
+	if (type.value == 'trainTicket') {
+		if (item.trainPath) {
+			util.goPage(item.trainPath)
+		} else {
+			uni.showToast({
+				title: '开发中',
+				icon: 'none'
+			})
+		}
+	} else {
+		if (item.airPath) {
+			util.goPage(item.airPath)
+		} else {
+			uni.showToast({
+				title: '开发中',
+				icon: 'none'
+			})
+		}
+	}
+
+}
 </script>
 <style lang="less" scoped>
 .container {
diff --git a/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue b/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue
new file mode 100644
index 0000000..5146f77
--- /dev/null
+++ b/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue
@@ -0,0 +1,1210 @@
+<template>
+	<!-- 水印 -->
+	<view v-if="$isVip()">
+		<watermark dark="light" />
+		<liu-drag-button :canDocking="false" @clickBtn="$goRechargePage('watermark')">
+			<c-lottie ref="cLottieRef" :src='$watermark()' width="94px" height='74px' :loop="true"></c-lottie>
+		</liu-drag-button>
+	</view>
+	<view class="top-box">
+		<NavBar title="订单详情" :bgColor="data.navBar.bgColor" :buttonGroup="buttonGroup"
+			@button-click="util.clickTitlePopupButton" tipLayerType="ctrip-train-tickets-tip" isTipLayer
+			tipLayerText="修改车票信息">
+			<template v-if="$system == 'iOS'" v-slot:statusBar>
+				<view class="status-bar">
+					<image class="top-logo" style="width: 160rpx"
+						src="/static/image/other/train-tickets/ctrip/top-logo.png" mode="widthFix">
+					</image>
+				</view>
+			</template>
+			<template v-slot:center>
+				<view class="codefun-flex-row">
+					<text class="text">订单</text>
+					<text class="text_2 ml-15">行程服务</text>
+				</view>
+			</template>
+			<template v-slot:right>
+				<view class="codefun-flex-col pos_2">
+					<view class="codefun-flex-row">
+						<view class="codefun-flex-col codefun-items-center">
+							<image class="image_5" src="/static/image/other/train-tickets/ctrip/customer-sevice.png" />
+							<text class="font text_3">客服</text>
+						</view>
+						<view class="codefun-flex-col codefun-items-center"
+							style="margin-left: 16rpx;margin-right: 10px;">
+							<image class="image_5"
+								src="/static/image/other/train-tickets/ctrip/refund-instructions.png" />
+							<text class="font text_3">退改说明</text>
+						</view>
+					</view>
+				</view>
+			</template>
+		</NavBar>
+		<view class="codefun-flex-col section">
+			<view class="codefun-flex-col">
+
+				<view class="codefun-flex-row codefun-justify-between codefun-items-start group_4">
+					<view class="codefun-flex-row group_5">
+						<image class="image_8" src="/static/image/other/train-tickets/ctrip/success.png" />
+						<view class="codefun-flex-col codefun-items-start group_33 codefun-ml-10">
+							<text class="text_5">抢票成功</text>
+							<text class="font_2 text_6 codefun-mt-8">携程祝您出行愉快</text>
+						</view>
+					</view>
+					<image class="image_7" src="/static/image/other/train-tickets/ctrip/buy-return-trip.png" />
+				</view>
+				<view class="codefun-flex-row codefun-justify-between codefun-items-center section_2 mt-15">
+					<view class="codefun-flex-row codefun-items-center">
+						<image class="image_9" src="/static/image/other/train-tickets/ctrip/free-order.png" />
+						<text class="font_2 text_7 codefun-ml-4">做任务抽大奖</text>
+					</view>
+					<image class="image_10" src="/static/image/other/train-tickets/ctrip/right.png" />
+				</view>
+			</view>
+		</view>
+	</view>
+	<view class="main-container">
+		<view class="codefun-flex-col codefun-justify-start section_3">
+			<view class="codefun-flex-row codefun-justify-between codefun-items-center section_4">
+				<text class="text_8">注意确认行程信息</text>
+				<view class="codefun-flex-col">
+					<view class="codefun-flex-row group_6">
+						<view class="item-box codefun-flex-col codefun-items-center">
+							<image class="image_6" src="/static/image/other/train-tickets/ctrip/zaixianhuanzuo.png" />
+							<text class="font_3 text_9 mt-5">在线换座</text>
+						</view>
+						<view class="item-box codefun-flex-col codefun-items-center">
+							<image class="image_6 ml-11"
+								src="/static/image/other/train-tickets/ctrip/dingdantongzhi.png" />
+							<text class="font_3 text_10 ml-11 mt-5">订单通知</text>
+						</view>
+						<view class="item-box codefun-flex-col codefun-items-center">
+							<image class="image_6 ml-11"
+								src="/static/image/other/train-tickets/ctrip/fenxiangxingcheng.png" />
+							<text class="font_3 text_11 ml-11 mt-5">分享行程</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="codefun-flex-col section_5">
+			<view class="codefun-flex-col group_8">
+				<view class="codefun-flex-row codefun-justify-between" style="width: 100%;">
+					<text class="font_6 text_12">取票号：{{ ticketsInfo.orderInfo.orderNo }}</text>
+					<text class="font_5 text_13">{{ ticketsInfo.ticketInfo.gate }}</text>
+				</view>
+				<view class="codefun-flex-row codefun-justify-between codefun-self-stretch group_9">
+					<view class="codefun-flex-col">
+						<text class="font_1 text_14">{{ formatDateTime(ticketsInfo.ticketInfo.departureTime,
+							ticketsInfo.ticketInfo.date) }}</text>
+					</view>
+					<text class="font_1 text_15">{{ ticketsInfo.ticketInfo.duration }}</text>
+					<text class="font_1 text_16">{{ formatDateTime(ticketsInfo.ticketInfo.arrivalTime,
+						ticketsInfo.ticketInfo.date) }}</text>
+				</view>
+				<view
+					class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch group_10">
+					<text class="font_7" @click="goEdit">{{ ticketsInfo.ticketInfo.departureTime.split(' ')[1] }}</text>
+					<image class="image_11" src="/static//image/other/train-tickets/ctrip/jingtingxinxi.png" />
+					<text class="font_7" @click="goEdit">{{ ticketsInfo.ticketInfo.arrivalTime.split(' ')[1] }}</text>
+				</view>
+				<view
+					class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch group_11">
+					<view class="codefun-flex-row codefun-items-center">
+						<text class="font_8 text_18">{{ ticketsInfo.ticketInfo.departureStation }}</text>
+						<image class="image_13 codefun-ml-4"
+							src="/static//image/other/train-tickets/ctrip/location.png" />
+					</view>
+					<view class="codefun-flex-row codefun-items-center">
+						<text class="font_9 text_19">{{ ticketsInfo.ticketInfo.trainNo }}</text>
+						<view class="codefun-flex-row codefun-items-center train-name">
+							<text class="font_6">{{ ticketsInfo.ticketInfo.trainName }}</text>
+							<uni-icons type="right" size="10" color="#767676"></uni-icons>
+						</view>
+					</view>
+					<view class="codefun-flex-row codefun-items-center">
+						<image class="image_13" src="/static//image/other/train-tickets/ctrip/location.png" />
+						<text class="font_8 text_20 codefun-ml-2">{{ ticketsInfo.ticketInfo.arrivalStation }}</text>
+					</view>
+				</view>
+			</view>
+			<view class="codefun-flex-col list">
+				<view class="codefun-flex-col codefun-justify-start list-item codefun-mt-8"
+					v-for="item in ticketsInfo.passengerList" :key="item.id">
+					<view class="codefun-flex-col group_13" @click="goEdit">
+						<view
+							class="codefun-flex-col codefun-justify-start codefun-items-start codefun-relative group_16">
+
+							<view class="codefun-flex-col codefun-items-start group_15 pos_4">
+								<view class="codefun-flex-col group_12">
+									<view class="codefun-flex-row codefun-justify-between codefun-items-center">
+										<view class="codefun-flex-row codefun-items-center">
+											<text class="font_10 text_21">{{ item.name }}</text>
+											<view class="codefun-flex-row codefun-items-center section_1 codefun-ml-4">
+												<text class="font_11">{{ item.type }}</text>
+												<uni-icons type="right" size="10" color="#767676"></uni-icons>
+											</view>
+										</view>
+										<view class="codefun-flex-row codefun-items-center">
+											<view
+												class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper">
+												<text class="font_6 text_22" v-if="computeSeatNo(item.seatNo)">{{
+													computeSeatNo(item.seatNo) }}</text>
+											</view>
+											<text class="font_12">{{ item.carriage }}车厢{{ item.seatNo }}号</text>
+										</view>
+									</view>
+									<view class="codefun-flex-row codefun-justify-between codefun-mt-8">
+										<view class="codefun-flex-row codefun-items-center">
+											<image class="image_15"
+												src="/static/image/other/train-tickets/ctrip/jifen.png" />
+											<view class="group_17">
+												<text class="font_13">铁路会员积分+{{ item.points }}(价值</text>
+												<text class="font_14 text_24">¥{{ (item.points *
+													0.01).toFixed(2) }}</text>
+												<text class="font_13 text_24 text_25">)</text>
+											</view>
+											<image class="image_16"
+												src="/static/image/other/train-tickets/ctrip/help.png" />
+										</view>
+										<view class="codefun-flex-row codefun-items-center">
+
+											<text class="font_15 text_26">{{ item.seatType }}¥{{ item.price }}</text>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="codefun-flex-row codefun-justify-between codefun-items-center">
+							<text class="success-text">购票成功</text>
+							<view class="codefun-flex-row codefun-justify-end  group_18">
+								<view
+									class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_2">
+									<text class="font_16 text_28">改签</text>
+								</view>
+								<view
+									class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_3 ml-7">
+									<text class="font_16 text_29">退票</text>
+								</view>
+								<view v-if="item.isMe"
+									class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_1 ml-7">
+									<text class="font_17 text_30">扫码检票</text>
+								</view>
+							</view>
+						</view>
+
+					</view>
+				</view>
+			</view>
+
+		</view>
+
+		<view class="codefun-flex-row codefun-justify-between group_20">
+			<view class="section_6"></view>
+			<view class="section_6"></view>
+		</view>
+		<view class="codefun-flex-col section_7">
+			<view class="codefun-flex-row codefun-items-center group_21">
+				<view class="codefun-flex-col codefun-flex-1">
+					<view class="codefun-flex-row codefun-items-center">
+						<view class="codefun-flex-row codefun-items-center group_22">
+							<image class="image_17" src="/static/image/other/train-tickets/ctrip/huodong.png" />
+
+							<view
+								class="codefun-flex-row codefun-justify-start codefun-items-center codefun-relative group_23 ml-5">
+								<text class="font_18 ml-5">恭喜获得</text>
+								<text class="font_9 text_33">¥{{ ticketsInfo.hotelInfo.cashback }}</text>
+								<text class="font_18 pos_6">返现机会</text>
+							</view>
+						</view>
+						<image class="image_13 image_18" src="/static/image/other/train-tickets/ctrip/help.png" />
+					</view>
+					<text class="font_19 text_36 mt-7">本单可返现¥{{ ticketsInfo.hotelInfo.cashback }}，需在{{
+						formatMMDD(ticketsInfo.hotelInfo.startDay)
+					}}前预订酒店，并在{{
+							formatMMDD(ticketsInfo.hotelInfo.endDay) }}前离店</text>
+				</view>
+				<view class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_4 codefun-ml-20">
+					<text class="font_5 text_35">去完成</text>
+				</view>
+			</view>
+			<view class="codefun-flex-row codefun-mt-6">
+				<view v-for="(item, index) in data.guideList" :key="index"
+					class="codefun-flex-col codefun-items-center group_24 group_26">
+					<image class="image_19" :src="item.icon" />
+					<text class="font_19 mt-7" :class="item.textClass">{{ item.name }}</text>
+				</view>
+			</view>
+		</view>
+		<view class="codefun-flex-row codefun-justify-between codefun-items-center section_8 codefun-mt-8">
+			<view class="codefun-flex-row codefun-items-baseline">
+				<text class="font_20 text_37">支付总额</text>
+				<view class="group_25 ml-5">
+					<text class="font_20 text_39">¥</text>
+					<text class="text_38">{{ ticketsInfo.orderInfo.price }}</text>
+				</view>
+			</view>
+			<view class="codefun-flex-row codefun-items-center group_32">
+				<text class="font_21 text_40">查看明细</text>
+				<uni-icons class="ml-5" type="down" size="12" color="#767676"></uni-icons>
+			</view>
+		</view>
+
+		<view class="codefun-flex-col section_9 codefun-mt-8">
+			<view class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch">
+				<text class="font_20 text_41">常见问题</text>
+				<view class="codefun-flex-row codefun-items-center">
+					<text class="font_21 text_42">其他问题</text>
+					<uni-icons class="ml-5" type="right" size="12" color="#767676"></uni-icons>
+				</view>
+			</view>
+			<view class="codefun-flex-row codefun-self-stretch codefun-mt-10">
+				<view class="codefun-flex-col codefun-justify-start text-wrapper_5">
+					<text class="font_22 text_43">改签如何指定车厢/座席</text>
+				</view>
+				<view class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_6 codefun-ml-8">
+					<text class="font_22 text_44">如何退票</text>
+				</view>
+			</view>
+			<view class="codefun-flex-col codefun-justify-start codefun-self-start text-wrapper_7 codefun-mt-10">
+				<text class="font_22 text_45">是否可以刷身份证进站乘车，需要取票吗</text>
+			</view>
+		</view>
+	</view>
+
+
+
+</template>
+
+<script setup>
+import NavBar from '@/components/nav-bar/nav-bar.vue';
+import { reactive, ref, computed, toRefs } from 'vue';
+import { onShow, onPageScroll } from '@dcloudio/uni-app';
+import { util } from '@/utils/common.js';
+
+const buttonGroup = [{
+	name: "编辑车票信息",
+	click: () => {
+		goEdit()
+	}
+}]
+
+function goEdit() {
+	util.goPage(`/pages/other/train-tickets/edit/edit?app=ctrip&storageKey=${data.STORAGE_KEY}`)
+}
+
+const data = reactive({
+	navBar: {
+		bgColor: 'transparent'
+	},
+	guideList: [
+		{ name: '游玩指南', icon: '/static/image/other/train-tickets/ctrip/youwanzhinan.png' },
+		{ name: '儿童申报', icon: '/static/image/other/train-tickets/ctrip/ertongshenbao.png' },
+		{ name: '发票报销', icon: '/static/image/other/train-tickets/ctrip/fapiaobaoxiao.png' },
+		{ name: '进站指引', icon: '/static/image/other/train-tickets/ctrip/jinzhanzhiyin.png' },
+		{ name: '展开全部', icon: '/static/image/other/train-tickets/ctrip/quanbuzhankai.png' }
+	],
+	STORAGE_KEY: 'ctripTrainTicketsInfo',
+	ticketsInfo: {
+		"orderInfo": {
+			"orderNo": "EJ66223536",
+			"price": "4440"
+		},
+		"ticketInfo": {
+			"departureTime": "01-01 09:19",
+			"departureStation": "北京南",
+			"arrivalTime": "01-01 14:04",
+			"arrivalStation": "上海虹桥",
+			"trainNo": "G905",
+			"duration": "4时45分",
+			"date": "2026.01.01",
+			"weekDay": "星期四",
+			"gate": "6A、7A进站检票口,6B、7B进站检票",
+			"trainName": "复兴号"
+		},
+		"passengerList": [
+			{
+				"name": "张元英",
+				"type": "成人票",
+				"seatType": "商务座",
+				"carriage": "01",
+				"seatNo": "03C",
+				"idType": "外国护照（KR）",
+				"price": "2110",
+				"status": "已支付",
+				"isMe": true,
+				"points": 9632
+			}
+		],
+		"hotelInfo": {
+			"cashback": "25",
+			"startDay": "01-01",
+			"endDay": "01-02"
+		}
+	},
+})
+
+let { ticketsInfo } = toRefs(data)
+
+onPageScroll((e) => {
+	if (e.scrollTop > 40) {
+		data.navBar.bgColor = '#BEDDFE'
+	} else {
+		data.navBar.bgColor = 'transparent'
+	}
+})
+
+onShow(() => {
+	const stored = uni.getStorageSync(data.STORAGE_KEY)
+	if (stored) {
+		Object.assign(data.ticketsInfo, stored)
+	}
+})
+
+const computeSeatNo = (seatNo) => {
+	if (seatNo.includes('C') || seatNo.includes('F')) {
+		return '靠窗';
+	} else if (seatNo.includes('A') || seatNo.includes('D')) {
+		return '过道';
+	}
+	return '';
+}
+
+const formatDateTime = (timeStr, dateStr) => {
+	if (!timeStr) return '';
+	const parts = timeStr.split(' ');
+	const md = parts[0];
+	if (!md) return '';
+	const mdParts = md.split('-');
+	let year, month, day;
+
+	if (mdParts.length === 3) {
+		year = mdParts[0];
+		month = mdParts[1];
+		day = mdParts[2];
+	} else if (mdParts.length === 2) {
+		month = mdParts[0];
+		day = mdParts[1];
+		year = new Date().getFullYear();
+		if (dateStr) {
+			year = dateStr.split('.')[0];
+		}
+	} else {
+		return '';
+	}
+
+	const dateObj = new Date(Number(year), Number(month) - 1, Number(day));
+	const weekDays = ['周日', '周一', '周二', '周三', '周四', '周五', '周六'];
+	const week = isNaN(dateObj.getTime()) ? '' : weekDays[dateObj.getDay()];
+
+	return `${month}月${day}日 ${week}`;
+}
+
+const formatMMDD = (mdStr) => {
+	if (!mdStr) return '';
+	const [month, day] = mdStr.split('-');
+	return month && day ? `${month}月${day}日` : '';
+}
+
+</script>
+
+<style>
+@import '/common/global.css';
+</style>
+<style lang="less">
+.ml-15 {
+	margin-left: 15px;
+}
+
+.mt-3 {
+	margin-top: 3px;
+}
+
+.mt-15 {
+	margin-top: 15px;
+}
+
+.mt-5 {
+	margin-top: 5px;
+}
+
+.ml-7 {
+	margin-left: 7px;
+}
+
+.ml-5 {
+	margin-left: 5px;
+}
+
+.ml-11 {
+	margin-left: 11px;
+}
+
+.ml-65 {
+	margin-left: 65px;
+}
+
+.ml-67 {
+	margin-left: 67px;
+}
+
+.ml-7 {
+	margin-left: 7px;
+}
+
+.train-name {
+	margin-left: 4rpx;
+	border: 1rpx solid #F5F5F5;
+	height: 32rpx;
+	border-radius: 8rpx;
+	padding-left: 4rpx;
+}
+
+.top-box {
+	background-image: url('/static/image/other/train-tickets/ctrip/ctrip-train-bg.png');
+	background-size: 100% 100%;
+	background-repeat: no-repeat;
+
+	.status-bar {
+		width: 100%;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		padding-top: 16rpx;
+		padding-bottom: 32rpx;
+	}
+
+	.text {
+		color: #0b2c5c;
+		font-size: 18px;
+		font-weight: 700;
+		line-height: 16.5px;
+	}
+
+	.text_2 {
+		color: #0b2c5c;
+		font-size: 18px;
+		line-height: 16.5px;
+		opacity: 0.5;
+	}
+
+	.pos_2 {
+		position: absolute;
+		right: 2.5px;
+		top: 50%;
+		transform: translateY(-50%);
+
+		.image_5 {
+			width: 20px;
+			height: 20px;
+		}
+
+		.font {
+			font-size: 11px;
+			line-height: 10px;
+			color: #1a1a1a;
+		}
+
+		.text_3 {
+			font-size: 10px;
+			line-height: 9.5px;
+		}
+
+	}
+
+	.section {
+		padding: 8px;
+		background-image: url('assets/fff2fdc35a03732c79c39077e0ac181b.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+
+		.group_2 {
+			padding: 0 6.5px;
+
+			.image {
+				width: 80px;
+				height: 20px;
+			}
+
+			.pos {
+				position: absolute;
+				right: 6.5px;
+				bottom: 3.552713678800501e-15px;
+
+				.image_2 {
+					width: 17px;
+					height: 11px;
+				}
+
+				.image_3 {
+					width: 15px;
+					height: 11px;
+				}
+
+				.image_4 {
+					width: 24px;
+					height: 11.5px;
+				}
+			}
+		}
+
+		.group_3 {
+			padding: 10.5px 0 5px;
+
+			.image_6 {
+				width: 22px;
+				height: 22px;
+			}
+
+			.pos_3 {
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+
+			.text {
+				color: #0b2c5c;
+				font-size: 18px;
+				font-weight: 700;
+				line-height: 16.5px;
+			}
+
+			.text_2 {
+				color: #0b2c5c;
+				font-size: 18px;
+				line-height: 16.5px;
+				opacity: 0.5;
+			}
+
+
+		}
+
+		.group_4 {
+			padding: 0 11px;
+
+			.group_5 {
+				margin-top: 5px;
+
+				.image_8 {
+					margin-bottom: 3px;
+					width: 36px;
+					height: 36px;
+				}
+
+				.group_33 {
+					margin-top: 2px;
+
+					.text_5 {
+						color: #0b2c5c;
+						font-size: 20px;
+						font-weight: 700;
+						line-height: 18.5px;
+					}
+
+					.text_6 {
+						font-size: 12px;
+						line-height: 11px;
+					}
+				}
+			}
+
+			.image_7 {
+				width: 70px;
+				height: 29px;
+			}
+		}
+
+		.font_2 {
+			font-size: 11px;
+			line-height: 12px;
+			color: #0b2c5c;
+		}
+	}
+
+	.section_2 {
+		padding: 8px 14px;
+		background-color: #B6D3FA;
+		// background-color: #006eec;
+		border-radius: 10px;
+
+		.image_9 {
+			width: 70px;
+			height: 20px;
+		}
+
+		.image_10 {
+			margin-right: 4px;
+			border-radius: 8px;
+			width: 22px;
+			height: 22px;
+		}
+	}
+
+}
+
+
+.main-container {
+
+	.section_3 {
+		padding-bottom: 86px;
+		background: linear-gradient(360deg, rgba(203, 228, 255, 0) 0%, #BEDDFE 100%);
+
+		.section_4 {
+			margin: 0 8px;
+			padding: 12px 15px 32px 14px;
+			background-image: url('/static/image/other/train-tickets/ctrip/card-bg.png');
+			background-size: 100% 100%;
+			background-repeat: no-repeat;
+
+			.text_8 {
+				color: #ffffff;
+				font-size: 16px;
+				font-weight: 500;
+				line-height: 15px;
+			}
+
+			.group_6 {
+				padding-left: 12.5px;
+
+				.image_6 {
+					width: 22px;
+					height: 22px;
+				}
+			}
+
+			.font_3 {
+				font-size: 11px;
+				line-height: 10px;
+				color: #ffffff;
+			}
+
+		}
+	}
+
+	.section_5 {
+		padding: 15px 8px 0;
+		background-color: #ffffff;
+		border-radius: 10px;
+		margin: 0 8px;
+		margin-top: -102px;
+		position: relative;
+
+		.group_8 {
+			margin: 0 7px;
+			padding-top: 1.5px;
+			overflow: hidden;
+
+			.text_12 {
+				line-height: 9.5px;
+			}
+
+			.text_13 {
+				line-height: 11px;
+			}
+
+			.group_9 {
+				margin-top: 17px;
+
+				.font_1 {
+					font-size: 11px;
+					line-height: 12px;
+					color: #767676;
+				}
+
+				.text_14 {
+					line-height: 12px;
+				}
+
+				.text_16 {
+					line-height: 12px;
+					text-align: right;
+				}
+			}
+
+			.group_10 {
+				margin-top: 4.5px;
+				padding-left: 2.5px;
+
+				.font_7 {
+					font-size: 24px;
+					line-height: 17.5px;
+					font-weight: 500;
+					color: #1a1a1a;
+				}
+
+				.image_11 {
+					width: 117px;
+					height: 22px;
+				}
+			}
+
+			.group_11 {
+				margin-right: 1px;
+				margin-top: 4px;
+
+				.font_8 {
+					font-size: 13px;
+					line-height: 12px;
+					color: #1a1a1a;
+				}
+
+				.image_13 {
+					width: 13px;
+					height: 13px;
+				}
+
+				.font_9 {
+					font-size: 14px;
+					line-height: 10px;
+				}
+
+				.text_19 {
+					color: #1a1a1a;
+					line-height: 10px;
+				}
+
+				.image_12 {
+					width: 42px;
+					height: 16px;
+				}
+
+			}
+		}
+
+		.list {
+			padding: 13px 0 8px;
+
+			.list-item {
+				padding: 12px 0 10px;
+				background-color: #f5f7fb;
+				border-radius: 6px;
+
+				&:first-child {
+					margin-top: 0;
+				}
+
+				.group_13 {
+					margin: 0 10px;
+					overflow: hidden;
+					height: 78px;
+
+					.group_16 {
+
+						.group_17 {
+							margin-left: 6rpx;
+							margin-right: 4rpx;
+							line-height: 12px;
+
+							.font_13 {
+								font-size: 11px;
+								line-height: 12px;
+								color: #3d3d3d;
+							}
+
+							.font_14 {
+								font-size: 11px;
+								line-height: 8px;
+								color: #3d3d3d;
+							}
+
+							.text_24 {
+								word-break: break-all;
+							}
+
+							.text_25 {
+								line-height: 11.5px;
+							}
+						}
+
+						.group_15 {
+							overflow: hidden;
+							height: 50px;
+							width: 100%;
+
+							.group_12 {
+								width: 100%;
+
+								.font_10 {
+									font-size: 14px;
+									line-height: 12px;
+									font-weight: 500;
+									color: #363636;
+								}
+
+								.text_21 {
+									line-height: 13px;
+								}
+
+								.section_1 {
+									padding-bottom: 2px;
+									border-radius: 2px;
+									height: 16px;
+									border: solid 0.5px #e6e8ec;
+
+									.font_11 {
+										font-size: 9px;
+										line-height: 16px;
+										color: #767676;
+									}
+
+									.image_14 {
+										width: 8px;
+										height: 8px;
+									}
+								}
+
+								.text-wrapper {
+									padding: 3px 0 3px;
+									border-radius: 3px;
+									width: 28px;
+									height: 16px;
+									border: solid 0.5px #e5e7eb;
+
+								}
+
+								.font_12 {
+									font-size: 14px;
+									line-height: 13px;
+									font-weight: 500;
+									margin-left: 8rpx;
+									color: #363636;
+								}
+
+								.image_15 {
+									width: 12px;
+									height: 12px;
+								}
+
+								.image_16 {
+									width: 11px;
+									height: 11px;
+								}
+
+								.font_15 {
+									font-size: 11px;
+									line-height: 12px;
+									color: #363636;
+								}
+
+							}
+
+						}
+					}
+
+					.success-text {
+						font-size: 24rpx;
+						color: #00A56D;
+						font-weight: 500;
+					}
+
+					.group_18 {
+						.text-wrapper_2 {
+							background-color: #ffffff;
+							border-radius: 6px;
+							width: 45px;
+							height: 28px;
+							border: solid 0.5px #e0e4e3;
+
+						}
+
+						.text-wrapper_3 {
+							background-color: #ffffff;
+							border-radius: 6px;
+							width: 45px;
+							height: 28px;
+							border: solid 0.5px #e0e4e3;
+
+						}
+
+						.font_16 {
+							font-size: 13px;
+							line-height: 28px;
+							font-weight: 500;
+							color: #363636;
+						}
+
+						.text-wrapper_1 {
+							background-color: #ffffff;
+							border-radius: 6px;
+							width: 70px;
+							height: 28px;
+							border: solid 0.5px #e0e4e3;
+
+							.font_17 {
+								font-size: 13px;
+								line-height: 12px;
+								font-weight: 500;
+								line-height: 28px;
+								color: #0f6de5;
+							}
+
+						}
+					}
+				}
+			}
+		}
+
+		.font_6 {
+			font-size: 11px;
+			line-height: 10px;
+			color: #767676;
+		}
+
+		.font_5 {
+			font-size: 11px;
+			line-height: 12px;
+			font-weight: 500;
+			color: #00a56d;
+		}
+
+
+	}
+
+	.group_20 {
+		padding: 0 58rpx;
+
+		.section_6 {
+			background-color: #ffffff;
+			width: 8px;
+			height: 12px;
+		}
+	}
+
+	.mt-7 {
+		margin-top: 7px;
+	}
+
+	.ml-5 {
+		margin-left: 5px;
+	}
+
+	.section_7 {
+		padding-bottom: 7.5px;
+		background-color: #ffffff;
+		border-radius: 10px;
+		margin: 0 8px;
+
+		.group_21 {
+			padding: 13px 14px 11px;
+			border-bottom: solid 0.5px #ececec;
+
+			.group_22 {
+				.image_17 {
+					width: 55px;
+					height: 18px;
+				}
+
+				.font_18 {
+					font-size: 14px;
+					line-height: 10px;
+					color: #1a1a1a;
+				}
+
+
+
+				.text_32 {
+					margin-bottom: 2.5px;
+				}
+
+				.group_23 {
+					padding-top: 1.5px;
+
+					.font_9 {
+						font-size: 14px;
+						line-height: 10px;
+					}
+
+					.text_33 {
+						color: #f58219;
+					}
+				}
+			}
+
+			.image_18 {
+				margin-left: 12rpx;
+			}
+
+			.image_13 {
+				width: 13px;
+				height: 13px;
+			}
+
+
+			.text_36 {
+				font-size: 12px;
+				line-height: 16px;
+			}
+
+			.text-wrapper_4 {
+				margin-right: 2px;
+				padding: 8px 0 7.5px;
+				background-image: linear-gradient(112.2deg, #ff8801 -54.9%, #fe6900 129%);
+				width: 59px;
+				height: 27px;
+
+				.font_5 {
+					font-size: 11px;
+					line-height: 12px;
+					font-weight: 700;
+					color: #00a56d;
+				}
+
+				.text_35 {
+					color: #ffffff;
+					font-size: 12px;
+					line-height: 11px;
+				}
+			}
+		}
+
+		.group_24 {
+			flex: 1 1 72px;
+
+			.image_19 {
+				width: 24px;
+				height: 24px;
+			}
+
+			.text_49 {
+				line-height: 10.5px;
+			}
+
+			.text_1 {
+				line-height: 10px;
+			}
+
+		}
+
+		.group_26 {
+			padding: 4px 0 5px;
+		}
+
+		.font_19 {
+			font-size: 11px;
+			line-height: 10px;
+			color: #696969;
+		}
+
+	}
+
+	.section_8 {
+		padding: 13px 11.5px 12.5px;
+		background-color: #ffffff;
+		border-radius: 10px;
+		margin-left: 8px;
+		margin-right: 8px;
+
+		.font_20 {
+			font-size: 14px;
+			font-weight: 500;
+			color: #1a1a1a;
+		}
+
+		.text_37 {
+			font-size: 15px;
+			line-height: 14px;
+		}
+
+		.group_25 {
+			line-height: 13px;
+			height: 13px;
+
+			.text_39 {
+				color: #006eec;
+				font-size: 15px;
+				line-height: 10.5px;
+			}
+
+			.text_38 {
+				color: #006eec;
+				font-size: 18px;
+				font-weight: 500;
+				line-height: 13px;
+			}
+		}
+
+		.group_32 {
+			margin-right: 1.5px;
+
+			.font_21 {
+				font-size: 11px;
+				line-height: 10px;
+				color: #4e4e4e;
+			}
+
+			.image_20 {
+				width: 10px;
+				height: 10px;
+			}
+		}
+	}
+
+	.section_9 {
+		padding: 11.5px 12px 8px;
+		background-color: #ffffff;
+		border-radius: 10px;
+		margin-left: 8px;
+		margin-right: 8px;
+		margin-bottom: 24rpx;
+
+		.font_20 {
+			font-size: 14px;
+			font-weight: 500;
+			color: #1a1a1a;
+		}
+
+		.font_21 {
+			font-size: 11px;
+			line-height: 10px;
+			color: #4e4e4e;
+		}
+
+		.image_20 {
+			width: 10px;
+			height: 10px;
+		}
+
+		.text-wrapper_5 {
+			padding: 9.5px 0 8.5px;
+			background-color: #f5f7f9;
+			border-radius: 6px;
+			height: 28px;
+
+			.text_43 {
+				margin-left: 9.5px;
+				margin-right: 11.5px;
+				line-height: 10px;
+			}
+		}
+
+		.text-wrapper_6 {
+			padding: 9.5px 0 8.5px;
+			background-color: #f5f7f9;
+			border-radius: 6px;
+			width: 66px;
+			height: 28px;
+
+		}
+
+		.font_22 {
+			font-size: 11px;
+			line-height: 10px;
+			color: #3d3d3d;
+		}
+
+		.text-wrapper_7 {
+			padding: 9.5px 0 8px;
+			background-color: #f5f7f9;
+			border-radius: 6px;
+
+			.text_45 {
+				margin-left: 9.5px;
+				margin-right: 9.5px;
+				line-height: 10.5px;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/other/train-tickets/edit/edit.vue b/pages/other/train-tickets/edit/edit.vue
index 7e36b3b..f16d352 100644
--- a/pages/other/train-tickets/edit/edit.vue
+++ b/pages/other/train-tickets/edit/edit.vue
@@ -14,13 +14,17 @@
 						<text class="label">订单号</text>
 						<input class="input" v-model="ticketsInfo.orderInfo.orderNo" />
 					</view>
-					<picker mode="date" fields="day" :value="getPickerDate(ticketsInfo.orderInfo.orderTime)"
-						@change="onOrderTimeChange">
+					<picker v-if="app == '12306'" mode="date" fields="day"
+						:value="getPickerDate(ticketsInfo.orderInfo.orderTime)" @change="onOrderTimeChange">
 						<view class="form-item">
 							<text class="label">下单时间</text>
 							<view class="input">{{ ticketsInfo.orderInfo.orderTime }}</view>
 						</view>
 					</picker>
+					<view v-if="app == 'ctrip'" class="form-item">
+						<text class="label">订单总价</text>
+						<input class="input" type="number" v-model="ticketsInfo.orderInfo.price" />
+					</view>
 				</view>
 			</view>
 
@@ -75,6 +79,10 @@
 						<text class="label">历时</text>
 						<input class="input" v-model="ticketsInfo.ticketInfo.duration" />
 					</view>
+					<view v-if="app == 'ctrip'" class="form-item">
+						<text class="label">火车名称</text>
+						<input class="input" v-model="ticketsInfo.ticketInfo.trainName" />
+					</view>
 				</view>
 			</view>
 
@@ -116,7 +124,11 @@
 
 						<view class="form-item">
 							<text class="label">票价</text>
-							<input class="input" v-model="passenger.price" />
+							<input class="input" type="number" v-model="passenger.price" @input="onPriceInput" />
+						</view>
+						<view class="form-item">
+							<text class="label">积分</text>
+							<input class="input" type="number" v-model="passenger.points" />
 						</view>
 						<view class="form-item">
 							<text class="label">证件类型</text>
@@ -136,16 +148,20 @@
 			</view>
 
 			<!-- 酒店广告 -->
-			<view class="section-container">
+			<view v-if="app == '12306' || app == 'ctrip'" class="section-container">
 				<view class="section-header" @click="toggleSection('hotelInfo')">
-					<text class="section-title">酒店广告</text>
+					<text class="section-title">{{ app == '12306' ? '酒店广告' : '返现任务' }}</text>
 					<uni-icons :type="collapsed.hotelInfo ? 'bottom' : 'top'" size="16" color="#666"></uni-icons>
 				</view>
 				<view class="card" v-show="!collapsed.hotelInfo">
-					<view class="form-item">
+					<view v-if="app == '12306'" class="form-item">
 						<text class="label">城市</text>
 						<input class="input" v-model="ticketsInfo.hotelInfo.city" />
 					</view>
+					<view v-if="app == 'ctrip'" class="form-item">
+						<text class="label">返现金额</text>
+						<input class="input" type="number" v-model="ticketsInfo.hotelInfo.cashback" />
+					</view>
 					<uni-datetime-picker type="daterange" v-model="hotelDateRange" :border="false">
 						<view class="form-item">
 							<text class="label">入住/离店日期</text>
@@ -162,611 +178,648 @@
 </template>
 
 <script setup>
-	import NavBar from '@/components/nav-bar/nav-bar.vue'
-	import {
-		reactive,
-		toRefs,
-		onMounted,
-		computed
-	} from 'vue';
+import NavBar from '@/components/nav-bar/nav-bar.vue'
+import {
+	reactive,
+	toRefs,
+	onMounted,
+	computed
+} from 'vue';
+import { onLoad } from '@dcloudio/uni-app';
 
-	const defaultData = {
-		"orderInfo": {
-			"orderNo": "EJ66223536",
-			"orderTime": "2026.01.01"
-		},
-		"ticketInfo": {
-			"departureTime": "01-01 09:19",
-			"departureStation": "北京南",
-			"arrivalTime": "01-01 14:04",
-			"arrivalStation": "上海虹桥",
-			"trainNo": "G905",
-			"duration": "4时45分",
-			"date": "2026.01.01",
-			"weekDay": "星期四",
-			"gate": "6B"
-		},
-		"passengerList": [{
-			"name": "张元英",
-			"type": "成人票",
-			"seatType": "商务座",
-			"carriage": "01",
-			"seatNo": "03C",
-			"idType": "外国护照（KR）",
-			"price": "2110",
-			"status": "已支付",
-			"isMe": true
-		}],
-		"hotelInfo": {
-			"city": "上海",
-			"startDay": "01-01",
-			"endDay": "01-02"
-		}
+const defaultData = {
+	"orderInfo": {
+		"orderNo": "EJ66223536",
+		"orderTime": "2026.01.01",
+		"price": "4440"
+	},
+	"ticketInfo": {
+		"departureTime": "01-01 09:19",
+		"departureStation": "北京南",
+		"arrivalTime": "01-01 14:04",
+		"arrivalStation": "上海虹桥",
+		"trainNo": "G905",
+		"duration": "4时45分",
+		"date": "2026.01.01",
+		"weekDay": "星期四",
+		"gate": "6B",
+		"trainName": "复兴号"
+	},
+	"passengerList": [{
+		"name": "张元英",
+		"type": "成人票",
+		"seatType": "商务座",
+		"carriage": "01",
+		"seatNo": "03C",
+		"idType": "外国护照（KR）",
+		"price": "2110",
+		"status": "已支付",
+		"isMe": true,
+		"points": 9632
+	}],
+	"hotelInfo": {
+		"city": "上海",
+		"cashback": "25",
+		"startDay": "01-01",
+		"endDay": "01-02"
 	}
-	// 车票类型
-	const ticketType = [{
-			label: '成人票',
-			value: '1'
-		},
-		{
-			label: '儿童票',
-			value: '2'
-		},
-		{
-			label: '学生票',
-			value: '3'
-		},
-		{
-			label: '残疾军人票',
-			value: '4'
-		}
-	]
+}
+// 车票类型
+const ticketType = [{
+	label: '成人票',
+	value: '1'
+},
+{
+	label: '儿童票',
+	value: '2'
+},
+{
+	label: '学生票',
+	value: '3'
+},
+{
+	label: '残疾军人票',
+	value: '4'
+}
+]
 
-	const data = reactive({
-		ticketsInfo: JSON.parse(JSON.stringify(defaultData)),
-		collapsed: {
-			orderInfo: true,
-			ticketInfo: false, // Default open ticket info as it is most likely to be edited
-			passengerList: false,
-			hotelInfo: true
-		}
-	})
+const data = reactive({
+	ticketsInfo: JSON.parse(JSON.stringify(defaultData)),
+	collapsed: {
+		orderInfo: true,
+		ticketInfo: false, // Default open ticket info as it is most likely to be edited
+		passengerList: false,
+		hotelInfo: true
+	},
+	app: '12306',
+	STORAGE_KEY: 'ticketsInfo'
+})
+
+let { app } = toRefs(data)
 
 
-	const {
-		ticketsInfo,
-		collapsed
-	} = toRefs(data)
+const {
+	ticketsInfo,
+	collapsed
+} = toRefs(data)
 
-	const ticketYear = computed(() => {
-		const dateStr = data.ticketsInfo.ticketInfo.date;
-		if (dateStr && dateStr.length >= 4) {
-			return dateStr.substring(0, 4);
-		}
-		return new Date().getFullYear().toString();
-	})
+onLoad((options) => {
+	console.log("options", options)
+	if (options.app) {
+		data.app = options.app
+	}
+	if (options.storageKey) {
+		data.STORAGE_KEY = options.storageKey
+	}
+})
+
+const ticketYear = computed(() => {
+	const dateStr = data.ticketsInfo.ticketInfo.date;
+	if (dateStr && dateStr.length >= 4) {
+		return dateStr.substring(0, 4);
+	}
+	return new Date().getFullYear().toString();
+})
 
 
-	/**
-	 * 获取酒店日期范围
-	 */
-	const hotelDateRange = computed({
-		get() {
-			const year = ticketYear.value;
-			const start = data.ticketsInfo.hotelInfo.startDay ?
-				`${year}-${data.ticketsInfo.hotelInfo.startDay}` : '';
-			const end = data.ticketsInfo.hotelInfo.endDay ? `${year}-${data.ticketsInfo.hotelInfo.endDay}` :
+
+/**
+ * 获取酒店日期范围
+ */
+const hotelDateRange = computed({
+	get() {
+		const year = ticketYear.value;
+		const start = data.ticketsInfo.hotelInfo.startDay ?
+			`${year}-${data.ticketsInfo.hotelInfo.startDay}` : '';
+		const end = data.ticketsInfo.hotelInfo.endDay ? `${year}-${data.ticketsInfo.hotelInfo.endDay}` :
 			'';
-			if (start && end) {
-				return [start, end];
-			}
-			return [];
-		},
-		set(val) {
-			if (Array.isArray(val) && val.length === 2) {
-				data.ticketsInfo.hotelInfo.startDay = val[0].substring(5);
-				data.ticketsInfo.hotelInfo.endDay = val[1].substring(5);
-			}
+		if (start && end) {
+			return [start, end];
 		}
-	})
-
-	onMounted(() => {
-		const stored = uni.getStorageSync('ticketsInfo')
-		if (stored) {
-			Object.assign(data.ticketsInfo, stored)
+		return [];
+	},
+	set(val) {
+		if (Array.isArray(val) && val.length === 2) {
+			data.ticketsInfo.hotelInfo.startDay = val[0].substring(5);
+			data.ticketsInfo.hotelInfo.endDay = val[1].substring(5);
 		}
-		updateDuration();
-	})
-	/**
-	 * 确认
-	 */
-	const handleRightButtonClick = () => {
-		console.log("handleRightButtonClick", data.ticketsInfo)
-		const orderTimeStr = data.ticketsInfo.orderInfo.orderTime;
-		const ticketDateStr = data.ticketsInfo.ticketInfo.date;
+	}
+})
 
-		if (orderTimeStr && ticketDateStr) {
-			if (orderTimeStr > ticketDateStr) {
-				uni.showToast({
-					title: '下单时间不能晚于出发日期',
-					icon: 'none'
-				});
-				return;
-			}
-		}
+onMounted(() => {
+	const stored = uni.getStorageSync(data.STORAGE_KEY)
+	if (stored) {
+		Object.assign(data.ticketsInfo, stored)
+	}
+	updateDuration();
+})
+/**
+ * 更新总价
+ */
+const onPriceInput = () => {
+	setTimeout(() => {
+		let total = 0;
+		data.ticketsInfo.passengerList.forEach(item => {
+			const price = Number(item.price) || 0;
+			total += price;
+		});
+		data.ticketsInfo.orderInfo.price = total.toString();
+	}, 50);
+}
 
-		if (data.ticketsInfo.passengerList.length === 0) {
+/**
+ * 确认
+ */
+const handleRightButtonClick = () => {
+	console.log("handleRightButtonClick", data.ticketsInfo)
+	const orderTimeStr = data.ticketsInfo.orderInfo.orderTime;
+	const ticketDateStr = data.ticketsInfo.ticketInfo.date;
+
+	if (orderTimeStr && ticketDateStr) {
+		if (orderTimeStr > ticketDateStr) {
 			uni.showToast({
-				title: '请至少添加一名乘客',
-				icon: 'none'
-			});
-			return;
-		} else {
-			const passengerList = data.ticketsInfo.passengerList.filter(item => item.isMe)
-			if (passengerList.length > 1) {
-				uni.showToast({
-					title: '至多添加一名乘客为本人',
-					icon: 'none'
-				});
-				return;
-			}
-		}
-
-		uni.setStorageSync('ticketsInfo', data.ticketsInfo)
-		uni.navigateBack()
-	}
-
-	/**
-	 * 切换折叠状态
-	 * @param {string} key 
-	 */
-	const toggleSection = (key) => {
-		data.collapsed[key] = !data.collapsed[key]
-	}
-
-	/**
-	 * 删除乘客
-	 * @param {number} index 
-	 */
-	const removePassenger = (index) => {
-		uni.showModal({
-			title: '提示',
-			content: '确定要删除该乘客吗？',
-			success: (res) => {
-				if (res.confirm) {
-					data.ticketsInfo.passengerList.splice(index, 1)
-				}
-			}
-		})
-	}
-
-	/**
-	 * 添加乘客
-	 */
-	const addPassenger = () => {
-		const oldPassenger = data.ticketsInfo.passengerList[data.ticketsInfo.passengerList.length - 1]
-		const newPassenger = {
-			name: '新乘客',
-			type: oldPassenger.type || '成人票',
-			seatType: oldPassenger.seatType || '二等座',
-			carriage: oldPassenger.carriage || '01',
-			seatNo: '01A',
-			idType: '中国居民身份证',
-			price: oldPassenger.price || '0',
-			status: '已支付',
-			isMe: false
-		}
-		data.ticketsInfo.passengerList.push(newPassenger)
-	}
-
-	/**
-	 * 获取选择器日期
-	 * @param {string} dateStr 
-	 * @returns {string}
-	 */
-	const getPickerDate = (dateStr) => {
-		if (!dateStr) return '';
-		// Handle YYYY.MM.DD format
-		if (dateStr.includes('.')) {
-			return dateStr.replace(/\./g, '-');
-		}
-		// Handle MM-DD (prepend year) - logic from before, but mainly for Hotel.
-		// Ticket date is full date YYYY.MM.DD
-		if (dateStr.length <= 5) {
-			const year = new Date().getFullYear();
-			return `${year}-${dateStr}`;
-		}
-		return dateStr;
-	}
-
-	/**
-	 * 切换下单时间
-	 * @param {*} e 
-	 */
-	const onOrderTimeChange = (e) => {
-		const val = e.detail.value;
-		if (val) {
-			data.ticketsInfo.orderInfo.orderTime = val.replace(/-/g, '.');
-		}
-	}
-
-	/**
-	 * 切换乘客类型
-	 * @param {*} e 
-	 * @param {*} index 
-	 */
-	const onTicketTypeChange = (e, index) => {
-		const val = e.detail.value;
-		data.ticketsInfo.passengerList[index].type = ticketType[val].label;
-	}
-
-	/**
-	 * 切换出发日期
-	 * @param {*} e 
-	 */
-	const onTicketDateChange = (e) => {
-		const val = e.detail.value; // YYYY-MM-DD
-		if (val) {
-			// Update Date: YYYY.MM.DD
-			data.ticketsInfo.ticketInfo.date = val.replace(/-/g, '.');
-
-			// Update WeekDay
-			const dateObj = new Date(val.replace(/-/g, '/')); // Compatible
-			const days = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
-			data.ticketsInfo.ticketInfo.weekDay = days[dateObj.getDay()];
-		}
-	}
-
-	/**
-	 * 获取时间
-	 * @param {string} fullStr 
-	 * @returns {string}
-	 */
-	const getTimeHHMM = (fullStr) => {
-		if (!fullStr) return '';
-		if (fullStr.length > 5) return fullStr.split(' ')[1];
-		return fullStr;
-	}
-
-	/**
-	 * 获取出发时间
-	 */
-	const departureTimeHHMM = computed(() => {
-		return getTimeHHMM(data.ticketsInfo.ticketInfo.departureTime);
-	})
-
-	/**
-	 * 获取出发时间选择器范围
-	 */
-	const departureTimeRange = computed(() => {
-		const hours = Array.from({
-			length: 24
-		}, (_, i) => i < 10 ? '0' + i : '' + i);
-		const minutes = Array.from({
-			length: 60
-		}, (_, i) => i < 10 ? '0' + i : '' + i);
-		return [hours, minutes];
-	})
-
-	/**
-	 * 获取出发时间索引
-	 */
-	const departureTimeIndex = computed(() => {
-		const timeStr = getTimeHHMM(data.ticketsInfo.ticketInfo.departureTime);
-		if (!timeStr) return [0, 0];
-		const [h, m] = timeStr.split(':');
-		const hours = departureTimeRange.value[0];
-		const minutes = departureTimeRange.value[1];
-		let hIdx = hours.indexOf(h);
-		if (hIdx === -1) hIdx = 0;
-		let mIdx = minutes.indexOf(m);
-		if (mIdx === -1) mIdx = 0;
-		return [hIdx, mIdx];
-	})
-
-	/**
-	 * 获取到达时间日期范围
-	 */
-	const arrivalRange = computed(() => {
-		const dateStr = data.ticketsInfo.ticketInfo.date; // YYYY.MM.DD
-		const dates = [];
-		if (dateStr) {
-			const baseDate = new Date(dateStr.replace(/\./g, '-').replace(/-/g, '/') + ' 00:00:00');
-			for (let i = 0; i < 4; i++) { // Ticket Date + 3 days
-				const d = new Date(baseDate);
-				d.setDate(d.getDate() + i);
-				const pad = n => n < 10 ? '0' + n : n;
-				dates.push(`${pad(d.getMonth() + 1)}-${pad(d.getDate())}`);
-			}
-		} else {
-			dates.push('MM-DD');
-		}
-		const hours = Array.from({
-			length: 24
-		}, (_, i) => i < 10 ? '0' + i : '' + i);
-		const minutes = Array.from({
-			length: 60
-		}, (_, i) => i < 10 ? '0' + i : '' + i);
-		return [dates, hours, minutes];
-	})
-
-	/**
-	 * 获取到达时间索引
-	 */
-	const arrivalIndex = computed(() => {
-		const arrTime = data.ticketsInfo.ticketInfo.arrivalTime;
-		if (!arrTime || arrTime.length < 5) return [0, 0, 0];
-		// Might be HH:mm or MM-DD HH:mm
-		const parts = arrTime.split(' ');
-		let datePart = parts[0];
-		let timePart = parts[1];
-
-		// Handle case where only HH:mm (old data)
-		if (!timePart && datePart.includes(':')) {
-			timePart = datePart;
-			datePart = arrivalRange.value[0][0];
-		}
-
-		if (!timePart) return [0, 0, 0];
-		const [h, m] = timePart.split(':');
-
-		const dates = arrivalRange.value[0];
-		const hours = arrivalRange.value[1];
-		const minutes = arrivalRange.value[2];
-
-		let dateIdx = dates.indexOf(datePart);
-		if (dateIdx === -1) dateIdx = 0;
-
-		let hIdx = hours.indexOf(h);
-		if (hIdx === -1) hIdx = 0;
-
-		let mIdx = minutes.indexOf(m);
-		if (mIdx === -1) mIdx = 0;
-
-		return [dateIdx, hIdx, mIdx];
-	})
-
-	/**
-	 * 切换到达时间
-	 * @param {*} e 
-	 */
-	const onArrivalChange = (e) => {
-		const idxs = e.detail.value;
-		const range = arrivalRange.value;
-		if (!range[0][idxs[0]]) return;
-
-		const dateStr = range[0][idxs[0]];
-		const hStr = range[1][idxs[1]];
-		const mStr = range[2][idxs[2]];
-
-		const newArrTime = `${dateStr} ${hStr}:${mStr}`;
-
-		// Validate: >= Departure
-		const getTs = (str) => {
-			if (!str || str.length <= 5) return 0;
-			const year = new Date().getFullYear();
-			// Robust format: YYYY/MM/DD HH:mm:00
-			return new Date(`${year}/${str.replace(/-/g, '/')}:00`).getTime();
-		}
-
-		const startTs = getTs(data.ticketsInfo.ticketInfo.departureTime);
-		const endTs = getTs(newArrTime);
-
-		if (startTs > 0 && endTs < startTs) {
-			uni.showToast({
-				title: '到达时间不能早于出发时间',
+				title: '下单时间不能晚于出发日期',
 				icon: 'none'
 			});
 			return;
 		}
-
-		data.ticketsInfo.ticketInfo.arrivalTime = newArrTime;
-		updateDuration();
 	}
 
-	/**
-	 * 切换出发时间
-	 * @param e 
-	 */
-	/**
-	 * 切换出发时间
-	 * @param e 
-	 */
-	const onDepartureTimeChange = (e) => {
-		let val = e.detail.value; // Array [hIdx, mIdx]
-
-		// Convert array to HH:mm string
-		if (Array.isArray(val)) {
-			const h = departureTimeRange.value[0][val[0]];
-			const m = departureTimeRange.value[1][val[1]];
-			val = `${h}:${m}`;
+	if (data.ticketsInfo.passengerList.length === 0) {
+		uni.showToast({
+			title: '请至少添加一名乘客',
+			icon: 'none'
+		});
+		return;
+	} else {
+		const passengerList = data.ticketsInfo.passengerList.filter(item => item.isMe)
+		if (passengerList.length > 1) {
+			uni.showToast({
+				title: '至多添加一名乘客为本人',
+				icon: 'none'
+			});
+			return;
 		}
+	}
 
-		if (!val) return;
+	uni.setStorageSync(data.STORAGE_KEY, data.ticketsInfo)
+	uni.navigateBack()
+}
 
-		// Construct New Departure Timestamp
-		// Departure uses Ticket Date
-		const ticketDate = data.ticketsInfo.ticketInfo.date; // YYYY.MM.DD
-		if (!ticketDate) return;
+/**
+ * 切换折叠状态
+ * @param {string} key 
+ */
+const toggleSection = (key) => {
+	data.collapsed[key] = !data.collapsed[key]
+}
 
-		// Assuming format YYYY.MM.DD
-		const depDateStr = ticketDate.replace(/\./g, '/'); // YYYY/MM/DD
-		const newDepTs = new Date(`${depDateStr} ${val}:00`).getTime();
-
-		// Get Arrival Timestamp
-		const arrStr = data.ticketsInfo.ticketInfo.arrivalTime; // MM-DD HH:mm
-		if (arrStr && arrStr.length > 5) {
-			// Use Ticket Year as base.
-			const ticketYear = ticketDate.split('.')[0];
-			const arrDatePart = arrStr.split(' ')[0]; // MM-DD
-			const arrTimePart = arrStr.split(' ')[1]; // HH:mm
-
-			// Handle Cross Year if Ticket Date is Dec and Arrival is Jan
-			let arrYear = parseInt(ticketYear);
-			const ticketMonth = parseInt(ticketDate.split('.')[1]);
-			const arrMonth = parseInt(arrDatePart.split('-')[0]);
-
-			if (ticketMonth === 12 && arrMonth === 1) {
-				arrYear++;
-			}
-
-			const arrTs = new Date(`${arrYear}/${arrDatePart.replace(/-/g, '/')} ${arrTimePart}:00`).getTime();
-
-			if (newDepTs > arrTs) {
-				uni.showToast({
-					title: '出发时间不能晚于到达时间',
-					icon: 'none'
-				});
-				return;
+/**
+ * 删除乘客
+ * @param {number} index 
+ */
+const removePassenger = (index) => {
+	uni.showModal({
+		title: '提示',
+		content: '确定要删除该乘客吗？',
+		success: (res) => {
+			if (res.confirm) {
+				data.ticketsInfo.passengerList.splice(index, 1);
+				onPriceInput();
 			}
 		}
+	})
+}
 
-		const dateParts = ticketDate.split('.');
-		let mmdd = `${dateParts[1]}-${dateParts[2]}`;
-		data.ticketsInfo.ticketInfo.departureTime = `${mmdd} ${val}`;
-		updateDuration();
+/**
+ * 添加乘客
+ */
+const addPassenger = () => {
+	const oldPassenger = data.ticketsInfo.passengerList[data.ticketsInfo.passengerList.length - 1]
+	const newPassenger = {
+		name: '新乘客',
+		type: oldPassenger.type || '成人票',
+		seatType: oldPassenger.seatType || '二等座',
+		carriage: oldPassenger.carriage || '01',
+		seatNo: '01A',
+		idType: '中国居民身份证',
+		price: oldPassenger.price || '0',
+		status: '已支付',
+		isMe: false,
+		points: oldPassenger.points || '2898',
+	}
+	data.ticketsInfo.passengerList.push(newPassenger);
+	onPriceInput();
+}
+
+/**
+ * 获取选择器日期
+ * @param {string} dateStr 
+ * @returns {string}
+ */
+const getPickerDate = (dateStr) => {
+	if (!dateStr) return '';
+	// Handle YYYY.MM.DD format
+	if (dateStr.includes('.')) {
+		return dateStr.replace(/\./g, '-');
+	}
+	// Handle MM-DD (prepend year) - logic from before, but mainly for Hotel.
+	// Ticket date is full date YYYY.MM.DD
+	if (dateStr.length <= 5) {
+		const year = new Date().getFullYear();
+		return `${year}-${dateStr}`;
+	}
+	return dateStr;
+}
+
+/**
+ * 切换下单时间
+ * @param {*} e 
+ */
+const onOrderTimeChange = (e) => {
+	const val = e.detail.value;
+	if (val) {
+		data.ticketsInfo.orderInfo.orderTime = val.replace(/-/g, '.');
+	}
+}
+
+/**
+ * 切换乘客类型
+ * @param {*} e 
+ * @param {*} index 
+ */
+const onTicketTypeChange = (e, index) => {
+	const val = e.detail.value;
+	data.ticketsInfo.passengerList[index].type = ticketType[val].label;
+}
+
+/**
+ * 切换出发日期
+ * @param {*} e 
+ */
+const onTicketDateChange = (e) => {
+	const val = e.detail.value; // YYYY-MM-DD
+	if (val) {
+		// Update Date: YYYY.MM.DD
+		data.ticketsInfo.ticketInfo.date = val.replace(/-/g, '.');
+
+		// Update WeekDay
+		const dateObj = new Date(val.replace(/-/g, '/')); // Compatible
+		const days = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+		data.ticketsInfo.ticketInfo.weekDay = days[dateObj.getDay()];
+	}
+}
+
+/**
+ * 获取时间
+ * @param {string} fullStr 
+ * @returns {string}
+ */
+const getTimeHHMM = (fullStr) => {
+	if (!fullStr) return '';
+	if (fullStr.length > 5) return fullStr.split(' ')[1];
+	return fullStr;
+}
+
+/**
+ * 获取出发时间
+ */
+const departureTimeHHMM = computed(() => {
+	return getTimeHHMM(data.ticketsInfo.ticketInfo.departureTime);
+})
+
+/**
+ * 获取出发时间选择器范围
+ */
+const departureTimeRange = computed(() => {
+	const hours = Array.from({
+		length: 24
+	}, (_, i) => i < 10 ? '0' + i : '' + i);
+	const minutes = Array.from({
+		length: 60
+	}, (_, i) => i < 10 ? '0' + i : '' + i);
+	return [hours, minutes];
+})
+
+/**
+ * 获取出发时间索引
+ */
+const departureTimeIndex = computed(() => {
+	const timeStr = getTimeHHMM(data.ticketsInfo.ticketInfo.departureTime);
+	if (!timeStr) return [0, 0];
+	const [h, m] = timeStr.split(':');
+	const hours = departureTimeRange.value[0];
+	const minutes = departureTimeRange.value[1];
+	let hIdx = hours.indexOf(h);
+	if (hIdx === -1) hIdx = 0;
+	let mIdx = minutes.indexOf(m);
+	if (mIdx === -1) mIdx = 0;
+	return [hIdx, mIdx];
+})
+
+/**
+ * 获取到达时间日期范围
+ */
+const arrivalRange = computed(() => {
+	const dateStr = data.ticketsInfo.ticketInfo.date; // YYYY.MM.DD
+	const dates = [];
+	if (dateStr) {
+		const baseDate = new Date(dateStr.replace(/\./g, '-').replace(/-/g, '/') + ' 00:00:00');
+		for (let i = 0; i < 4; i++) { // Ticket Date + 3 days
+			const d = new Date(baseDate);
+			d.setDate(d.getDate() + i);
+			const pad = n => n < 10 ? '0' + n : n;
+			dates.push(`${pad(d.getMonth() + 1)}-${pad(d.getDate())}`);
+		}
+	} else {
+		dates.push('MM-DD');
+	}
+	const hours = Array.from({
+		length: 24
+	}, (_, i) => i < 10 ? '0' + i : '' + i);
+	const minutes = Array.from({
+		length: 60
+	}, (_, i) => i < 10 ? '0' + i : '' + i);
+	return [dates, hours, minutes];
+})
+
+/**
+ * 获取到达时间索引
+ */
+const arrivalIndex = computed(() => {
+	const arrTime = data.ticketsInfo.ticketInfo.arrivalTime;
+	if (!arrTime || arrTime.length < 5) return [0, 0, 0];
+	// Might be HH:mm or MM-DD HH:mm
+	const parts = arrTime.split(' ');
+	let datePart = parts[0];
+	let timePart = parts[1];
+
+	// Handle case where only HH:mm (old data)
+	if (!timePart && datePart.includes(':')) {
+		timePart = datePart;
+		datePart = arrivalRange.value[0][0];
 	}
 
-	/**
-	 * 更新时长
-	 */
-	const updateDuration = () => {
-		// Helper to parse MM-DD HH:mm to timestamp (using current year)
-		// Safer to use "/" for cross-platform compatibility
-		const getTs = (str) => {
-			if (!str || str.length <= 5) return 0;
-			const year = new Date().getFullYear();
-			// Format: "YYYY/MM/DD HH:mm:00"
-			return new Date(`${year}/${str.replace(/-/g, '/')}:00`).getTime();
+	if (!timePart) return [0, 0, 0];
+	const [h, m] = timePart.split(':');
+
+	const dates = arrivalRange.value[0];
+	const hours = arrivalRange.value[1];
+	const minutes = arrivalRange.value[2];
+
+	let dateIdx = dates.indexOf(datePart);
+	if (dateIdx === -1) dateIdx = 0;
+
+	let hIdx = hours.indexOf(h);
+	if (hIdx === -1) hIdx = 0;
+
+	let mIdx = minutes.indexOf(m);
+	if (mIdx === -1) mIdx = 0;
+
+	return [dateIdx, hIdx, mIdx];
+})
+
+/**
+ * 切换到达时间
+ * @param {*} e 
+ */
+const onArrivalChange = (e) => {
+	const idxs = e.detail.value;
+	const range = arrivalRange.value;
+	if (!range[0][idxs[0]]) return;
+
+	const dateStr = range[0][idxs[0]];
+	const hStr = range[1][idxs[1]];
+	const mStr = range[2][idxs[2]];
+
+	const newArrTime = `${dateStr} ${hStr}:${mStr}`;
+
+	// Validate: >= Departure
+	const getTs = (str) => {
+		if (!str || str.length <= 5) return 0;
+		const year = new Date().getFullYear();
+		// Robust format: YYYY/MM/DD HH:mm:00
+		return new Date(`${year}/${str.replace(/-/g, '/')}:00`).getTime();
+	}
+
+	const startTs = getTs(data.ticketsInfo.ticketInfo.departureTime);
+	const endTs = getTs(newArrTime);
+
+	if (startTs > 0 && endTs < startTs) {
+		uni.showToast({
+			title: '到达时间不能早于出发时间',
+			icon: 'none'
+		});
+		return;
+	}
+
+	data.ticketsInfo.ticketInfo.arrivalTime = newArrTime;
+	updateDuration();
+}
+
+/**
+ * 切换出发时间
+ * @param e 
+ */
+/**
+ * 切换出发时间
+ * @param e 
+ */
+const onDepartureTimeChange = (e) => {
+	let val = e.detail.value; // Array [hIdx, mIdx]
+
+	// Convert array to HH:mm string
+	if (Array.isArray(val)) {
+		const h = departureTimeRange.value[0][val[0]];
+		const m = departureTimeRange.value[1][val[1]];
+		val = `${h}:${m}`;
+	}
+
+	if (!val) return;
+
+	// Construct New Departure Timestamp
+	// Departure uses Ticket Date
+	const ticketDate = data.ticketsInfo.ticketInfo.date; // YYYY.MM.DD
+	if (!ticketDate) return;
+
+	// Assuming format YYYY.MM.DD
+	const depDateStr = ticketDate.replace(/\./g, '/'); // YYYY/MM/DD
+	const newDepTs = new Date(`${depDateStr} ${val}:00`).getTime();
+
+	// Get Arrival Timestamp
+	const arrStr = data.ticketsInfo.ticketInfo.arrivalTime; // MM-DD HH:mm
+	if (arrStr && arrStr.length > 5) {
+		// Use Ticket Year as base.
+		const ticketYear = ticketDate.split('.')[0];
+		const arrDatePart = arrStr.split(' ')[0]; // MM-DD
+		const arrTimePart = arrStr.split(' ')[1]; // HH:mm
+
+		// Handle Cross Year if Ticket Date is Dec and Arrival is Jan
+		let arrYear = parseInt(ticketYear);
+		const ticketMonth = parseInt(ticketDate.split('.')[1]);
+		const arrMonth = parseInt(arrDatePart.split('-')[0]);
+
+		if (ticketMonth === 12 && arrMonth === 1) {
+			arrYear++;
 		}
 
-		const start = getTs(data.ticketsInfo.ticketInfo.departureTime);
-		const end = getTs(data.ticketsInfo.ticketInfo.arrivalTime);
+		const arrTs = new Date(`${arrYear}/${arrDatePart.replace(/-/g, '/')} ${arrTimePart}:00`).getTime();
 
-		if (start && end && end >= start) {
-			const diffMs = end - start;
-			const diffHrs = Math.floor(diffMs / (1000 * 60 * 60));
-			const diffMins = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60));
-			data.ticketsInfo.ticketInfo.duration = `${diffHrs}时${diffMins}分`;
+		if (newDepTs > arrTs) {
+			uni.showToast({
+				title: '出发时间不能晚于到达时间',
+				icon: 'none'
+			});
+			return;
 		}
 	}
+
+	const dateParts = ticketDate.split('.');
+	let mmdd = `${dateParts[1]}-${dateParts[2]}`;
+	data.ticketsInfo.ticketInfo.departureTime = `${mmdd} ${val}`;
+	updateDuration();
+}
+
+/**
+ * 更新时长
+ */
+const updateDuration = () => {
+	// Helper to parse MM-DD HH:mm to timestamp (using current year)
+	// Safer to use "/" for cross-platform compatibility
+	const getTs = (str) => {
+		if (!str || str.length <= 5) return 0;
+		const year = new Date().getFullYear();
+		// Format: "YYYY/MM/DD HH:mm:00"
+		return new Date(`${year}/${str.replace(/-/g, '/')}:00`).getTime();
+	}
+
+	const start = getTs(data.ticketsInfo.ticketInfo.departureTime);
+	const end = getTs(data.ticketsInfo.ticketInfo.arrivalTime);
+
+	if (start && end && end >= start) {
+		const diffMs = end - start;
+		const diffHrs = Math.floor(diffMs / (1000 * 60 * 60));
+		const diffMins = Math.floor((diffMs % (1000 * 60 * 60)) / (1000 * 60));
+		data.ticketsInfo.ticketInfo.duration = `${diffHrs}时${diffMins}分`;
+	}
+}
 </script>
 
 <style>
-	@import "@/common/main.css";
+@import "@/common/main.css";
 
-	page {
-		background-color: #F8F8F8;
-		height: 100vh;
-		overflow: hidden;
-	}
+page {
+	background-color: #F8F8F8;
+	height: 100vh;
+	overflow: hidden;
+}
 </style>
 
 <style lang="less" scoped>
-	.container {
+.container {
+	display: flex;
+	flex-direction: column;
+	height: 100vh;
+}
+
+.form-content {
+	flex: 1;
+	height: 0;
+	padding: 24rpx;
+	box-sizing: border-box;
+}
+
+.section-container {
+	margin-bottom: 24rpx;
+}
+
+.section-header {
+	display: flex;
+	flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	padding: 24rpx 12rpx 16rpx;
+	background-color: transparent;
+}
+
+.section-title {
+	font-size: 28rpx;
+	color: #666;
+	font-weight: 500;
+}
+
+.card {
+	background-color: #fff;
+	border-radius: 16rpx;
+	padding: 0 24rpx;
+	margin-bottom: 24rpx;
+	overflow: hidden;
+
+	.card-header-row {
 		display: flex;
-		flex-direction: column;
-		height: 100vh;
+		justify-content: space-between;
+		align-items: center;
+		padding: 24rpx 0 12rpx;
+		border-bottom: 1rpx solid #f5f5f5;
+		margin-bottom: 12rpx;
 	}
 
-	.form-content {
+	.card-header {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: #333;
+	}
+
+	.delete-btn {
+		font-size: 26rpx;
+		color: #FF4D4F;
+		padding: 4rpx 12rpx;
+	}
+}
+
+.form-item {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding: 24rpx 0;
+	border-bottom: 1rpx solid #F5F5F5;
+
+	&:last-child {
+		border-bottom: none;
+	}
+
+	.label {
+		font-size: 30rpx;
+		color: #333;
+		width: 240rpx;
+	}
+
+	.input {
 		flex: 1;
-		height: 0;
-		padding: 24rpx;
-		box-sizing: border-box;
+		font-size: 30rpx;
+		color: #333;
+		text-align: right;
 	}
+}
 
-	.section-container {
-		margin-bottom: 24rpx;
+.add-btn-box {
+	background-color: #fff;
+	border-radius: 16rpx;
+	padding: 24rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	border: 2rpx dashed #1677FF;
+	margin-bottom: 24rpx;
+
+	.add-text {
+		color: #1677FF;
+		font-size: 30rpx;
+		margin-left: 8rpx;
 	}
+}
 
-	.section-header {
-		display: flex;
-		flex-direction: row;
-		justify-content: space-between;
-		align-items: center;
-		padding: 24rpx 12rpx 16rpx;
-		background-color: transparent;
-	}
-
-	.section-title {
-		font-size: 28rpx;
-		color: #666;
-		font-weight: 500;
-	}
-
-	.card {
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 0 24rpx;
-		margin-bottom: 24rpx;
-		overflow: hidden;
-
-		.card-header-row {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			padding: 24rpx 0 12rpx;
-			border-bottom: 1rpx solid #f5f5f5;
-			margin-bottom: 12rpx;
-		}
-
-		.card-header {
-			font-size: 30rpx;
-			font-weight: bold;
-			color: #333;
-		}
-
-		.delete-btn {
-			font-size: 26rpx;
-			color: #FF4D4F;
-			padding: 4rpx 12rpx;
-		}
-	}
-
-	.form-item {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 24rpx 0;
-		border-bottom: 1rpx solid #F5F5F5;
-
-		&:last-child {
-			border-bottom: none;
-		}
-
-		.label {
-			font-size: 30rpx;
-			color: #333;
-			width: 240rpx;
-		}
-
-		.input {
-			flex: 1;
-			font-size: 30rpx;
-			color: #333;
-			text-align: right;
-		}
-	}
-
-	.add-btn-box {
-		background-color: #fff;
-		border-radius: 16rpx;
-		padding: 24rpx;
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		border: 2rpx dashed #1677FF;
-		margin-bottom: 24rpx;
-
-		.add-text {
-			color: #1677FF;
-			font-size: 30rpx;
-			margin-left: 8rpx;
-		}
-	}
-
-	.placeholder {
-		height: 60rpx;
-	}
+.placeholder {
+	height: 60rpx;
+}
 </style>
\ No newline at end of file
diff --git a/static/image/other/train-tickets/ctrip/buy-return-trip.png b/static/image/other/train-tickets/ctrip/buy-return-trip.png
new file mode 100644
index 0000000..72327b8
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/buy-return-trip.png differ
diff --git a/static/image/other/train-tickets/ctrip/card-bg.png b/static/image/other/train-tickets/ctrip/card-bg.png
new file mode 100644
index 0000000..8178277
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/card-bg.png differ
diff --git a/static/image/other/train-tickets/ctrip/ctrip-train-bg.png b/static/image/other/train-tickets/ctrip/ctrip-train-bg.png
new file mode 100644
index 0000000..05f91eb
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/ctrip-train-bg.png differ
diff --git a/static/image/other/train-tickets/ctrip/customer-sevice.png b/static/image/other/train-tickets/ctrip/customer-sevice.png
new file mode 100644
index 0000000..9c1e705
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/customer-sevice.png differ
diff --git a/static/image/other/train-tickets/ctrip/dingdantongzhi.png b/static/image/other/train-tickets/ctrip/dingdantongzhi.png
new file mode 100644
index 0000000..ab00646
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/dingdantongzhi.png differ
diff --git a/static/image/other/train-tickets/ctrip/ertongshenbao.png b/static/image/other/train-tickets/ctrip/ertongshenbao.png
new file mode 100644
index 0000000..cdbea4b
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/ertongshenbao.png differ
diff --git a/static/image/other/train-tickets/ctrip/fapiaobaoxiao.png b/static/image/other/train-tickets/ctrip/fapiaobaoxiao.png
new file mode 100644
index 0000000..c828c7f
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/fapiaobaoxiao.png differ
diff --git a/static/image/other/train-tickets/ctrip/fenxiangxingcheng.png b/static/image/other/train-tickets/ctrip/fenxiangxingcheng.png
new file mode 100644
index 0000000..037abc6
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/fenxiangxingcheng.png differ
diff --git a/static/image/other/train-tickets/ctrip/free-order.png b/static/image/other/train-tickets/ctrip/free-order.png
new file mode 100644
index 0000000..5555103
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/free-order.png differ
diff --git a/static/image/other/train-tickets/ctrip/help.png b/static/image/other/train-tickets/ctrip/help.png
new file mode 100644
index 0000000..79d346c
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/help.png differ
diff --git a/static/image/other/train-tickets/ctrip/huodong.png b/static/image/other/train-tickets/ctrip/huodong.png
new file mode 100644
index 0000000..0f905c8
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/huodong.png differ
diff --git a/static/image/other/train-tickets/ctrip/jifen.png b/static/image/other/train-tickets/ctrip/jifen.png
new file mode 100644
index 0000000..e5c7028
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/jifen.png differ
diff --git a/static/image/other/train-tickets/ctrip/jingtingxinxi.png b/static/image/other/train-tickets/ctrip/jingtingxinxi.png
new file mode 100644
index 0000000..5c9e739
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/jingtingxinxi.png differ
diff --git a/static/image/other/train-tickets/ctrip/jinzhanzhiyin.png b/static/image/other/train-tickets/ctrip/jinzhanzhiyin.png
new file mode 100644
index 0000000..0936cbc
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/jinzhanzhiyin.png differ
diff --git a/static/image/other/train-tickets/ctrip/location.png b/static/image/other/train-tickets/ctrip/location.png
new file mode 100644
index 0000000..69e8017
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/location.png differ
diff --git a/static/image/other/train-tickets/ctrip/quanbuzhankai.png b/static/image/other/train-tickets/ctrip/quanbuzhankai.png
new file mode 100644
index 0000000..26595d1
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/quanbuzhankai.png differ
diff --git a/static/image/other/train-tickets/ctrip/refund-instructions.png b/static/image/other/train-tickets/ctrip/refund-instructions.png
new file mode 100644
index 0000000..f3a1cc7
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/refund-instructions.png differ
diff --git a/static/image/other/train-tickets/ctrip/right.png b/static/image/other/train-tickets/ctrip/right.png
new file mode 100644
index 0000000..4ec8439
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/right.png differ
diff --git a/static/image/other/train-tickets/ctrip/success.png b/static/image/other/train-tickets/ctrip/success.png
new file mode 100644
index 0000000..f006d09
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/success.png differ
diff --git a/static/image/other/train-tickets/ctrip/top-logo.png b/static/image/other/train-tickets/ctrip/top-logo.png
new file mode 100644
index 0000000..13f6887
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/top-logo.png differ
diff --git a/static/image/other/train-tickets/ctrip/youwanzhinan.png b/static/image/other/train-tickets/ctrip/youwanzhinan.png
new file mode 100644
index 0000000..9a0e9b7
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/youwanzhinan.png differ
diff --git a/static/image/other/train-tickets/ctrip/zaixianhuanzuo.png b/static/image/other/train-tickets/ctrip/zaixianhuanzuo.png
new file mode 100644
index 0000000..8113973
Binary files /dev/null and b/static/image/other/train-tickets/ctrip/zaixianhuanzuo.png differ
diff --git a/static/image/recharge/icon1.png b/static/image/recharge/icon1.png
index 34c7ffc..d28ed00 100644
Binary files a/static/image/recharge/icon1.png and b/static/image/recharge/icon1.png differ
diff --git a/static/image/recharge/icon10.png b/static/image/recharge/icon10.png
index 7a1efcd..e08a3a9 100644
Binary files a/static/image/recharge/icon10.png and b/static/image/recharge/icon10.png differ
diff --git a/static/image/recharge/icon11.png b/static/image/recharge/icon11.png
index b0c6723..46f152d 100644
Binary files a/static/image/recharge/icon11.png and b/static/image/recharge/icon11.png differ
diff --git a/static/image/recharge/icon12.png b/static/image/recharge/icon12.png
index be5cbbc..68b9e71 100644
Binary files a/static/image/recharge/icon12.png and b/static/image/recharge/icon12.png differ
diff --git a/static/image/recharge/icon2.png b/static/image/recharge/icon2.png
index 934cae4..266c8bd 100644
Binary files a/static/image/recharge/icon2.png and b/static/image/recharge/icon2.png differ
diff --git a/static/image/recharge/icon3.png b/static/image/recharge/icon3.png
index 258bbd2..9cab45c 100644
Binary files a/static/image/recharge/icon3.png and b/static/image/recharge/icon3.png differ
diff --git a/static/image/recharge/icon4.png b/static/image/recharge/icon4.png
index 1d40a6e..9a4d296 100644
Binary files a/static/image/recharge/icon4.png and b/static/image/recharge/icon4.png differ
diff --git a/static/image/recharge/icon5.png b/static/image/recharge/icon5.png
index a7ee1ba..a7a1966 100644
Binary files a/static/image/recharge/icon5.png and b/static/image/recharge/icon5.png differ
diff --git a/static/image/recharge/icon6.png b/static/image/recharge/icon6.png
index 47f45c9..79fc99e 100644
Binary files a/static/image/recharge/icon6.png and b/static/image/recharge/icon6.png differ
diff --git a/static/image/recharge/icon7.png b/static/image/recharge/icon7.png
index 408caa7..3fb2ce5 100644
Binary files a/static/image/recharge/icon7.png and b/static/image/recharge/icon7.png differ
diff --git a/static/image/recharge/icon8.png b/static/image/recharge/icon8.png
index 224cb48..c23819a 100644
Binary files a/static/image/recharge/icon8.png and b/static/image/recharge/icon8.png differ
diff --git a/static/image/recharge/icon9.png b/static/image/recharge/icon9.png
index 3efd215..ea11771 100644
Binary files a/static/image/recharge/icon9.png and b/static/image/recharge/icon9.png differ
diff --git a/static/image/recharge/index.vue b/static/image/recharge/index.vue
new file mode 100644
index 0000000..36b009e
--- /dev/null
+++ b/static/image/recharge/index.vue
@@ -0,0 +1,2491 @@
+<template>
+	<view class="page-container">
+		<uni-icons class="back" type="left" size="20" @click="open" color="#fff"></uni-icons>
+		<view>
+			<image :src="data.banner" style="width: 100%;height: 244px;"></image>
+		</view>
+		<!-- <view style="margin-top:-90px;position: relative;">
+			<customTab :isHuise="shouldBeTrue(data.goods)" />
+		</view> -->
+		<view class="vipContent" style="margin-top:-90px;position: relative;">
+			<view class="top">
+				<image src="/static/image/recharge/vipContentTopBgImg.png" mode="widthFix"></image>
+			</view>
+			<view class="vipList">
+				<view class="item" v-for="(item,index) in data.benefitList" :key="index">
+					<image :src="item.url"></image>
+					<text>{{item.name}}</text>
+				</view>
+			</view>
+		</view>
+		<scroll-view class="package-items-box" scroll-x="true" v-if="data.goodsList.length">
+			<view class="package-items-container">
+				<view class="package-item" :class="{'active-package-item':selected==(index+1)}"
+					v-for="(item,index) in data.goodsList" @click="onSelect(item, index)" :key="index">
+					<view class="top">
+						<view class="title">
+							{{item.goods_name}}
+						</view>
+						<text class="del-text">￥{{item.origin_price}}</text>
+					</view>
+					<view class="price-box">
+						<text>￥</text><text class="price">{{item.price}}</text>
+					</view>
+					<view class="shen ">
+						{{item.tips2||`立省￥${(Number(item.origin_price)-Number(item.price)).toFixed(0)}`}}
+					</view>
+					<view class="active-package-item-tips" v-show="item.tips&&selected==(index+1)">
+						{{item.tips}}
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<view class="myCouponList" @click="data.myActivity.length>0?myCoupon.open():''">
+			<view class="left">
+				<image src="/static/image/recharge/couponMin.png" mode=""></image>
+				<view class="title">{{data.active_id==0?'优惠券':(data.activeCoupon.coupon_type_name+'已减')}}</view>
+				<view class="money" v-if="data.active_id!=0">
+					￥{{$toFiexd(data.activeCoupon.coupon_type_name!='折扣券'?(Number(data.activeCoupon.coupon_value)/100):((1-Number(data.activeCoupon.coupon_value))*data.goods.price),2)}}
+				</view>
+			</view>
+			<view class="right" v-if="data.active_id==0">
+				<text
+					style="color: red;">{{data.myActivity.length==0?'暂无优惠券':('待使用'+data.myActivity.length+'张')}}</text>
+				<uni-icons type="forward" color="#AEAEAE" class="forward"></uni-icons>
+			</view>
+			<view class="right " v-else>
+				<view class="timeBox" v-if="data.countdown&&data.active_id>0">
+					<view class="titles">距离优惠结束</view>
+					<uni-countdown :font-size="12" :day="data.activeCoupon.days" :hour="data.activeCoupon.hours"
+						:minute="data.activeCoupon.minutes" :second="data.activeCoupon.seconds" color="#FFFFFF"
+						background-color="#2A2617" />
+				</view>
+				<uni-icons type="forward" color="#AEAEAE" class="forward"
+					:class="{forward2:data.active_id!=0}"></uni-icons>
+			</view>
+		</view>
+		<view class="question" :class="{'iosQuestion':$system=='iOS'}">
+			<view class="titles">
+				常见问题
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question1.png"></image>
+				<view class="text">开通会员享受哪些权益</view>
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question2.png"></image>
+				<view class="text text1">会员用户享受无水印,无广告及专属客服等权益,正在开发中的100多个功能点免费更新,另外会员用户功能需求可定制。</view>
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question1.png"></image>
+				<view class="text">苹果安卓会员是否互通</view>
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question2.png"></image>
+				<view class="text text1">苹果、安卓以及鸿蒙系统会员是互通的,登录同一个账号,其他平台也可以使用,没有设备数量限制。</view>
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question1.png"></image>
+				<view class="text">会员时长如何计算</view>
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question2.png"></image>
+				<view class="text text1">月会员31天,年会员365天,终身会员永久使用不过期。</view>
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question1.png"></image>
+				<view class="text">是否会自动扣费</view>
+			</view>
+			<view class="titleBox">
+				<image src="/static/image/recharge/question2.png"></image>
+				<view class="text text1">我们不会自动扣费,会员到期后需要您手动续费。</view>
+			</view>
+		</view>
+	</view>
+
+	<view class="footer-container">
+		<view class="payment-method-box">
+			<view class="wx-pay payment-method" v-for="(item,index) in data.payList" @click="onSelectPayment(item.type)"
+				:key="index">
+				<image class="img-select"
+					:src="paymentMethod==item.type?'/static/image/recharge/selected.png':'/static/image/recharge/unselected.png'">
+				</image>
+				<image class="logo" :src="item.image" mode="aspectFit"></image>
+				<text class="name">{{item.name}}</text>
+			</view>
+		</view>
+		<view class="buttonBoxs " :class="{'christmas':data.isChristmas}">
+			<view class="hongbao" v-if="data.ishongBao">
+				<c-lottie ref="cLottieRef" :loop="false" src='/static/lottie/hongbao.json' width="100vw"
+					height='216vw'></c-lottie>
+			</view>
+			<view class="button-box " :class="{'white-flow':data.active_id>0}">
+				<view class="text">
+					合计
+					<text>￥</text>
+					<countUp :num="$toFiexd(data.price,2)" height="24" style="margin-top: -6px;" color="red"
+						fontSize='24'></countUp>
+					已优惠￥{{$toFiexd(data.coupon,0)}}
+				</view>
+				<view class="button" @click="activateVip">
+					立即开通
+				</view>
+			</view>
+		</view>
+		<view class="footerBottom"></view>
+	</view>
+
+	<uni-popup ref="coupon" type="center" mask-background-color="rgb(0 0 0 / 70%)" :is-mask-click="false"
+		:mask-click="false">
+		<view>
+			<view class="coupon" v-if="data.coupon">
+				<c-lottie ref="cLottieRef" src='/static/lottie/coupon.json' width="100vw" height='462px' :loop="false"
+					@Complete="Complete"></c-lottie>
+			</view>
+			<transition name="scale">
+				<view v-if="!data.coupon" class="animated-box">
+					<view class="couponBox"
+						:style="{height:data.activity.length==1?'266px':(data.activity.length==2?'358px':'450px')}">
+
+						<image class="shadowBg" src="/static/image/recharge/shadowBg.png" mode=""></image>
+						<view class="header">
+
+						</view>
+						<view class="couponConten"
+							:style="{height:data.activity.length==1?'76px':(data.activity.length==2?'168px':'260px')}">
+
+						</view>
+						<c-lottie ref="cLottieRef" class="couponTop" src='/static/lottie/couponTop.json' width="100vw"
+							height='390px'></c-lottie>
+						<image class="colse" src="/static/image/watermarkColse.png" mode="" @click="coupon.close()">
+						</image>
+						<scroll-view class="listCoupon" scroll-y="true"
+							:style="{height:data.activity.length==1?'92px':(data.activity.length==2?'184px':'276px')}">
+							<view class="item" v-for="(item,index) in data.activity" :key="index">
+								<view class="left">
+									<text class="danwei">{{item.activity_type_name=='折扣券'?'':'￥'}}</text>
+									<text
+										class="AlibabaPuHuiTiBold">{{item.activity_type_name=='折扣券'?((Number(item.activity_value)*10)+'折'):item.activity_value}}</text>
+								</view>
+								<view class="right">
+									{{item.activity_type_name}}
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+					<view class="couponButton" @click="submitActivity">
+						<c-lottie ref="cLottieRef" src='/static/lottie/couponButton.json' width="305px"
+							height='86px'></c-lottie>
+					</view>
+				</view>
+			</transition>
+		</view>
+	</uni-popup>
+	<view class="popup">
+		<uni-popup ref="popup" type="bottom" border-radius="10px 10px 0 0" mask-background-color="rgb(0 0 0 / 70%)">
+			<view class="dialog-container">
+				<view class="top">
+					<view>亲~您还有福利</view>
+					<view>真的要放弃优惠吗？</view>
+				</view>
+				<view class="content">
+					<div class="title-box">
+						<image class="decorative-line" src="/static/image/recharge/dialogTitleLeft.png" mode=""></image>
+						<text class="title">您可享以下权益</text>
+						<image class="decorative-line" src="/static/image/recharge/dialogTitleRight.png" mode="">
+						</image>
+					</div>
+					<view class="vip-benefits">
+						<view class="benefit-item" v-for="(benefit,index) in dialogVipBenefits" :key="index">
+							<image class="img" :src="benefit.url" mode=""></image>
+							<view class="name">
+								{{benefit.name}}
+							</view>
+						</view>
+					</view>
+					<view class="timeDJS" v-if="data.active_id">
+						<view class="titles">距离优惠结束</view>
+						<uni-countdown :font-size="14" :day="data.activeCoupon2.days" :hour="data.activeCoupon2.hours"
+							:minute="data.activeCoupon2.minutes" :second="data.activeCoupon2.seconds" color="#FFFFFF"
+							background-color="#2A2617" />
+					</view>
+					<view class="button-box">
+						<view class="button" @click="activateVip('back')">
+							开通会员
+						</view>
+						<text class="leave" @click="back">去意已决</text>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+	<uni-popup ref="myCoupon" type="bottom" :safeArea="false" border-radius="10px 10px 0 0"
+		mask-background-color="rgb(0,0,0,0.8)">
+		<view class="myCouponContainer" :style="{height:proxy.$system=='iOS'?'400px':'370px'}">
+			<scroll-view scroll-y="true" class="myCouponBox">
+				<view>
+					<view class="item" v-for="(item,index) in data.myActivity" :key="index"
+						@click="(data.goods.price<(Number(item.threshold)/100)&&item.threshold!='')||!item.isStatus?'':setActiveId(item)">
+						<view class="left"
+							:class="{left2:data.goods.price<(Number(item.threshold)/100)||!item.isStatus}">
+							<view class="money">
+								<text v-if="item.coupon_type_name!='折扣券'">￥</text>
+								<text
+									class="moneys">{{item.coupon_type_name!='折扣券'?(Number(item.coupon_value)/100):((Number(item.coupon_value)*10)+'折')}}</text>
+							</view>
+							<view class="dec">
+								{{item.threshold!=''?('满'+(Number(item.threshold)/100)+'可用'):'无门槛'}}
+							</view>
+						</view>
+						<view class="right">
+							<view class="titlebox">
+								<view class="title">{{item.coupon_name}}</view>
+								<view class="dec">有效期至{{item.expire_time}}</view>
+							</view>
+							<image
+								v-if="(data.goods.price<(Number(item.threshold)/100)&&item.threshold!='')||!item.isStatus"
+								class="checkedImg" src="/static/image/recharge/checked1.png" mode=""></image>
+							<image v-else-if="data.active_ids==item.id" class="checkedImg"
+								src="/static/image/recharge/checked3.png" mode=""></image>
+							<image v-else class="checkedImg" src="/static/image/recharge/checked2.png" mode=""></image>
+						</view>
+						<view class="jjdq" v-if="isToday(item.expire_times)">
+							即将到期
+						</view>
+						<view class="ygq" v-if="!item.isStatus">
+							已过期
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="btn" @click="activeClick(true)">
+				确定
+			</view>
+			<image @click="activeClick(false)" class="myCouponContainerClose"
+				src="/static/image/recharge/myCouponContainerClose.png" mode=""></image>
+		</view>
+	</uni-popup>
+</template>
+
+
+<script setup>
+	import SnowEffect from '@/components/snow-effect/snow-effect.vue';
+	import ZdyNavbar from "@/components/navbar/navbar.vue"
+	import Card from "@/components/card/iconFontCard/iconFontCard.vue"
+	import IconFont from "@/components/iconfont/iconfont.vue"
+	import Popup from "@/components/popup/popup.vue"
+	import Button from "@/components/button/button.vue"
+	import customTab from "@/components/custom-tab/custom-tab.vue"
+	import countUp from "@/components/countUp/countUp.vue"
+	import EditConfirmPrompt from "@/components/editConfirmPrompt/editConfirmPrompt.vue"
+	import {
+		postJson
+	} from "@/static/js/requests.js"
+	import {
+		ref,
+		reactive,
+		getCurrentInstance,
+		watch,
+		nextTick,
+		toRefs
+	} from "vue";
+	import {
+		onLoad,
+		onShow,
+		onReady,
+		onPullDownRefresh,
+		onReachBottom,
+		onBackPress,
+		onUnload
+	} from "@dcloudio/uni-app";
+	const {
+		appContext,
+		proxy
+	} = getCurrentInstance();
+	const popup = ref();
+	const coupon = ref();
+	const couponBox = ref();
+	const myCoupon = ref();
+	const dialogVipBenefits = [{
+			name: "模拟微信",
+			url: "/static/image/recharge/moniweixinDialog.png"
+		},
+		{
+			name: "无广告",
+			url: "/static/image/recharge/wuguanggaoDialog.png"
+		},
+		{
+			name: "无水印",
+			url: "/static/image/recharge/wushuiyinDialog.png"
+		},
+		{
+			name: "专属客服",
+			url: "/static/image/recharge/zhuanshukefuDialog.png"
+		}
+	]
+
+	// 套餐列表
+	const packageList = [{
+			name: "连续包月",
+			delPrice: "89",
+			price: "29",
+			lifespan: "一月"
+		},
+		{
+			name: "连续包季",
+			delPrice: "189",
+			price: "98",
+			lifespan: "一季"
+		},
+		{
+			name: "连续包年",
+			delPrice: "365",
+			price: "198",
+			lifespan: "一年"
+		}
+	]
+
+	const data = reactive({
+		scrollLeft: 0,
+		active_id: 0,
+		active_ids: 0,
+		activeitems: {},
+		coupon: true,
+		currentUrl: '',
+		background: ['color1', 'color2', 'color3'],
+		indicatorDots: false,
+		autoplay: false,
+		interval: 5000,
+		duration: 500,
+		// 底部按钮文字
+		buttonText: '',
+		// 套餐选择
+		selected: 1,
+		// 支付方式选择
+		paymentMethod: "wxpay",
+		// banner列表
+		bannerList: [{
+			url: "/static/image/recharge/banner1.png"
+		}],
+		// 会员权益列表
+		benefitList: [{
+				name: "无广告",
+				url: "/static/image/recharge/icon1.png"
+			},
+			{
+				name: "无水印",
+				url: "/static/image/recharge/icon2.png"
+			},
+			{
+				name: "微信模拟",
+				url: "/static/image/recharge/icon3.png"
+			},
+			{
+				name: "小宝模拟",
+				url: "/static/image/recharge/icon4.png"
+			},
+			{
+				name: "机票",
+				url: "/static/image/recharge/icon5.png"
+			},
+			{
+				name: "高铁票",
+				url: "/static/image/recharge/icon6.png"
+			},
+			{
+				name: "工资单",
+				url: "/static/image/recharge/icon7.png"
+			},
+			{
+				name: "群聊",
+				url: "/static/image/recharge/icon8.png"
+			},
+			{
+				name: "豪车模拟",
+				url: "/static/image/recharge/icon9.png"
+			},
+			{
+				name: "模拟来电",
+				url: "/static/image/recharge/icon10.png"
+			},
+			{
+				name: "多设备",
+				url: "/static/image/recharge/icon11.png"
+			},
+			{
+				name: "其他权益",
+				url: "/static/image/recharge/icon12.png"
+			}
+		],
+		goodsList: [],
+		myActivity: [],
+		activeCoupon: {},
+		activeCoupon2: {},
+		uni_recharge_back: [],
+		goods: {},
+		activity: [],
+		appUser: {},
+		countdown: true,
+		isBack: true,
+		payList: [{
+				image: '/static/image/recharge/wxpay.png',
+				name: '微信支付',
+				type: 'wxpay'
+			},
+			{
+				image: '/static/image/recharge/alipay.png',
+				name: '支付宝支付',
+				type: 'alipay',
+			}
+		],
+		open_number: 1,
+		back_number: 1,
+		price: 0,
+		coupon: 0,
+		ishongBao: false,
+		incrementTimer: null,
+		timeout: null,
+		isChristmas: false,
+		// 添加一个标志位来防止快速连续点击导致的价格显示错误
+		isProcessingClick: false,
+		banner: '/static/image/recharge/banner1.png',
+		iosPayment: "app",
+		isCombo:false
+	})
+
+	let {
+		buttonText,
+		selected,
+		benefitList,
+		noticeList,
+		commentList,
+		paymentMethod
+	} = toRefs(data)
+
+	/**
+	 * 返回监听
+	 */
+	onBackPress((e) => {
+		if (e.from == 'backbutton' && data.appUser.vip == 1) {
+			open()
+			return true; //阻止返回
+		}
+	})
+
+
+	onLoad(async () => {
+		const config = uni.getStorageSync('config').config
+		const themeConfig = config?.['client.uniapp.theme']
+		if (themeConfig?.enable) {
+			if (themeConfig?.theme == '0214') {
+				data.banner = '/static/image/recharge/214/bannar.png'
+				// })
+			} else if (themeConfig?.theme == '0217') {
+				data.banner = '/static/image/recharge/chunjie/bannar.png'
+			}
+		}
+		let pages = getCurrentPages();
+		let currentPage = pages[pages.length - 1];
+		data.currentUrl = proxy.$pageData[currentPage.route];
+		uni.showLoading({
+			title: '加载中',
+			mask: true // 添加遮罩防止用户操作
+		});
+		let user = await proxy.$requestPromise({
+			url: 'api/user',
+			method: "GET",
+			data: {}
+		})
+		if (user.code == 0) {
+			data.appUser = user.data
+		}
+		let goods = await proxy.$requestPromise({
+			url: 'api/order/goods',
+			method: "GET",
+			data: {
+				type: "member"
+			}
+		})
+		console.log(goods)
+		if (goods.code == 0) {
+			data.goodsList = goods.data
+
+			let zsItem = goods.data[0]
+			let zsIndex = 0
+			let checked = true
+			goods.data.forEach((item, index) => {
+				if (item.checked && checked) {
+					checked = false
+					zsItem = item
+					zsIndex = index
+				}
+			})
+			nextTick(() => {
+				setTimeout(() => {
+					data.scrollLeft = zsIndex * 120
+				}, 100)
+			})
+			let activity = await proxy.$requestPromise({
+				url: 'api/activity/coupon',
+				method: "GET",
+				data: {
+					page: 1,
+					size: 50,
+					status: 1
+				}
+			})
+			if (activity.data.total != 0) {
+				activity.data.items.forEach(item => {
+					if (new Date(item.expire_time) < new Date()) {
+						item['isStatus'] = false
+					} else {
+						item['isStatus'] = true
+					}
+					item['expire_times'] = item.expire_time
+					item.expire_time = item.expire_time.replace('-', '.').replace('-', '.').substring(
+						0, 10)
+				})
+				data.myActivity = [
+					...activity.data.items.filter(item => (item.threshold == '' || zsItem.price >= (Number(
+						item
+						.threshold) / 100)) && item.isStatus),
+					...activity.data.items.filter(item => (zsItem.price < (Number(item.threshold) / 100) &&
+						item
+						.threshold != '') || !item.isStatus)
+				]
+				data.myActivity = deduplicateKeepLast(data.myActivity)
+			}
+			await onSelect(zsItem, zsIndex)
+		}
+		let activity = await proxy.$requestPromise({
+			url: 'api/activity',
+			method: "GET",
+			data: {
+				scene: 'uni_open_recharge'
+			}
+		})
+		data.activity = activity.data
+		if (activity.data.length != 0) {
+			coupon.value.open()
+		}
+		uni.setStorageSync('open_number', data.open_number + 1);
+		let uni_recharge_back = await proxy.$requestPromise({
+			url: 'api/activity',
+			method: "GET",
+			data: {
+				scene: 'uni_recharge_back'
+			}
+		})
+		data.uni_recharge_back = uni_recharge_back.data
+		if (uni_recharge_back.data.length == 0) {
+			data.isBack = false
+		}
+		uni.hideLoading();
+		if (uni.getStorageSync('onNativeEventReceive') != 'ok') {
+			uni.setStorageSync('onNativeEventReceive', "ok")
+			//监听宿主传递消息
+			uni.onNativeEventReceive((event, data) => {
+				if (event) {
+					if (event == "wx_pay_result") {
+						if (Number(data) == 0) {
+							paymentResult(uni.getStorageSync('orderId'), paymentMethod.value)
+						} else {
+							uni.hideLoading();
+							uni.showToast({
+								icon: 'none',
+								title: '支付失败'
+							})
+						}
+					}
+					if (event == "ios_pay_result") {
+						if (Number(data) == 0) {
+							paymentResult(uni.getStorageSync('orderId'), paymentMethod.value)
+						} else {
+							uni.hideLoading();
+							uni.showToast({
+								icon: 'none',
+								title: '支付失败'
+							})
+						}
+					}
+					console.log('接收到宿主App消息-' + event + '：' + data);
+				}
+			})
+		}
+	})
+
+	onShow(async () => {
+		if(data.isCombo){
+			uni.showModal({
+				title: '提示',
+				content: '是否支付成功？',
+				cancelText:'未支付',
+				confirmText:"已支付",
+				success: function (res) {
+					if (res.confirm) {
+						console.log('用户点击确定');
+						paymentResult(uni.getStorageSync('orderId'), paymentMethod.value)
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
+			data.isCombo=false
+		}
+	})
+	onUnload(() => {
+
+	})
+	onReady(() => {
+		try {
+			if (plus.os.name === 'Android') {
+				let color = plus.android.newObject("android.graphics.Color");
+				let activity = plus.android.runtimeMainActivity();
+				let colorInt = plus.android.invoke(color, "parseColor", '#fff'); // 设置为橙色    
+				let window = plus.android.invoke(activity, "getWindow");
+				plus.android.invoke(window, "setNavigationBarColor", colorInt);
+				uni.setNavigationBarColor({
+					animation: { // 动画效果
+						duration: 100,
+						timingFunc: 'easeIn'
+					}
+				})
+				console.log("状态栏设置完毕！");
+				setTimeout(function() {
+					uni.setNavigationBarColor({
+						backgroundColor: '#fff',
+						animation: { // 动画效果
+							duration: 100,
+							timingFunc: 'easeIn'
+						}
+					})
+				}, 200);
+				setTimeout(function() {
+					plus.navigator.setStatusBarStyle("light");
+				}, 200);
+			}
+		} catch (error) {
+			//TODO handle the exception
+		}
+	})
+
+
+
+	function isToday(inputTime) {
+		// 获取当前日期的时间戳（去掉时分秒）
+		const today = new Date();
+		today.setHours(0, 0, 0, 0);
+		const todayTimestamp = today.getTime();
+
+		// 处理输入时间
+		const inputDate = new Date(inputTime);
+		inputDate.setHours(0, 0, 0, 0);
+		const inputTimestamp = inputDate.getTime();
+
+		// 比较时间戳
+		return inputTimestamp === todayTimestamp;
+	}
+
+	function calculateTimeRemaining(targetTime) {
+		// 获取目标时间和当前时间的时间戳
+		const target = new Date(targetTime).getTime();
+		const now = new Date().getTime();
+		// 计算时间差（毫秒）
+		const difference = target - now;
+		// 如果目标时间已过，返回0
+		if (difference <= 0) {
+			return {
+				days: 0,
+				hours: 0,
+				minutes: 0,
+				seconds: 0
+			};
+		}
+		// 计算天数
+		const days = Math.floor(difference / (1000 * 60 * 60 * 24));
+		// 计算剩余小时数
+		const hours = Math.floor((difference % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+		// 计算剩余分钟数
+		const minutes = Math.floor((difference % (1000 * 60 * 60)) / (1000 * 60));
+		// 计算剩余秒数
+		const seconds = Math.floor((difference % (1000 * 60)) / 1000);
+		console.log({
+			days: days,
+			hours: hours,
+			minutes: minutes,
+			seconds: seconds
+		})
+		return {
+			days: days,
+			hours: hours,
+			minutes: minutes,
+			seconds: seconds
+		};
+	}
+
+	function activeClick(status) {
+		myCoupon.value.close()
+		if (status && data.active_ids > 0) {
+			let item = data.activeitems
+			data.activeCoupon = {
+				...item,
+				...calculateTimeRemaining(item.expire_times)
+			}
+			data.countdown = false
+			setTimeout(() => {
+				data.countdown = true
+			}, 100);
+			data.active_id = item.id
+			setTimeout(() => {
+				setPrice(true)
+			}, 1000);
+		}
+	}
+
+	function setActiveId(item) {
+		data.active_ids = item.id
+		data.activeitems = item
+	}
+
+	function setPrice(status) {
+		console.log("setPrice")
+		if (data.incrementTimer) {
+			clearInterval(data.incrementTimer);
+			data.incrementTimer = null
+		}
+		if (data.timeout) {
+			clearInterval(data.timeout);
+			data.timeout = null
+		}
+		let oldPrice = Number(data.goods.origin_price)
+		data.price = Number(data.goods.origin_price)
+		console.log("开始", data.price)
+		let price = 0
+		let origin_price = 0
+		let coupon = 0
+		if (data.active_id == 0) {
+			price = Number(data.goods.price)
+			origin_price = Number(data.goods.origin_price)
+			coupon = origin_price - price
+		} else {
+			price = data.goods.price - (data.activeCoupon.coupon_type_name != '折扣券' ? (Number(data.activeCoupon
+					.coupon_value) /
+				100) : ((1 - Number(data.activeCoupon.coupon_value)) * data.goods.price))
+			coupon = (Number(data.goods.origin_price) - Number(data.goods.price)) + (Number(data.goods.price) - (data.goods
+				.price - (data.activeCoupon.coupon_type_name != '折扣券' ? (Number(data.activeCoupon.coupon_value) /
+					100) : ((
+					1 - Number(data.activeCoupon.coupon_value)) * data.goods.price))))
+		}
+		data.coupon = proxy.$toFiexd(coupon, 0)
+		if (status) {
+			if (data.active_id) {
+				data.ishongBao = true
+				data.timeout = setTimeout(() => {
+					data.ishongBao = false
+				}, 1500);
+			}
+			data.price = proxy.$toFiexd(price, 2)
+			if (false) {
+				// 修复关键点：计算合理的间隔时间
+				const priceDiff = Math.abs(oldPrice - price);
+				// 确保间隔在合理范围内（16ms-100ms）
+				let interval = 1000 / priceDiff;
+				if (interval < 16) interval = 16; // 不低于16ms
+				if (interval > 100) interval = 100; // 不高于100ms
+				if (!isFinite(interval)) interval = 16; // 处理除零
+				console.log(`间隔: ${interval}ms`);
+				data.incrementTimer = setInterval(() => {
+					if (oldPrice > price) {
+						if (Number(data.price) > price) {
+							if ((oldPrice - price) > 500) {
+								data.price -= 4
+							} else {
+								data.price -= 1
+							}
+						} else {
+							data.isProcessingClick = false
+							data.price = proxy.$toFiexd(price, 2)
+							clearInterval(data.incrementTimer);
+							data.incrementTimer = null
+						}
+					} else {
+						if (Number(data.price) < price) {
+							data.price = Number(data.price) + 1
+						} else {
+							data.isProcessingClick = false
+							data.price = proxy.$toFiexd(price, 2)
+							clearInterval(data.incrementTimer);
+							data.incrementTimer = null
+						}
+					}
+					console.log(data.price)
+				}, interval)
+			}
+
+		} else {
+			data.isProcessingClick = false
+			data.price = proxy.$toFiexd(price, 2)
+		}
+		console.log("最后", data.price)
+
+
+	}
+	/* 获取我的优惠券 */
+	async function getActivity() {
+		let activity = await proxy.$requestPromise({
+			url: 'api/activity/coupon',
+			method: "GET",
+			data: {
+				page: 1,
+				size: 50,
+				status: 1
+			}
+		})
+		if (activity.data.total != 0) {
+			activity.data.items.forEach(item => {
+				if (new Date(item.expire_time) < new Date()) {
+					item['isStatus'] = false
+				} else {
+					item['isStatus'] = true
+				}
+			})
+			activity.data.items.forEach(item => {
+				item['expire_times'] = item.expire_time
+				item.expire_time = item.expire_time.replace('-', '.').replace('-', '.').substring(0, 10)
+			})
+			data.myActivity = [
+				...activity.data.items.filter(item => (item.threshold == '' || data.goods.price >= (Number(item
+						.threshold) /
+					100) && item.isStatus)),
+				...activity.data.items.filter(item => (data.goods.price < (Number(item.threshold) / 100) && item
+					.threshold !=
+					'') || !item.isStatus)
+			]
+			data.myActivity = deduplicateKeepLast(data.myActivity)
+		}
+	}
+
+	function deduplicateKeepLast(arr, idKey = 'id') {
+		const map = new Map();
+
+		arr.forEach(item => {
+			const id = item[idKey];
+			map.set(id, item); // 总是设置最新的值
+		});
+
+		return Array.from(map.values());
+	}
+
+	/* 领取优惠券 */
+	async function submitActivity() {
+		console.log("activity_id");
+		let activity_id = ''
+		data.activity.forEach(item => {
+			activity_id += ',' + item.id
+		})
+		activity_id = activity_id.replace(',', '')
+		if (activity_id != "") {
+			console.log("activity_id", activity_id);
+			let activityRes = await postJson('q', 'api/activity', {
+				activity_id: activity_id //activity_id+"="
+			})
+			console.log(activityRes)
+			if (activityRes.code == 0) {
+				coupon.value.close()
+				uni.showToast({
+					icon: 'none',
+					title: '领取成功'
+				})
+				getActivity()
+			} else {
+				coupon.value.close()
+				uni.showToast({
+					icon: 'none',
+					title: '领取失败'
+				})
+			}
+		} else {
+			coupon.value.close()
+			uni.showToast({
+				icon: 'none',
+				title: '领取失败'
+			})
+		}
+
+	}
+	/**
+	 * @param {Object} item
+	 * @param {Object} index
+	 * 选择购买套餐
+	 */
+
+
+	/* 
+	防抖
+	*/
+	const debouncedOnSelect = debounce((items, index) => {
+		onSelect(items, index);
+	}, 200, false);
+
+	function debounce(func, wait, immediate = true) {
+		let timeout;
+		return function(...args) {
+			const later = () => {
+				timeout = null;
+				if (!immediate) func(...args);
+			};
+
+			const callNow = immediate && !timeout;
+			clearTimeout(timeout);
+			timeout = setTimeout(later, wait);
+
+			if (callNow) func(...args);
+		};
+	}
+	async function onSelect(items, index) {
+		data.active_id = 0
+		data.activeCoupon = {}
+		data.active_ids = 0
+		data.countdown = false
+		data.goods = items
+		console.log("选中商品", data.goods)
+		let id = 0
+		if (data.myActivity.length > 0) {
+			let defaultCoupon = data.myActivity.filter(item => item.activity_id == data.goods.default_activity)
+			if (defaultCoupon.length > 0) {
+				defaultCoupon.forEach(item => {
+					if ((data.goods.price >= (Number(item.threshold) / 100) || item.threshold == '') && item
+						.isStatus) {
+						item['price2'] = data.goods.price - (item.coupon_type_name != '折扣券' ? (Number(item
+								.coupon_value) /
+							100) : ((1 - Number(item.coupon_value)) * data.goods.price))
+					} else {
+						item['price2'] = 10000000
+					}
+				})
+				let maxItem = defaultCoupon.reduce((min, curr) => curr.price2 < min.price2 ? curr : min)
+				console.log("默认", maxItem)
+				if (maxItem.price2 != 10000000) {
+					id = maxItem.id
+					data.activeitems = maxItem
+					data.activeCoupon = {
+						...maxItem,
+						...calculateTimeRemaining(maxItem.expire_times)
+					}
+
+					console.log("data.activeCoupon", data.activeCoupon)
+				}
+			}
+			if (id == 0 && data.goods.default_activity != '') {
+				try {
+					data.myActivity.forEach(item => {
+						if ((data.goods.price >= (Number(item.threshold) / 100) || item.threshold == '') &&
+							item.isStatus) {
+							item['price2'] = data.goods.price - (item.coupon_type_name != '折扣券' ? (Number(item
+									.coupon_value) /
+								100) : ((1 - Number(item.coupon_value)) * data.goods.price))
+						} else {
+							item['price2'] = 10000000
+						}
+					})
+					let maxItem = data.myActivity.reduce((min, curr) => curr.price2 < min.price2 ? curr : min)
+					console.log("其他", maxItem)
+					if (maxItem.price2 != 10000000) {
+						id = maxItem.id
+						data.activeitems = maxItem
+						data.activeCoupon = {
+							...maxItem,
+							...calculateTimeRemaining(maxItem.expire_times)
+						}
+					}
+				} catch (error) {
+					console.log(error)
+					//TODO handle the exception
+				}
+			}
+		}
+		console.log(data.activeitems)
+		console.log(data.active_id)
+		data.active_id = id
+		data.active_ids = id
+		selected.value = index + 1
+		buttonText.value = `${items.price}元享受${items.goods_name}`
+		if (items.pay_type != '') {
+			let list = items.pay_type.split(',').filter(cell => cell == 'alipay' || cell == 'weixin')
+			if (list.length != 0) {
+				let listData = list.map(cell => {
+					return {
+						image: cell == 'weixin' ? '/static/image/recharge/wxpay.png' :
+							'/static/image/recharge/alipay.png',
+						name: cell == 'weixin' ? '微信支付' : '支付宝支付',
+						type: cell == 'weixin' ? 'wxpay' : 'alipay'
+					}
+				})
+				data.payList = listData
+			} else {
+				data.payList = [{
+						image: '/static/image/recharge/wxpay.png',
+						name: '微信支付',
+						type: 'wxpay'
+					},
+					{
+						image: '/static/image/recharge/alipay.png',
+						name: '支付宝支付',
+						type: 'alipay',
+					}
+				]
+			}
+		} else {
+			data.payList = [{
+					image: '/static/image/recharge/wxpay.png',
+					name: '微信支付',
+					type: 'wxpay'
+				},
+				{
+					image: '/static/image/recharge/alipay.png',
+					name: '支付宝支付',
+					type: 'alipay',
+				}
+			]
+		}
+		paymentMethod.value = data.payList[0].type
+		setTimeout(function() {
+			data.countdown = true
+		}, 100);
+		await setPrice(true)
+		await getActivity()
+
+	}
+	/**
+	 * @param {Object} value
+	 * 选择支付方式
+	 */
+	function onSelectPayment(value) {
+		paymentMethod.value = value
+	}
+
+	function open() {
+
+		uni.setStorageSync('back_number', data.back_number + 1);
+		// 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
+		if (!data.isBack) {
+			proxy.$apiUserEvent('all', {
+				type: "event",
+				key: "recharge_dialog",
+				value: "返回充值页弹窗",
+				extra: {
+					uni_version: proxy.$version
+
+				}
+			}, {
+				type: 'recharge_dialog',
+				data: {
+					uni_version: proxy.$version
+				}
+			})
+			data.activeCoupon2 = calculateTimeRemaining(data.activeCoupon.expire_times)
+			console.log("data.activeCoupon2: " + JSON.stringify(data.activeCoupon2));
+			popup.value.open('center')
+		} else {
+
+			data.isBack = false
+			data.activity = data.uni_recharge_back
+			data.coupon = false
+			coupon.value.open()
+
+		}
+	}
+
+	/**
+	 * 随机生成通知列表
+	 */
+	function generateNoticeList() {
+		noticeList.value = []
+		for (let i = 0; i <= 10; i++) {
+			noticeList.value.push({
+				user: `用户${generateMaskedPhoneNumber()}`,
+				time: generateNaturalTimeAgo(),
+				package: getRandomItem()
+			})
+		}
+	}
+	/**
+	 * 下单拉取支付
+	 */
+	async function activateVip(type = '') {
+		if (type == 'back') {
+			proxy.$apiUserEvent('all', {
+				type: "click",
+				key: "recharge_dialog_pay",
+				value: "返回弹窗页开通会员按钮",
+				extra: {
+					uni_version: proxy.$version
+				}
+			}, {
+				type: 'recharge_dialog_pay',
+				data: {
+					uni_version: proxy.$version
+				}
+			})
+		}
+		uni.showLoading({
+			title: '支付中',
+			mask: true // 添加遮罩防止用户操作
+		});
+
+		uni.setStorageSync("UserEventOrder", {
+			"订单金额": data.goods.price + '元',
+			"订单名称": data.goods.goods_name,
+			"支付方式": paymentMethod.value == "wxpay" ? '微信' : "支付宝",
+		})
+		console.log('isCombo',uni.getStorageSync('isCombo'))
+		let isComBo=uni.getStorageSync('isCombo')=='ok'  
+					
+		let paymentRes = await postJson('a', 'api/order', {
+			goods_id: data.goods.goods_id,
+			coupon: data.active_id ? data.active_id : '',
+			pay_type: paymentMethod.value == "wxpay" ? (data.goods.weixinMpOriId&&isComBo?'combo':'weixin') : "alipay",
+			"pay_source": "app",
+			source: "uni_wx",
+		})
+		if (paymentRes.code == 0) {
+			let payData = {}
+			if (paymentMethod.value == "wxpay") {
+				if(data.goods.weixinMpOriId&&isComBo){
+					console.log(paymentRes)
+					let SZappData={
+						weixinMpOriId:data.goods.weixinMpOriId,
+						outTradeNo:paymentRes.data.outTradeNo
+					}
+					uni.setStorageSync('orderId', paymentRes.data.orderId)
+					uni.sendNativeEvent('start_combo_pay',SZappData , ret => {
+						console.log('宿主App回传的数据：' + ret);
+					});
+					data.isCombo=true
+					uni.hideLoading();
+					return 
+				}else{
+					payData = {
+						"appid": paymentRes.data.appId, // 应用ID
+						"noncestr": paymentRes.data.nonceStr, // 随机字符串
+						"package": "Sign=WXPay", // 固定值
+						"partnerid": paymentRes.data.partnerId, // 商户号
+						"prepayid": paymentRes.data.prepayId, // 预支付交易会话ID
+						"timestamp": Number(paymentRes.data.timeStamp), // 时间戳（秒！）
+						"sign": paymentRes.data.sign // 签名
+					}
+					uni.setStorageSync('orderId', paymentRes.data.orderId)
+					//安卓wx支付开始传递开始
+					if (proxy.$system != 'iOS') {
+						uni.sendNativeEvent('wx_pay_start', paymentRes.data.orderId, ret => {
+							console.log('宿主App回传的数据：' + ret);
+						});
+					}
+				}
+				
+
+			} else {
+				payData = paymentRes.data.payParam
+				uni.setStorageSync('orderId', paymentRes.data.orderId)
+			}
+			// ios 支付由宿主处理 
+			if (proxy.$system == 'iOS') {
+				setTimeout(() => {
+					uni.hideLoading();
+				}, 30000);
+				uni.sendNativeEvent('paymentResData', JSON.stringify(paymentRes.data), ret => {
+					console.log('宿主App回传的数据：' + ret);
+				});
+				return
+			}
+			uni.requestPayment({
+				provider: paymentMethod.value,
+				orderInfo: payData, //支付宝订单数据
+				success: function(resss) {
+					setTimeout(() => {
+						uni.hideLoading();
+					}, 30000);
+					paymentResult(paymentRes.data.orderId, paymentMethod.value)
+				},
+				fail: function(err) {
+					proxy.$apiUserEvent('all', {
+						type: "event",
+						key: "pay_fail",
+						value: "支付失败",
+						extra: {
+							from: data.currentUrl,
+							"订单号": paymentRes.data.orderId,
+							"订单金额": data.goods.price + '元',
+							"订单名称": data.goods.goods_name,
+							"支付方式": paymentMethod.value == "wxpay" ? '微信' : "支付宝",
+							"原因": JSON.stringify(err),
+						}
+					}, {
+						type: 'pay_fail',
+						data: {
+							from: data.currentUrl,
+							"订单号": paymentRes.data.orderId,
+							"订单金额": data.goods.price + '元',
+							"订单名称": data.goods.goods_name,
+							"支付方式": paymentMethod.value == "wxpay" ? '微信' : "支付宝",
+							"原因": JSON.stringify(err),
+						}
+					})
+					uni.hideLoading();
+					uni.showToast({
+						icon: 'none',
+						title: '支付失败'
+					})
+				}
+			});
+		} else {
+			uni.hideLoading();
+			uni.showToast({
+				icon: 'none',
+				title: '支付失败'
+			})
+		}
+		setTimeout(() => {
+			uni.hideLoading();
+		}, 10000);
+	}
+
+
+	// 支付状态轮询函数
+	async function paymentResult(orderId, paytype) {
+		uni.hideLoading();
+		uni.showLoading({
+			title: '会员发放排队中，正在实时向服务器索要，请耐心等待。',
+			mask: true
+		});
+
+		let attempts = 0;
+		const maxAttempts = 10;
+		const pollInterval = 1000;
+
+		const poll = async () => {
+			try {
+				let orderInfo = await proxy.$requestPromise({
+					url: 'api/order',
+					method: "GET",
+					data: {
+						order_id: orderId
+					}
+				});
+
+				console.log("订单状态：", orderInfo);
+
+				if (orderInfo.code == 0 && orderInfo.data.status == 2) {
+					// 支付成功
+					uni.sendNativeEvent('pay_success', paymentMethod.value, ret => {
+						console.log('宿主App回传的数据：' + ret);
+					});
+
+					proxy.$apiUserEvent('all', {
+						type: "event",
+						key: "pay_success",
+						value: "支付成功",
+						extra: {
+							from: data.currentUrl,
+							"订单号": orderId,
+							"订单金额": data.goods.price + '元',
+							"订单名称": data.goods.goods_name,
+							"支付方式": paymentMethod.value == "wxpay" ? '微信' : "支付宝",
+						}
+					}, {
+						type: 'pay_success',
+						data: {
+							from: data.currentUrl,
+							"订单号": orderId,
+							"订单金额": data.goods.price + '元',
+							"订单名称": data.goods.goods_name,
+							"支付方式": paymentMethod.value == "wxpay" ? '微信' : "支付宝",
+						}
+					});
+
+					// 修复：这里应该用赋值操作，原代码缺少等号
+					data.appUser.vip = 2;
+
+					// 刷新用户数据
+					await proxy.$getUserInfo();
+					uni.hideLoading();
+					uni.showToast({
+						title: '支付成功',
+						icon: 'success',
+						duration: 2000
+					});
+
+					setTimeout(() => {
+						uni.navigateBack();
+					}, 1000);
+
+					return; // 成功时停止轮询
+				}
+
+				// 检查是否达到最大尝试次数
+				if (attempts >= maxAttempts) {
+					uni.hideLoading();
+					uni.showToast({
+						title: '查询超时，请稍后查看',
+						icon: 'none',
+						duration: 3000
+					});
+					return;
+				}
+
+				// 继续轮询
+				attempts++;
+				setTimeout(poll, pollInterval);
+
+			} catch (error) {
+				console.error("轮询请求出错:", error);
+
+				// 错误时也检查尝试次数
+				if (attempts >= maxAttempts) {
+					uni.hideLoading();
+					uni.showToast({
+						title: '网络错误，请稍后查看订单状态',
+						icon: 'none',
+						duration: 3000
+					});
+					return;
+				}
+
+				attempts++;
+				setTimeout(poll, pollInterval);
+			}
+		};
+
+		// 开始轮询
+		poll();
+	}
+
+	// 随机抽取一个元素
+	function getRandomItem() {
+		const list = ['月度会员', '季度会员', '年度会员'];
+		const randomIndex = Math.floor(Math.random() * list.length);
+		return list[randomIndex];
+	}
+
+	/**
+	 * 随机生成时间提示语
+	 */
+	function generateNaturalTimeAgo() {
+		const weights = [{
+				range: [1, 30],
+				weight: 30,
+				unit: '分钟'
+			}, // 1-30分钟，权重30%
+			{
+				range: [31, 60],
+				weight: 15,
+				unit: '分钟'
+			}, // 31-60分钟，权重15%
+			{
+				range: [1, 3],
+				weight: 10,
+				unit: '小时'
+			}, // 1-3小时，权重10%
+			{
+				range: [4, 12],
+				weight: 10,
+				unit: '小时'
+			}, // 4-12小时，权重10%
+			{
+				range: [1, 2],
+				weight: 10,
+				unit: '天'
+			}, // 1-2天，权重10%
+			{
+				range: [3, 7],
+				weight: 10,
+				unit: '天'
+			}, // 3-7天，权重10%
+			{
+				range: [1, 4],
+				weight: 10,
+				unit: '周'
+			}, // 1-4周，权重10%
+			{
+				range: [1, 3],
+				weight: 3,
+				unit: '个月'
+			}, // 1-12个月，权重3%
+			{
+				range: [4, 12],
+				weight: 2,
+				unit: '个月'
+			} // 1-12个月，权重2%
+		];
+
+		// 计算总权重
+		const totalWeight = weights.reduce((sum, item) => sum + item.weight, 0);
+		let random = Math.random() * totalWeight;
+		let selected;
+
+		// 根据权重选择时间范围
+		for (const item of weights) {
+			random -= item.weight;
+			if (random <= 0) {
+				selected = item;
+				break;
+			}
+		}
+
+		// 在选中的范围内生成随机值
+		const [min, max] = selected.range;
+		const amount = Math.floor(Math.random() * (max - min + 1)) + min;
+
+		return `${amount}${selected.unit}前`;
+	}
+
+	/**
+	 * 随机生成电话号码
+	 */
+	function generateMaskedPhoneNumber() {
+		// 常见手机号段
+		const prefixes = [
+			'130', '131', '132', '133', '134', '135', '136', '137', '138', '139',
+			'145', '146', '147', '148', '149',
+			'150', '151', '152', '153', '155', '156', '157', '158', '159',
+			'165', '166', '167', '168',
+			'170', '171', '172', '173', '174', '175', '176', '177', '178',
+			'180', '181', '182', '183', '184', '185', '186', '187', '188', '189',
+			'191', '198', '199'
+		];
+
+		// 随机选择号段
+		const prefix = prefixes[Math.floor(Math.random() * prefixes.length)];
+
+		// 生成完整的11位号码
+		let fullNumber = prefix;
+		for (let i = 0; i < 11 - prefix.length; i++) {
+			fullNumber += Math.floor(Math.random() * 10);
+		}
+
+		// 对中间4位进行掩码处理：前3位 + **** + 后4位
+		return fullNumber.replace(/(\d{3})(\d{4})(\d{4})/, '$1****$3');
+	}
+
+
+	/**
+	 * 返回
+	 */
+	function back() {
+		proxy.$apiUserEvent('all', {
+			type: "click",
+			key: "recharge_dialog_cancel",
+			value: "去意已决",
+			extra: {
+				uni_version: proxy.$version
+
+			}
+		}, {
+			type: 'recharge_dialog_cancel',
+			data: {
+				uni_version: proxy.$version
+			}
+		})
+		uni.navigateBack();
+	}
+
+	function Complete() {
+		data.coupon = false
+		console.log("播放完成");
+	}
+
+	function shouldBeTrue(obj) {
+		// 情况1: 没有 features 字段 → 返回 true
+		if (!('features' in obj)) {
+			return false;
+		}
+
+		// 情况2: features 字段存在但为空或 undefined → 返回 true
+		if (!obj.features) {
+			return false;
+		}
+
+		// 情况3: features 字段包含 alipay → 返回 true
+		if (obj.features.includes('alipay')) {
+			return false;
+		}
+
+		// 情况4: 有 features 字段且不包含 alipay → 返回 false
+		return true;
+	}
+</script>
+
+<style lang="scss" scoped>
+	.couponBox {
+		width: 375px;
+		height: 450px;
+		position: relative;
+		z-index: 1;
+
+		.shadowBg {
+			position: absolute;
+			width: 750px;
+			height: 750px;
+			left: -187.5px;
+			top: -240px;
+			z-index: -1;
+		}
+
+		.listCoupon {
+			position: absolute;
+			width: 244px;
+			height: 276px;
+			left: 65.5px;
+			top: 157px;
+			overflow: hidden;
+			overflow-y: scroll;
+
+			.item {
+				position: relative;
+				width: 244px;
+				height: 74px;
+				background-image: url('/static/image/recharge/couponItemBg.png');
+				box-shadow: 0px 0px 14px 0px rgba(255, 255, 255, 0.5);
+				background-repeat: no-repeat;
+				background-size: 244px 74px;
+				margin-top: 18px;
+				display: flex;
+				align-items: center;
+				color: #fff;
+
+				.left {
+					width: 100px;
+					display: flex;
+					align-items: flex-end;
+					justify-content: center;
+					font-size: 22px;
+
+					.AlibabaPuHuiTiBold {
+						font-size: 32px;
+					}
+
+					.danwei {
+						margin-left: 11px;
+					}
+				}
+
+				.right {
+					text-align: center;
+					width: 144px;
+					font-size: 24px;
+					font-weight: bold;
+				}
+
+				.tips {
+					text-align: center;
+					line-height: 30px;
+					position: absolute;
+					width: 70px;
+					height: 30px;
+					background-image: url('/static/image/recharge/couponItemTips.png');
+					background-repeat: no-repeat;
+					background-size: 70px 30px;
+					right: 7px;
+					top: -14px;
+					color: #F97902;
+					font-size: 11px;
+				}
+			}
+		}
+
+		.header {
+			height: 198px;
+			background-image: url('/static/image/recharge/couponHeaderBg.png');
+			background-repeat: no-repeat;
+			background-size: 375px 198px;
+			z-index: 2;
+		}
+
+		.couponConten {
+			width: 300px;
+			height: 252px;
+			background-color: #FEF5D8;
+			border-radius: 0 0 42px 42px;
+			margin-left: calc(74px / 2);
+			z-index: 2;
+		}
+
+		.colse {
+			position: absolute;
+			right: 36px;
+			top: 36px;
+			width: 18px;
+			height: 20px;
+			z-index: 4;
+		}
+
+		.couponTop {
+			position: absolute;
+			width: 375px;
+			height: 390px;
+			left: 0;
+			top: -145px;
+			z-index: 3;
+		}
+	}
+
+	.couponButton {
+		position: relative;
+		margin-top: 37px;
+		width: 305px;
+		height: 86px;
+		margin-left: calc(50% - 152.5px);
+		z-index: 4 !important;
+	}
+
+	.page-container {
+		background-color: #F7F7F7;
+		padding-bottom: 240rpx;
+		padding-bottom: calc(240rpx + constant(safe-area-inset-bottom)) !important;
+		padding-bottom: calc(240rpx + env(safe-area-inset-bottom)) !important;
+
+		.package-items-box {
+			width: 100vw;
+			// background: linear-gradient(to bottom, #FFFFFF, #F7F7F7);
+		}
+
+		.package-items-container {
+			display: flex;
+			padding: 20rpx 32rpx;
+
+			.active-package-item-tips {
+				position: absolute;
+				content: '限时优惠';
+				top: -8px;
+				left: 14px;
+				font-size: 20rpx;
+				color: #FFFFFF;
+				height: 44rpx;
+				width: 112rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				border-radius: 12px 12px 12px 0;
+				background: linear-gradient(200deg, #FFCCA8 0%, #ff0000 100%);
+
+			}
+
+			.active-package-item::after {
+				content: "";
+				position: absolute;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				width: 88%;
+				background-color: initial;
+				border-radius: 25%;
+				z-index: 0;
+				height: 1px;
+				margin: auto;
+				border-radius: 10%;
+				// box-shadow: 0px 2px 10px 1px #b1b1b1;
+			}
+
+			.package-item {
+				flex-shrink: 0;
+				box-sizing: border-box;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+				width: 184rpx;
+				height: 280rpx;
+				background-image: url("/static/image/recharge/packagItemBg.png");
+				background-size: cover;
+				margin-right: 40rpx;
+				padding: 54rpx 0 0 0;
+				transition: width 0.2s, background-image 0.2s;
+
+				// overflow: hidden;
+				.top {
+
+					padding-left: 26rpx;
+					font-size: 24rpx;
+
+					.title {
+						font-size: 24rpx;
+						font-weight: 500;
+						color: #1A1A1A;
+					}
+
+					.del-text {
+						color: #767676;
+						text-decoration: line-through;
+					}
+				}
+
+				.price-box {
+					padding-left: 26rpx;
+					font-family: 'WeChatSansStd';
+					font-size: 30rpx;
+
+					.price {
+						font-size: 64rpx;
+					}
+				}
+
+				.shen {
+					text-align: center;
+					width: 184rpx;
+					height: 24px;
+					color: #AAAAAA;
+					font-size: 12px;
+					line-height: 24px;
+					font-weight: bold;
+					white-space: nowrap;
+				}
+			}
+
+			.active-package-item {
+				position: relative;
+				width: 240rpx !important;
+				height: 280rpx !important;
+				background-image: url("/static/image/recharge/activePackagItemBg.png") !important;
+				background-position: center;
+				/* 居中显示图片 */
+				background-repeat: no-repeat;
+
+				/* 防止图片重复 */
+				.shen {
+					width: 240rpx !important;
+					color: #D86C24;
+				}
+
+			}
+		}
+
+		.vip-benefits-container {
+			position: relative;
+			background-color: #FFFFFF;
+			border-radius: 12px 12px 12px 12px;
+			overflow: hidden;
+			margin: -73px 32rpx 24rpx 32rpx;
+			background: linear-gradient(to bottom, rgba(0, 0, 0, 0), #fff);
+
+			.content {
+				margin-top: -4px;
+				padding: 16px 0px 0 0;
+				display: flex;
+				justify-content: space-between;
+				flex-wrap: wrap;
+				align-items: center;
+				background-color: #FFFFFF;
+
+				.benefit-item {
+					width: 25%;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+					margin-bottom: 16px;
+
+					.img {
+						width: 76rpx;
+						height: 76rpx;
+					}
+
+					.name {
+						font-size: 10px;
+						margin-top: 16rpx;
+					}
+				}
+
+			}
+		}
+
+
+
+
+
+	}
+
+	@keyframes vertical-scroll {
+		from {
+			transform: translateY(100%);
+		}
+
+		to {
+			transform: translateY(-100%);
+		}
+	}
+
+	.footer-container {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #FFFFFF;
+		box-shadow: 0px 4px 10px 0px rgba(0, 0, 0, 0.3);
+		padding: 16rpx 32rpx;
+		padding-top: 40rpx;
+		padding-bottom: constant(safe-area-inset-bottom); // 兼容 IOS<11.2 
+		padding-bottom: env(safe-area-inset-bottom); // 兼容 IOS>11.2
+
+		.payment-method-box {
+			display: flex;
+			justify-content: space-around;
+			align-items: center;
+			padding-bottom: 32rpx;
+
+			.payment-method {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				.img-select {
+					flex-shrink: 0 !important;
+					height: 16px;
+					width: 16px;
+					border-radius: 50%;
+				}
+
+				.logo {
+					width: 36rpx;
+					height: 36rpx;
+					margin-right: 10rpx;
+					margin-left: 18rpx;
+				}
+
+				.name {
+					color: #767676;
+					font-size: 24rpx;
+				}
+			}
+		}
+
+		.footerBottom {
+			width: 100%;
+			height: 20px;
+		}
+
+		.buttonBoxs {
+			width: 100%;
+			height: 104rpx;
+			background-image: url('/static/image/recharge/bottom-button.png');
+			background-position: center;
+			/* 居中显示图片 */
+			background-repeat: no-repeat;
+			/* 防止图片重复 */
+			background-size: cover;
+			position: relative;
+
+			.hongbao {
+				position: absolute;
+				left: 0;
+				bottom: -52rpx;
+			}
+		}
+
+		.christmas {
+			// background-image: url('/static/image/recharge/christmas/bottom-button.png');
+		}
+
+		.button-box {
+			display: flex;
+
+			.text {
+				flex: 1;
+				// color: text;
+				// text-align: center;
+				color: #ffffff;
+				// line-height: 104rpx;
+				font-size: 12px;
+				height: 104rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+
+				text {
+					color: red;
+				}
+
+				.price {
+					font-size: 24px;
+					color: red;
+				}
+			}
+
+			.button {
+				flex-shrink: 0;
+				opacity: 0;
+				text-align: center;
+				height: 104rpx;
+				width: 32%;
+			}
+		}
+	}
+
+	.dialog-container {
+		display: flex;
+		flex-direction: column;
+		width: 80vw;
+
+		.top {
+			flex-shrink: 0;
+			position: relative;
+			top: 1px;
+			box-sizing: border-box;
+			background-image: url('/static/image/recharge/dialogImg.png');
+			background-size: cover;
+			width: 80vw;
+			height: 260rpx;
+			color: #FFFFFF;
+			font-size: 32rpx;
+			line-height: 60rpx;
+			padding-left: 80rpx;
+			padding-top: 96rpx;
+		}
+
+		.content {
+			flex: 1;
+			flex-shrink: 0;
+			padding-bottom: 24rpx;
+			border-radius: 0 0 25px 25px;
+			background: linear-gradient(150deg, #fef9f0 0%, #FEF3E1 21%, #FFDDAF 100%);
+			// box-shadow: 10px 10px 15px #ffffff78;
+			box-shadow: 2px 5px 30px 5px #9f9f9f9e;
+
+			.title-box {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-top: 2px;
+
+				.title {
+					margin: 0 32rpx;
+				}
+
+				.decorative-line {
+					width: 68rpx;
+					height: 6rpx;
+				}
+			}
+
+			.timeDJS {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				margin-bottom: 15px;
+
+				.titles {
+					color: #FC3939;
+					font-size: 14px;
+					margin-right: 11px;
+				}
+			}
+
+			.vip-benefits {
+				display: flex;
+				justify-content: space-between;
+				margin: 24px 0;
+				padding: 0 32rpx;
+
+				.benefit-item {
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					align-items: center;
+
+					.img {
+						width: 90rpx;
+						height: 90rpx;
+					}
+
+					.name {
+						font-size: 26rpx;
+						margin-top: 18rpx;
+					}
+				}
+			}
+
+			.button-box {
+				margin: 0 44rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+				.button {
+					position: relative;
+					box-sizing: border-box;
+					text-align: center;
+					font-size: 20px;
+					border-radius: 50px;
+					height: 52px;
+					line-height: 52px;
+					color: #FFFFFF;
+					width: 100%;
+					background: linear-gradient(360deg, #4B3F30 0%, #181713 56%, #504834 100%);
+				}
+
+				/* .button::before {
+					position: absolute;
+					content: "限时优惠";
+					top: -10px;
+					right: -15px;
+					font-size: 0.625rem;
+					color: #FFFFFF;
+					height: 1.375rem;
+					width: 3.5rem;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					border-radius: 12px 12px 12px 0;
+					background: linear-gradient(200deg, #FFCCA8 0%, #ff0000 100%);
+				}
+ */
+				.leave {
+					color: #767676;
+					margin-top: 8px;
+				}
+			}
+		}
+
+	}
+
+	.back {
+		position: fixed;
+		top: 100rpx;
+		left: 36rpx;
+		z-index: 1;
+	}
+
+	.uni-margin-wrap::after {
+		// position: absolute;
+		// content: '';
+		// left: 0;
+		// bottom: -1px;
+		// width: 100%;
+		// height: 18px;
+		// background-color: #f7f7f7;
+		// border-radius: 16px 16px 0px 0px;
+	}
+
+	.uni-margin-wrap {
+		// position: relative;
+		height: auto;
+		width: 100%;
+		z-index: 0;
+
+		::v-deep .uni-swiper-dots-horizontal {
+			bottom: 60rpx;
+
+			.uni-swiper-dot {
+				width: 8rpx;
+				height: 8rpx;
+				background-color: #FFFFFF;
+				opacity: 0.5;
+				border-radius: 8rpx;
+			}
+
+			.uni-swiper-dot-active {
+				opacity: 1;
+				width: 24rpx;
+			}
+		}
+
+		.swiper {
+			height: 244px;
+		}
+
+		.swiper-item {
+			display: block;
+			height: 244px;
+			width: 100%;
+			text-align: center;
+		}
+
+		.swiper-list {
+			margin-top: 40rpx;
+			margin-bottom: 0;
+		}
+
+		.uni-common-mt {
+			margin-top: 60rpx;
+			position: relative;
+		}
+
+		.info {
+			position: absolute;
+			right: 20rpx;
+		}
+
+		.uni-padding-wrap {
+			width: 550rpx;
+			padding: 0 100rpx;
+		}
+
+	}
+
+
+
+	.placeholder {
+		// display: none;
+		// position: relative;
+		// background-color: #f7f7f7;
+		// width: 100%;
+		// border-radius: 1rem 1rem 0 0;
+		// left: 0;
+		// bottom: 30rpx;
+	}
+
+	/* 由小到大缩放动画 */
+	.animated-box {
+		animation: scaleIn 1s ease-out forwards;
+	}
+
+	/* 延迟动画 */
+	.scale-in-delay {
+		animation: scaleIn 0.5s ease-out 0.2s forwards;
+	}
+
+	/* 动画关键帧定义 */
+	@keyframes scaleIn {
+		0% {
+			transform: scale(0);
+			opacity: 0;
+		}
+
+		50% {
+			transform: scale(1.05);
+		}
+
+		100% {
+			transform: scale(1);
+			opacity: 1;
+		}
+	}
+
+	.iosQuestion {
+		.titleBox {
+			.image {
+				margin-top: 3px !important;
+			}
+		}
+	}
+
+	.question {
+		margin: 24rpx 32rpx;
+		padding: 17px 13px;
+		background-color: #FFFFFF;
+		border-radius: 10px 10px 10px 10px;
+
+		.titles {
+			text-align: center;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: bold;
+			font-size: 12px;
+			background-image: -webkit-linear-gradient(bottom, #6E430F, #1A1A1A);
+			-webkit-background-clip: text;
+			-webkit-text-fill-color: transparent;
+		}
+
+		.titleBox {
+			display: flex;
+			margin-top: 10px;
+
+			image {
+				width: 10px;
+				height: 10px;
+				margin-top: 1px;
+			}
+
+			.text {
+				margin-left: 5px;
+				width: calc(100% - 15px);
+				font-size: 11px;
+				color: #767676;
+			}
+
+			.text1 {
+				color: #AAAAAA;
+			}
+		}
+	}
+
+	.myCouponList {
+
+		margin: 24rpx 32rpx;
+		padding: 17px 13px;
+		height: 18px;
+		background-color: #FFFFFF;
+		border-radius: 10px 10px 10px 10px;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		overflow: hidden;
+
+		.left {
+			display: flex;
+			align-items: center;
+			font-weight: bold;
+
+			image {
+				width: 23px;
+				height: 17px;
+				margin-right: 8px;
+			}
+
+			.title {
+				margin-top: 3px;
+				display: inline-block;
+				/* 确保文字可以应用背景 */
+				background: linear-gradient(to right, #6E430F, #1A1A1A);
+				/* 从左到右的渐变 */
+				-webkit-background-clip: text;
+				/* 仅裁剪文本部分 */
+				color: transparent;
+				/* 文本颜色设置为透明，以显示背景渐变 */
+				font-size: 14px;
+				/* 根据需要调整字体大小 */
+			}
+
+			.money {
+				margin-top: 1px;
+				font-family: 'PingFangSC-Semibold';
+				font-weight: bold;
+				color: #FC3939;
+				font-size: 16px;
+			}
+		}
+
+		.right {
+			color: #767676;
+			font-size: 12px;
+			display: flex;
+			align-items: center;
+
+			.forward {
+				margin-left: 8px;
+			}
+
+			.forward2 {
+				margin: 0;
+			}
+
+			.timeBox {
+				.titles {
+					text-align: right;
+					color: #FC3939;
+					font-size: 10px;
+				}
+			}
+		}
+	}
+
+	.myCouponContainer {
+		width: calc(100% - 52px);
+		height: 400px;
+		background-image: url('/static/image/recharge/myCouponContainerBg.png');
+		background-size: 100% 100%;
+		background-repeat: no-repeat;
+		padding: 0 26px;
+		padding-top: 150px;
+		position: relative;
+
+		.myCouponContainerClose {
+			position: absolute;
+			width: 34px;
+			height: 34px;
+			top: -27px;
+			right: 16px;
+		}
+
+		.myCouponBox {
+			height: 282px;
+			overflow-y: scroll;
+
+			.item {
+				width: calc(100% - 12px);
+				height: 62px;
+				background-color: #fff;
+				border-radius: 8px 8px 8px 8px;
+				padding: 6px;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				margin-bottom: 12px;
+				position: relative;
+
+				.jjdq {
+					width: 52px;
+					height: 18px;
+					background: linear-gradient(194deg, #FFCCA8 0%, #FE3D32 100%);
+					position: absolute;
+					right: 0;
+					top: 0;
+					border-radius: 0 8px 0 8px;
+					color: #fff;
+					font-size: 10px;
+					text-align: center;
+					line-height: 18px;
+				}
+
+				.ygq {
+					width: 52px;
+					height: 18px;
+					background: #AAAAAA;
+					position: absolute;
+					right: 0;
+					top: 0;
+					border-radius: 0 8px 0 8px;
+					color: #fff;
+					font-size: 10px;
+					text-align: center;
+					line-height: 18px;
+				}
+
+				.left {
+					width: 110px;
+					height: 62px;
+					background: #FFEDED;
+					border-radius: 6px 6px 6px 6px;
+					text-align: center;
+
+					.money {
+						margin-top: 4px;
+						color: #FF3838;
+						font-size: 16px;
+
+						.moneys {
+							font-size: 28px;
+							font-weight: bold;
+						}
+					}
+
+					.dec {
+						margin-top: 1px;
+						color: #FF3838;
+						font-size: 11px;
+					}
+				}
+
+				.left2 {
+					background-color: #EDEDED;
+
+					.money {
+						color: #8A8A8A;
+					}
+
+					.dec {
+						color: #8A8A8A;
+					}
+				}
+
+				.right {
+					width: calc(100% - 126px);
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+					padding-right: 7px;
+
+					.titlebox {
+						.titlle {
+							margin-top: 13px;
+							color: #3D3D3D;
+							font-size: 16px;
+						}
+
+						.dec {
+							margin-top: 8px;
+							color: #AAAAAA;
+							font-size: 11px;
+						}
+					}
+
+					.checkedImg {
+						width: 26px;
+						height: 26px;
+					}
+				}
+			}
+		}
+
+		.btn {
+			margin-top: 18px;
+			height: 52px;
+			background: linear-gradient(360deg, #4B3F30 0%, #181713 56%, #504834 100%);
+			border-radius: 508px 508px 508px 508px;
+			text-align: center;
+			line-height: 52px;
+			color: #fff;
+			font-size: 20px;
+		}
+	}
+
+	.white-flow {
+		background: linear-gradient(-45deg, transparent, transparent, transparent, transparent, transparent, transparent, transparent, rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.2), transparent, transparent, transparent, transparent, transparent, transparent, transparent);
+		background-repeat: no-repeat;
+		background-size: 60% 100%;
+		animation: flow 2s infinite linear;
+	}
+
+	@keyframes flow {
+		0% {
+			background-position: -100% 0;
+		}
+
+		100% {
+			background-position: 200% 0;
+		}
+	}
+
+	::v-deep .uni-countdown-day {
+		width: auto !important;
+		color: #2A2617 !important;
+		/* 例如，将文字颜色改为红色 */
+		background-color: transparent !important;
+		margin-right: 0 !important;
+		padding-right: 0 !important;
+	}
+
+	::v-deep .uni-countdown-splitor-day {
+		margin-left: 0 !important;
+	}
+
+	.yanhua {
+		position: fixed;
+		top: 170px;
+		left: 15px;
+		z-index: 999999;
+	}
+	.vipContent{
+		background-color: #fff;
+		margin-left: 16px;
+		width: calc(100% - 32px);
+		border-radius: 16px;
+		margin-bottom: 20px;
+		.top{
+			image{
+				width: 100%;
+			}
+		}
+		.vipList{
+				display: flex;
+				flex-wrap: wrap;
+				padding: 10px;
+			.item{
+				width: 25%;
+				height: 75px;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: center;
+				image{
+					width: 38px;
+					height: 38px;
+				}
+				text{
+					margin-top:5px;
+					font-size: 10px;
+					color: #1A1A1A;
+					line-height: 15px;
+					text-align: center;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/static/image/recharge/vipContentTopBgImg.png b/static/image/recharge/vipContentTopBgImg.png
new file mode 100644
index 0000000..6a75e6d
Binary files /dev/null and b/static/image/recharge/vipContentTopBgImg.png differ