diff --git a/components/nav-bar/nav-bar.vue b/components/nav-bar/nav-bar.vue
index 921290b..1525ee8 100644
--- a/components/nav-bar/nav-bar.vue
+++ b/components/nav-bar/nav-bar.vue
@@ -1,9 +1,11 @@
 <template>
 	<view style="width: 100%;" :style="{ height: `calc(${data.statusBarHeight}px + 88rpx)` }">
-		<slot name="statusBar"></slot>
+		<!-- <slot name="statusBar"></slot> -->
 	</view>
 	<view class="nav-bar-container" :style="{ backgroundColor: bgColor, zIndex: zIndex }">
-		<view class="status-placeholder" :style="{ height: `${data.statusBarHeight}px` }"></view>
+		<view class="status-placeholder" :style="{ height: `${data.statusBarHeight}px` }">
+			<slot name="statusBar"></slot>
+		</view>
 		<view style="width: 100%;height: 88rpx;" @click="openPopup">
 			<slot>
 				<uni-nav-bar backgroundColor="#00000000" class="nav-bar" :border="false" :title="title" v-bind="$attrs"
diff --git a/components/watermark/watermark.vue b/components/watermark/watermark.vue
index b270eee..9dba38c 100644
--- a/components/watermark/watermark.vue
+++ b/components/watermark/watermark.vue
@@ -6,76 +6,78 @@
 			<image v-if="dark=='light'" class="colse" src="/static/image/watermarkColseLight.png" mode=""></image>
 			<image v-else class="colse" src="/static/image/watermarkColseDark.png" mode=""></image> -->
 			<image class="watermarkImg" src="/static/image/watermark.png" mode=""></image>
-			<image class="colse" src="/static/image/watermarkColse.png" mode="" @click="$goRechargePage('watermark_close')"></image>
+			<image class="colse" src="/static/image/watermarkColse.png" mode=""
+				@click="$goRechargePage('watermark_close')"></image>
 		</view>
 
 	</view>
 </template>
 
 <script>
-	export default {
-		props: {
-			dark: {
-				type: String,
-				default: 'light'
-			}
-		},
-		name: "watermark",
-		data() {
-			return {
-				statusBarHeight: 0
-			};
-		},
-		mounted() {
-			this.getStatusBarHeight()
-		},
-		methods: {
-			getStatusBarHeight() {
-				// 获取系统信息
-				const systemInfo = uni.getSystemInfoSync()
-				this.statusBarHeight = systemInfo.statusBarHeight
-				console.log('状态栏高度:', this.statusBarHeight + 'px')
-			}
-		},
-	}
+export default {
+	props: {
+		dark: {
+			type: String,
+			default: 'light'
+		}
+	},
+	name: "watermark",
+	data() {
+		return {
+			statusBarHeight: 0
+		};
+	},
+	mounted() {
+		this.getStatusBarHeight()
+	},
+	methods: {
+		getStatusBarHeight() {
+			// 获取系统信息
+			const systemInfo = uni.getSystemInfoSync()
+			this.statusBarHeight = systemInfo.statusBarHeight
+			console.log('状态栏高度:', this.statusBarHeight + 'px')
+		}
+	},
+}
 </script>
 
 <style lang="scss">
-	.watermark {
-		pointer-events: none;
-		width: 100vw;
-		position: fixed;
-		height: 100vh;
-		top: 0;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		z-index: 99 !important;
-		background-image: url('/static/image/watermarkBG.png');
-		background-size: 125px 125px;
-		.watermarkBox {
-			width: 200px;
-			height: 255px;
-			position: relative;
-			z-index: 99 !important;
-			
-			.colse {
-				position: absolute;
-				right: -18px;
-				top: -18px;
-				width: 18px;
-				height: 20px;
-				pointer-events: auto;
-			}
-		}
+.watermark {
+	pointer-events: none;
+	width: 100vw;
+	position: fixed;
+	height: 100vh;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	z-index: 99 !important;
+	background-image: url('/static/image/watermarkBG.png');
+	background-size: 125px 125px;
 
-		.watermarkImg {
-			width: 200px;
-			height: 55px;
-			pointer-events: none;
+	.watermarkBox {
+		width: 200px;
+		height: 255px;
+		position: relative;
+		z-index: 99 !important;
+
+		.colse {
+			position: absolute;
+			right: -18px;
+			top: -18px;
+			width: 18px;
+			height: 20px;
+			pointer-events: auto;
 		}
 	}
+
+	.watermarkImg {
+		width: 200px;
+		height: 55px;
+		pointer-events: none;
+	}
+}
 </style>
\ No newline at end of file
diff --git a/main.js b/main.js
index edbce97..477ed6f 100644
--- a/main.js
+++ b/main.js
@@ -27,7 +27,7 @@ export function createApp() {
 	const systemInfo = uni.getStorageSync('systemInfo') || {}
 	app.config.globalProperties.$system = systemInfo.platform == 'ios' ? 'iOS' : 'Android'
 	app.config.globalProperties.$systemInfo = systemInfo
-	uni.setStorageSync('version', '1.0.1.sp5')
+	uni.setStorageSync('version', '1.0.2.sp4')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 
 	app.use(globalMethods);
diff --git a/pages/common/recharge/index.vue b/pages/common/recharge/index.vue
index 090ff64..b612fa2 100644
--- a/pages/common/recharge/index.vue
+++ b/pages/common/recharge/index.vue
@@ -260,545 +260,253 @@
 
 
 <script setup>
-	import customTab from "@/components/custom-tab/custom-tab.vue"
-	import countUp from "@/components/countUp/countUp.vue"
-	import {
-		postJson
-	} from "@/utils/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"
-		}
-	]
+import customTab from "@/components/custom-tab/custom-tab.vue"
+import countUp from "@/components/countUp/countUp.vue"
+import {
+	postJson
+} from "@/utils/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 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: "AI聊天模板",
-				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',
-	})
-
-	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 () => {
-
-	})
-	onUnload(() => {
-		// uni.offNativeEventReceive()
-	})
-	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;
+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: "AI聊天模板",
+		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"
 	}
-
-	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
-		};
+	],
+	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',
+})
 
-	function activeClick(status) {
-		myCoupon.value.close()
-		if (status && data.active_ids > 0) {
-			let item = data.activeitems
-			data.activeCoupon = {
-				...item,
-				...calculateTimeRemaining(item.expire_times)
+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
 			}
-			data.countdown = false
+		})
+		nextTick(() => {
 			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() {
+				data.scrollLeft = zsIndex * 120
+			}, 100)
+		})
 		let activity = await proxy.$requestPromise({
 			url: 'api/activity/coupon',
 			method: "GET",
@@ -815,62 +523,347 @@
 				} 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)
+				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)
+				...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)
 	}
-
-	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());
+	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()
 	}
-
-	/* 领取优惠券 */
-	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: '领取失败'
-				})
+	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 () => {
+
+})
+onUnload(() => {
+	// uni.offNativeEventReceive()
+})
+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({
@@ -878,60 +871,92 @@
 				title: '领取失败'
 			})
 		}
-
+	} else {
+		coupon.value.close()
+		uni.showToast({
+			icon: 'none',
+			title: '领取失败'
+		})
 	}
-	/**
-	 * @param {Object} item
-	 * @param {Object} index
-	 * 选择购买套餐
-	 */
+
+}
+/**
+ * @param {Object} item
+ * @param {Object} index
+ * 选择购买套餐
+ */
 
 
-	/* 
-	防抖
-	*/
-	const debouncedOnSelect = debounce((items, index) => {
-		onSelect(items, index);
-	}, 200, false);
+/* 
+防抖
+*/
+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);
+function debounce(func, wait, immediate = true) {
+	let timeout;
+	return function (...args) {
+		const later = () => {
+			timeout = null;
+			if (!immediate) 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) {
+
+		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) /
+							.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)
+				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
@@ -939,1046 +964,1021 @@
 						...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
 				}
+			} 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',
-					}
-				]
-			}
+	}
+	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',
-				}
+				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()
-
+	} 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()
 
-	/**
-	 * 随机生成通知列表
-	 */
-	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 // 添加遮罩防止用户操作
-		});
+}
+/**
+ * @param {Object} value
+ * 选择支付方式
+ */
+function onSelectPayment(value) {
+	paymentMethod.value = value
+}
 
-		uni.setStorageSync("UserEventOrder", {
-			"订单金额": data.goods.price + '元',
-			"订单名称": data.goods.goods_name,
-			"支付方式": paymentMethod.value == "wxpay" ? '微信' : "支付宝",
-		})
+function open() {
 
-
-		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_source": "app",
-			source: "uni_alipay",
-		})
-
-
-
-		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 => {
-						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() {
+	uni.setStorageSync('back_number', data.back_number + 1);
+	// 通过组件定义的ref调用uni-popup方法 ,如果传入参数 ，type 属性将失效 ，仅支持 ['top','left','bottom','right','center']
+	if (!data.isBack) {
 		proxy.$apiUserEvent('all', {
-			type: "click",
-			key: "recharge_dialog_cancel",
-			value: "去意已决",
+			type: "event",
+			key: "recharge_dialog",
+			value: "返回充值页弹窗",
 			extra: {
 				uni_version: proxy.$version
 
 			}
 		}, {
-			type: 'recharge_dialog_cancel',
+			type: 'recharge_dialog',
 			data: {
 				uni_version: proxy.$version
 			}
 		})
-		uni.navigateBack();
-	}
+		data.activeCoupon2 = calculateTimeRemaining(data.activeCoupon.expire_times)
+		console.log("data.activeCoupon2: " + JSON.stringify(data.activeCoupon2));
+		popup.value.open('center')
+	} else {
 
-	function Complete() {
+		data.isBack = false
+		data.activity = data.uni_recharge_back
 		data.coupon = false
-		console.log("播放完成");
+		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" ? '微信' : "支付宝",
+	})
+
+
+	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_source": "app",
+		source: "uni_alipay",
+	})
+
+
+
+	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 => {
+					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;
+		}
 	}
 
-	function shouldBeTrue(obj) {
-		// 情况1: 没有 features 字段 → 返回 true
-		if (!('features' in obj)) {
-			return false;
-		}
+	// 在选中的范围内生成随机值
+	const [min, max] = selected.range;
+	const amount = Math.floor(Math.random() * (max - min + 1)) + min;
 
-		// 情况2: features 字段存在但为空或 undefined → 返回 true
-		if (!obj.features) {
-			return false;
-		}
+	return `${amount}${selected.unit}前`;
+}
 
-		// 情况3: features 字段包含 alipay → 返回 true
-		if (obj.features.includes('alipay')) {
-			return false;
-		}
+/**
+ * 随机生成电话号码
+ */
+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'
+	];
 
-		// 情况4: 有 features 字段且不包含 alipay → 返回 false
-		return true;
+	// 随机选择号段
+	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>
-	* {
-		box-sizing: content-box;
+* {
+	box-sizing: content-box;
+}
+
+.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;
 	}
 
-	.couponBox {
-		width: 375px;
-		height: 450px;
-		position: relative;
-		z-index: 1;
+	.listCoupon {
+		position: absolute;
+		width: 244px;
+		height: 276px;
+		left: 65.5px;
+		top: 157px;
+		overflow: hidden;
+		overflow-y: scroll;
 
-		.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 {
+		.item {
 			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 {
+			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;
-			justify-content: space-around;
 			align-items: center;
-			padding-bottom: 32rpx;
+			color: #fff;
 
-			.payment-method {
+			.left {
+				width: 100px;
 				display: flex;
-				align-items: center;
+				align-items: flex-end;
 				justify-content: center;
+				font-size: 22px;
 
-				.img-select {
-					flex-shrink: 0 !important;
-					height: 16px;
-					width: 16px;
-					border-radius: 50%;
+				.AlibabaPuHuiTiBold {
+					font-size: 32px;
 				}
 
-				.logo {
-					width: 36rpx;
-					height: 36rpx;
-					margin-right: 10rpx;
-					margin-left: 18rpx;
+				.danwei {
+					margin-left: 11px;
 				}
+			}
 
-				.name {
-					color: #767676;
+			.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;
 			}
 		}
 
-		.footerBottom {
-			width: 100%;
-			height: 20px;
-		}
-
-		.buttonBoxs {
-			width: 100%;
-			height: 104rpx;
-			background-image: url('/static/image/recharge/bottom-button.png');
+		.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;
+
 			/* 防止图片重复 */
-			background-size: cover;
-			position: relative;
-
-			.hongbao {
-				position: absolute;
-				left: 0;
-				bottom: -52rpx;
+			.shen {
+				width: 240rpx !important;
+				color: #D86C24;
 			}
-		}
 
-		.christmas {
-			// background-image: url('/static/image/recharge/christmas/bottom-button.png');
 		}
+	}
 
-		.button-box {
+	.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;
 
-			.text {
-				flex: 1;
-				// color: text;
-				// text-align: center;
-				color: #ffffff;
-				// line-height: 104rpx;
-				font-size: 12px;
-				height: 104rpx;
+			.benefit-item {
+				width: 25%;
 				display: flex;
-				align-items: center;
+				flex-direction: column;
 				justify-content: center;
+				align-items: center;
+				margin-bottom: 16px;
 
-				text {
-					color: red;
+				.img {
+					width: 76rpx;
+					height: 76rpx;
 				}
 
-				.price {
-					font-size: 24px;
-					color: red;
+				.name {
+					font-size: 10px;
+					margin-top: 16rpx;
 				}
 			}
 
-			.button {
-				flex-shrink: 0;
-				opacity: 0;
-				text-align: center;
-				height: 100%;
-				width: 32%;
+		}
+	}
+
+
+
+
+
+}
+
+@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;
 			}
 		}
 	}
 
-	.dialog-container {
-		display: flex;
-		flex-direction: column;
-		width: 80vw;
+	.footerBottom {
+		width: 100%;
+		height: 20px;
+	}
 
-		.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;
+	.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;
+			}
 		}
 
-		.content {
-			flex: 1;
+		.button {
 			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;
+			opacity: 0;
+			text-align: center;
+			height: 104rpx;
+			width: 32%;
+		}
+	}
+}
 
-			.title-box {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin-top: 2px;
+.dialog-container {
+	display: flex;
+	flex-direction: column;
+	width: 80vw;
 
-				.title {
-					margin: 0 32rpx;
-				}
+	.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;
+	}
 
-				.decorative-line {
-					width: 68rpx;
-					height: 6rpx;
-				}
+	.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;
 			}
 
-			.timeDJS {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				margin-bottom: 15px;
-
-				.titles {
-					color: #FC3939;
-					font-size: 14px;
-					margin-right: 11px;
-				}
+			.decorative-line {
+				width: 68rpx;
+				height: 6rpx;
 			}
+		}
 
-			.vip-benefits {
-				display: flex;
-				justify-content: space-between;
-				margin: 24px 0;
-				padding: 0 32rpx;
+		.timeDJS {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-bottom: 15px;
 
-				.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;
-					}
-				}
+			.titles {
+				color: #FC3939;
+				font-size: 14px;
+				margin-right: 11px;
 			}
+		}
 
-			.button-box {
-				margin: 0 44rpx;
+		.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;
 
-				.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%);
+				.img {
+					width: 90rpx;
+					height: 90rpx;
 				}
 
-				/* .button::before {
+				.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;
@@ -1994,419 +1994,419 @@
 					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;
+			.leave {
 				color: #767676;
-			}
-
-			.text1 {
-				color: #AAAAAA;
+				margin-top: 8px;
 			}
 		}
 	}
 
-	.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;
+.back {
+	position: fixed;
+	top: 100rpx;
+	left: 36rpx;
+	z-index: 1;
+}
 
-		.left {
-			display: flex;
-			align-items: center;
-			font-weight: bold;
+.uni-margin-wrap::after {
+	// position: absolute;
+	// content: '';
+	// left: 0;
+	// bottom: -1px;
+	// width: 100%;
+	// height: 18px;
+	// background-color: #f7f7f7;
+	// border-radius: 16px 16px 0px 0px;
+}
 
-			image {
-				width: 23px;
-				height: 17px;
-				margin-right: 8px;
-			}
+.uni-margin-wrap {
+	// position: relative;
+	height: auto;
+	width: 100%;
+	z-index: 0;
 
-			.title {
-				margin-top: 3px;
-				display: inline-block;
-				/* 确保文字可以应用背景 */
-				background: linear-gradient(to right, #6E430F, #1A1A1A);
-				/* 从左到右的渐变 */
-				-webkit-background-clip: text;
-				/* 仅裁剪文本部分 */
-				color: transparent;
-				/* 文本颜色设置为透明，以显示背景渐变 */
-				font-size: 14px;
-				/* 根据需要调整字体大小 */
-			}
+	::v-deep .uni-swiper-dots-horizontal {
+		bottom: 60rpx;
 
-			.money {
-				margin-top: 1px;
-				font-family: 'PingFangSC-Semibold';
-				font-weight: bold;
-				color: #FC3939;
-				font-size: 16px;
-			}
+		.uni-swiper-dot {
+			width: 8rpx;
+			height: 8rpx;
+			background-color: #FFFFFF;
+			opacity: 0.5;
+			border-radius: 8rpx;
 		}
 
-		.right {
+		.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;
-			font-size: 12px;
+		}
+
+		.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;
 
-			.forward {
-				margin-left: 8px;
+			.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;
 			}
 
-			.forward2 {
-				margin: 0;
+			.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;
 			}
 
-			.timeBox {
-				.titles {
-					text-align: right;
-					color: #FC3939;
-					font-size: 10px;
+			.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;
 				}
 			}
-		}
-	}
 
-	.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;
+			.left2 {
+				background-color: #EDEDED;
 
-		.myCouponContainerClose {
-			position: absolute;
-			width: 34px;
-			height: 34px;
-			top: -27px;
-			right: 16px;
-		}
+				.money {
+					color: #8A8A8A;
+				}
 
-		.myCouponBox {
-			height: 282px;
-			overflow-y: scroll;
+				.dec {
+					color: #8A8A8A;
+				}
+			}
 
-			.item {
-				width: calc(100% - 12px);
-				height: 62px;
-				background-color: #fff;
-				border-radius: 8px 8px 8px 8px;
-				padding: 6px;
+			.right {
+				width: calc(100% - 126px);
 				display: flex;
 				align-items: center;
 				justify-content: space-between;
-				margin-bottom: 12px;
-				position: relative;
+				padding-right: 7px;
 
-				.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;
+				.titlebox {
+					.titlle {
+						margin-top: 13px;
+						color: #3D3D3D;
 						font-size: 16px;
-
-						.moneys {
-							font-size: 28px;
-							font-weight: bold;
-						}
 					}
 
 					.dec {
-						margin-top: 1px;
-						color: #FF3838;
+						margin-top: 8px;
+						color: #AAAAAA;
 						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;
-					}
+				.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;
+	.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;
 	}
 
-	@keyframes flow {
-		0% {
-			background-position: -100% 0;
-		}
-
-		100% {
-			background-position: 200% 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-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;
-	}
+::v-deep .uni-countdown-splitor-day {
+	margin-left: 0 !important;
+}
 
-	.yanhua {
-		position: fixed;
-		top: 170px;
-		left: 15px;
-		z-index: 999999;
-	}
+.yanhua {
+	position: fixed;
+	top: 170px;
+	left: 15px;
+	z-index: 999999;
+}
 </style>
\ No newline at end of file
diff --git a/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets.vue b/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets.vue
index ebe9044..5282e0a 100644
--- a/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets.vue
+++ b/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets.vue
@@ -1,5 +1,12 @@
 <template>
-	<view class="codefun-flex-col page">
+	<!-- 水印 -->
+	<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="codefun-flex-col page" :style="{ '--font-weight-bold': $system == 'iOS' ? 500 : 700 }">
 
 		<view class="codefun-flex-col group">
 
@@ -8,7 +15,7 @@
 					<NavBar title="订单详情" textColor="#fff" :bgColor="data.navBar.bgColor" :buttonGroup="buttonGroup"
 						@button-click="util.clickTitlePopupButton" tipLayerType="ctrip-air-tickets-tip" isTipLayer
 						tipLayerText="修改机票信息">
-						<template v-slot:statusBar>
+						<template v-if="$system == 'iOS'" v-slot:statusBar>
 							<view class="status-bar">
 								<image class="top-logo" style="width: 160rpx"
 									src="/static/image/other/air-tickets/ctrip-air/top-logo.png" mode="widthFix">
@@ -20,7 +27,8 @@
 								<view class="text">订单详情</view>
 								<view class="level">
 									<image style="width: 100%"
-										:src="`/static/image/other/air-tickets/ctrip-air/level-1.png`" mode="widthFix">
+										:src="`/static/image/other/air-tickets/ctrip-air/level-${airTicketsInfo.ctripOrderInfo.level}.png`"
+										mode="widthFix">
 									</image>
 								</view>
 							</view>
@@ -110,7 +118,8 @@
 					<view class="codefun-flex-row codefun-justify-between codefun-items-center">
 						<view class="codefun-flex-row codefun-items-center">
 							<text class="font_6 text_56">总计</text>
-							<text class="font_7 text_21 codefun-ml-8">¥{{ airTicketsInfo.orderInfo.price }}</text>
+							<text class="font_7 text_21 codefun-ml-8" @click="goEdit">¥{{ airTicketsInfo.orderInfo.price
+							}}</text>
 							<uni-icons class="codefun-shrink-0 codefun-ml-4" type="help" size="18"
 								color="#006FEF"></uni-icons>
 						</view>
@@ -136,7 +145,7 @@
 				</view>
 				<view class="codefun-flex-col group_9">
 					<view class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch">
-						<view class="codefun-flex-row">
+						<view class="codefun-flex-row" @click="goEdit">
 							<image class="codefun-shrink-0 image_13"
 								src="/static/image/other/air-tickets/ctrip-air/airplant.png" />
 							<text class="codefun-self-center font_6 text_64 codefun-ml-6">{{
@@ -157,7 +166,7 @@
 					<text class="codefun-self-start font_8 text_30">{{ flightInfo.year }} 年 {{ flightInfo.date }} {{
 						flightInfo.week
 					}}</text>
-					<view class="codefun-flex-row codefun-items-center codefun-self-stretch group_10">
+					<view class="codefun-flex-row codefun-items-center codefun-self-stretch group_10" @click="goEdit">
 						<image class="codefun-shrink-0 image_15"
 							src="/static/image/other/air-tickets/ctrip-air/image1.png" />
 						<view class="codefun-flex-col codefun-flex-1 codefun-ml-12">
@@ -180,20 +189,30 @@
 											style="flex-wrap: wrap; flex: 1; width: 100%;">
 											<image class="codefun-shrink-0 image_8"
 												:src="`/static/image/other/air-tickets/air-line/${airlineInfo.icon}.png`" />
-											<text class="font_11">{{ airlineInfo.name }}
-												{{ airTicketsInfo.flightInfo.flightNumber }}</text>
-											<view class="codefun-shrink-0 section_8"></view>
-											<text class="font_11">{{ airTicketsInfo.flightInfo.seatCategory }}</text>
-											<view class="codefun-shrink-0 section_8"></view>
-											<text class="font_11">{{ airTicketsInfo.flightInfo.aircraftType }}</text>
-											<view class="codefun-shrink-0 section_8"></view>
-											<text class="font_11" style="color: #EC6103;">{{
-												airTicketsInfo.flightInfo.meal
-											}}</text>
-											<view class="codefun-shrink-0 section_8"></view>
-											<text class="font_11" style="color: #EC6103;">{{
-												airTicketsInfo.flightInfo.luggageCheckInQuota
-											}}</text>
+											<view class="font_11 codefun-flex-row codefun-items-center">{{
+												airlineInfo.name }}
+												{{ airTicketsInfo.flightInfo.flightNumber }}
+												<view class="codefun-shrink-0 section_8"></view>
+											</view>
+											<view class="font_11 codefun-flex-row codefun-items-center">{{
+												airTicketsInfo.flightInfo.seatCategory }}<view
+													class="codefun-shrink-0 section_8">
+												</view>
+											</view>
+											<view class="font_11 codefun-flex-row codefun-items-center">{{
+												airTicketsInfo.flightInfo.aircraftType }}<view
+													class="codefun-shrink-0 section_8">
+												</view>
+											</view>
+											<view class="font_11 codefun-flex-row codefun-items-center"
+												style="color: #EC6103;">{{
+													airTicketsInfo.flightInfo.meal
+												}}<view class="codefun-shrink-0 section_8"></view>
+											</view>
+											<view class="font_11 codefun-flex-row codefun-items-center"
+												style="color: #EC6103;">{{
+													airTicketsInfo.flightInfo.luggageCheckInQuota
+												}}</view>
 										</view>
 									</view>
 									<uni-icons class="codefun-shrink-0 codefun-ml-12" type="right" size="12"
@@ -219,7 +238,7 @@
 				<text class="codefun-self-start font_6 text_41">已购 / 赠送服务</text>
 				<view class="codefun-self-stretch grid mt-13">
 					<view class="codefun-flex-row codefun-justify-between codefun-items-center grid-item_1">
-						<view class="codefun-flex-row codefun-items-center">
+						<view style="flex: 1;" class="codefun-flex-row codefun-items-center">
 							<text class="font_8 text_42">优惠券</text>
 							<image class="codefun-shrink-0 image_18 codefun-ml-2"
 								src="/static/image/other/air-tickets/ctrip-air/give.png" />
@@ -228,12 +247,12 @@
 							color="#C7C8CC"></uni-icons>
 					</view>
 					<view class="codefun-flex-row codefun-justify-between codefun-items-center grid-item_2">
-						<text class="font_8 text_43">旅游专享券</text>
+						<text style="flex: 1;" class="font_8 text_43">旅游专享券</text>
 						<uni-icons class="codefun-shrink-0 codefun-ml-4" type="right" size="13"
 							color="#C7C8CC"></uni-icons>
 					</view>
 					<view class="codefun-flex-row codefun-justify-between codefun-items-center grid-item">
-						<view class="codefun-flex-row codefun-items-center">
+						<view style="flex: 1;" class="codefun-flex-row codefun-items-center">
 							<text class="font_8">机场美食券</text>
 							<image class="codefun-shrink-0 image_18 codefun-ml-2"
 								src="/static/image/other/air-tickets/ctrip-air/give.png" />
@@ -250,8 +269,8 @@
 						<view class="codefun-flex-row codefun-self-stretch group_17">
 							<text class="codefun-shrink-0 codefun-self-start font_13 text_47">出行人</text>
 							<view class="codefun-flex-col codefun-flex-1 codefun-relative group_16 ml-41">
-								<text class="codefun-self-start text_23"><text style="margin-right: 6px;"
-										v-for="value in airTicketsInfo.passengersInfo">{{
+								<text class="codefun-self-start text_23" @click="goEdit"><text
+										style="margin-right: 6px;" v-for="value in airTicketsInfo.passengersInfo">{{
 											value.name }}</text></text>
 								<view class="codefun-flex-row codefun-items-center codefun-self-stretch codefun-mt-8">
 									<text class="font_14 text_49">查看证件、航司预订号、修改姓名/证件</text>
@@ -264,8 +283,9 @@
 						<view
 							class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-start group_18">
 							<text class="font_13 text_50">联系手机</text>
-							<text class="text_23">+86 {{ airTicketsInfo.ticketNumber.replace(/(\d{3})\d{4}(\d{4})/,
-								'$1****$2')
+							<text class="text_23" @click="goEdit">+86 {{
+								airTicketsInfo.ticketNumber.replace(/(\d{3})\d{4}(\d{4})/,
+									'$1****$2')
 							}}</text>
 						</view>
 						<view class="codefun-self-stretch divider"></view>
@@ -355,10 +375,14 @@ import airlineJson from '@/static/json/air-line.json';
 const buttonGroup = [{
 	name: "编辑机票信息",
 	click: () => {
-		util.goPage(`/pages/other/air-tickets/edit/edit?ticketsApp=ctrip&storageKey=${data.STORAGE_KEY}`)
+		goEdit()
 	}
 }]
 
+function goEdit() {
+	util.goPage(`/pages/other/air-tickets/edit/edit?ticketsApp=ctrip&storageKey=${data.STORAGE_KEY}`)
+}
+
 const data = reactive({
 	navBar: {
 		bgColor: 'transparent'
@@ -496,6 +520,8 @@ onPageScroll((e) => {
 					display: flex;
 					align-items: center;
 					justify-content: center;
+					padding-top: 16rpx;
+					padding-bottom: 32rpx;
 				}
 
 				::v-deep .uni-navbar__header-btns-right {
@@ -599,7 +625,7 @@ onPageScroll((e) => {
 						.text_5 {
 							color: #ffffff;
 							font-size: 44rpx;
-							font-weight: 700;
+							font-weight: var(--font-weight-bold);
 							line-height: 40.48rpx;
 							letter-spacing: 2.2rpx;
 						}
@@ -689,7 +715,7 @@ onPageScroll((e) => {
 								.text_13 {
 									color: #f2740d;
 									font-size: 20rpx;
-									font-weight: 700;
+									font-weight: var(--font-weight-bold);
 									line-height: 18.38rpx;
 								}
 							}
@@ -762,7 +788,7 @@ onPageScroll((e) => {
 						.font_4 {
 							font-size: 28rpx;
 							line-height: 24.72rpx;
-							font-weight: 700;
+							font-weight: var(--font-weight-bold);
 							color: #1a1a1a;
 						}
 					}
@@ -770,7 +796,7 @@ onPageScroll((e) => {
 					.font_3 {
 						font-size: 24rpx;
 						line-height: 22.24rpx;
-						font-weight: 700;
+						font-weight: var(--font-weight-bold);
 						color: #ffffff;
 					}
 				}
@@ -894,7 +920,6 @@ onPageScroll((e) => {
 			background-color: #ffffff;
 			border-radius: 16rpx 16rpx 0 0;
 			margin-top: -16rpx;
-			z-index: 99;
 
 			.group_8 {
 				border-radius: 24rpx 24rpx 0 0;
@@ -1050,7 +1075,7 @@ onPageScroll((e) => {
 					.font_10 {
 						font-size: 32rpx;
 						line-height: 36rpx;
-						font-weight: 700;
+						font-weight: var(--font-weight-bold);
 						color: #1a1a1a;
 					}
 
@@ -1070,7 +1095,7 @@ onPageScroll((e) => {
 					border: solid 2rpx #0177d4;
 
 					.text_40 {
-						font-weight: 700;
+						font-weight: var(--font-weight-bold);
 						line-height: 22.36rpx;
 					}
 				}
@@ -1079,7 +1104,7 @@ onPageScroll((e) => {
 			.font_7 {
 				font-size: 36rpx;
 				line-height: 24.72rpx;
-				font-weight: 700;
+				font-weight: var(--font-weight-bold);
 				color: #1a1a1a;
 			}
 		}
@@ -1384,7 +1409,7 @@ onPageScroll((e) => {
 	.font_6 {
 		font-size: 36rpx;
 		line-height: 33.26rpx;
-		font-weight: 700;
+		font-weight: var(--font-weight-bold);
 		color: #1a1a1a;
 	}
 
@@ -1399,7 +1424,7 @@ onPageScroll((e) => {
 		bottom: 0;
 		left: 0;
 		right: 0;
-		z-index: 999;
+		z-index: 9;
 
 	}
 
@@ -1474,7 +1499,7 @@ onPageScroll((e) => {
 	.font {
 		font-size: 28rpx;
 		line-height: 24.72rpx;
-		font-weight: 700;
+		font-weight: var(--font-weight-bold);
 		color: #ffffff;
 	}
 }
diff --git a/pages/other/air-tickets/edit/edit.vue b/pages/other/air-tickets/edit/edit.vue
index e45e07a..512c9ec 100644
--- a/pages/other/air-tickets/edit/edit.vue
+++ b/pages/other/air-tickets/edit/edit.vue
@@ -455,7 +455,7 @@ onLoad((options) => {
 		Object.assign(data.ticketsInfo, mergedData)
 
 		// 再次检查 tips 是否存在，如果不存在（比如 stored 是旧数据且 defaultData 也没这个字段 - 虽然 defaultData 应该有），初始化为空数组
-		if (data.storageKey === 'fligggyAirTicketsInfo' && !data.ticketsInfo.fligggyOrderInfo.tips) {
+		if (data.storageKey === 'fliggyAirTicketsInfo' && !data.ticketsInfo.fligggyOrderInfo.tips) {
 			data.ticketsInfo.fligggyOrderInfo.tips = []
 		}
 		if (data.storageKey === 'ctripAirTicketsInfo' && !data.ticketsInfo.ctripOrderInfo.tips) {
@@ -486,7 +486,7 @@ const handleRightButtonClick = () => {
 	}
 	if (data.storageKey === 'ctripAirTicketsInfo') {
 		delete data.ticketsInfo.fligggyOrderInfo
-	} else if (data.storageKey === 'fligggyAirTicketsInfo') {
+	} else if (data.storageKey === 'fliggyAirTicketsInfo') {
 		delete data.ticketsInfo.ctripOrderInfo
 	} else {
 		delete data.ticketsInfo.fligggyOrderInfo
diff --git a/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets.vue b/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets.vue
index fa11333..d22b73d 100644
--- a/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets.vue
+++ b/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets.vue
@@ -112,7 +112,7 @@
 						<view class="fc-price">
 							<text class="label">总价</text>
 							<view class="symbol">¥</view>
-							<text class="value">{{ airTickrtInfo.orderInfo.price }}</text>
+							<text class="value" @click="goEdit">{{ airTickrtInfo.orderInfo.price }}</text>
 							<uni-icons type="right" size="10" color="#1A1A1A"></uni-icons>
 						</view>
 						<view class="fc-rules">
@@ -140,7 +140,7 @@
 							</view>
 						</view>
 
-						<view class="flight-route">
+						<view class="flight-route" @click="goEdit">
 							<!-- Departure -->
 							<view class="route-left">
 								<text class="time">{{ airTickrtInfo.flightInfo.startTime }}</text>
@@ -202,13 +202,16 @@
 							:class="{ 'last-passenger': index === airTickrtInfo.passengersInfo.length - 1 }"
 							v-for="(item, index) in airTickrtInfo.passengersInfo" :key="index">
 							<text class="label" :class="{ 'empty': index !== 0 }">乘机人</text>
-							<view class="info">
+							<view class="info" @click="goEdit">
 								<text class="name">{{ item.name }}</text>
-								<text class="id-card">{{ item.idType }}：{{ item.idNumber }}</text>
+								<text class="id-card">{{ item.idType }}：{{ item.idType === '身份证' ?
+									stringUtil.maskIdCard(item.idNumber) : (item.idType === '护照' ?
+										stringUtil.maskPassport(item.idNumber) : item.idNumber) }}</text>
 								<view class="ticket-row">
 									<text class="ticket-no">票号：{{ item.ticketNo }}</text>
-									<image src="/static/image/other/air-tickets/fliggy-air/copy-blue.png"
-										mode="widthFix" class="copy-icon-sm"></image>
+									<image style="width: 10px;"
+										src="/static/image/other/air-tickets/fliggy-air/copy-blue.png" mode="widthFix"
+										class="copy-icon-sm"></image>
 									<text class="action-text">复制</text>
 									<text class="sub-text">({{ airTickrtInfo.flightInfo.startCity }}-{{
 										airTickrtInfo.flightInfo.endCity }})</text>
@@ -299,15 +302,20 @@ import { ref, onMounted, reactive, toRefs, computed } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 import defualtData from '@/pages/other/air-tickets/commom/defualt.json';
 import airlineJson from '@/static/json/air-line.json';
-import { util, numberUtil } from '@/utils/common.js';
+import { util, numberUtil, stringUtil } from '@/utils/common.js';
 
 const buttonGroup = [{
 	name: "编辑机票信息",
 	click: () => {
-		util.goPage(`/pages/other/air-tickets/edit/edit?ticketsApp=fliggy&storageKey=${data.STORAGE_KEY}`)
+		goEdit()
 	}
 }]
 
+
+function goEdit() {
+	util.goPage(`/pages/other/air-tickets/edit/edit?ticketsApp=fliggy&storageKey=${data.STORAGE_KEY}`)
+}
+
 const data = reactive({
 	STORAGE_KEY: 'fliggyAirTicketsInfo',
 	navBar: {
@@ -988,28 +996,31 @@ const onBack = () => {
 				.ticket-row {
 					display: flex;
 					align-items: center;
-					gap: 8rpx;
 					font-size: 24rpx;
 					line-height: 24rpx;
 					color: #1A1A1A;
 					margin-bottom: 50rpx;
 
 					.action-text {
+						flex-shrink: 0;
 						color: #6F66D9;
 						font-weight: 500;
+						margin-left: 8rpx;
 					}
 
 					.copy-icon-sm {
-						width: 20rpx;
-						height: 20rpx;
+						flex-shrink: 0;
+						margin-left: 8rpx;
 					}
 
 					.sub-text {
+						flex-shrink: 0;
 						color: #999;
 						margin-left: 8rpx;
 					}
 
 					.ticket-no {
+						flex-shrink: 0;
 						color: #333;
 					}
 				}
diff --git a/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets.vue b/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets.vue
index d131678..e1cb0a7 100644
--- a/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets.vue
+++ b/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets.vue
@@ -83,8 +83,11 @@
 										<text class="time-big alipay-font">{{ ticketData.flightInfo.startTime }}</text>
 										<text class="airport-text">{{ ticketData.flightInfo.startAirport }} </text>
 									</view>
-									<image src="/static/image/other/air-tickets/qunar/location.png"
-										style="width: 16rpx; height: 16rpx;flex-shrink: 0;margin-bottom: 4rpx;"></image>
+									<view style="width: 16rpx; height: 16rpx;flex-shrink: 0;margin-bottom: 4rpx;">
+										<image class="location-icon"
+											src="/static/image/other/air-tickets/qunar/location.png"
+											style="width: 8px; display: block;" mode="widthFix"></image>
+									</view>
 								</view>
 
 								<view class="arrow-col">
@@ -111,8 +114,11 @@
 										<text class="time-big alipay-font">{{ ticketData.flightInfo.endTime }}</text>
 										<text class="airport-text">{{ ticketData.flightInfo.endAirport }}</text>
 									</view>
-									<image src="/static/image/other/air-tickets/qunar/location.png"
-										style="width: 16rpx; height: 16rpx;flex-shrink: 0;margin-bottom: 4rpx;"></image>
+									<view style="width: 16rpx; height: 16rpx;flex-shrink: 0;margin-bottom: 4rpx;">
+										<image class="location-icon"
+											src="/static/image/other/air-tickets/qunar/location.png"
+											style="width: 8px; display: block;" mode="widthFix"></image>
+									</view>
 								</view>
 
 
@@ -120,19 +126,19 @@
 
 							<view class="flight-detail-row">
 								<image class="item" src="/static/image/other/air-tickets/qunar/flight-number.png"
-									mode="widthFix" style="width: 24rpx; height: 24rpx;margin-right: 4rpx;"></image>
+									mode="widthFix" style="width: 12px;margin-right: 4rpx;flex-shrink: 0;"></image>
 								<text class="detail-item item">{{ ticketData.flightInfo.aircraftType }}</text>
 								<text class="detail-divider item">|</text>
 								<image class="item" src="/static/image/other/air-tickets/qunar/seat-category.png"
-									mode="widthFix" style="width: 24rpx; height: 24rpx;margin-right: 4rpx;"></image>
+									mode="widthFix" style="width: 12px;margin-right: 4rpx;flex-shrink: 0;"></image>
 								<text class="detail-item item">{{ ticketData.flightInfo.seatCategory }}</text>
 								<text class="detail-divider item">|</text>
 								<image class="item" src="/static/image/other/air-tickets/qunar/on-time.png"
-									mode="widthFix" style="width: 24rpx; height: 24rpx;margin-right: 4rpx;"></image>
+									mode="widthFix" style="width: 12px;margin-right: 4rpx; flex-shrink: 0;"></image>
 								<text class="detail-item item">准点率{{ ticketData.flightInfo.onTimeRate }}</text>
 								<text class="detail-divider item">|</text>
 								<image class="item" src="/static/image/other/air-tickets/qunar/meal.png" mode="widthFix"
-									style="width: 24rpx; height: 24rpx;margin-right: 4rpx;"></image>
+									style="width: 12px;margin-right: 4rpx;flex-shrink: 0;"></image>
 								<text class="detail-item item">{{ ticketData.flightInfo.meal }}</text>
 							</view>
 							<view class="tips-box">
@@ -192,7 +198,9 @@
 									<view class="row-content"
 										@click="util.goPage('/pages/other/air-tickets/edit/edit')">
 										<view class="p-name">{{ p.name }}</view>
-										<view class="p-sub">{{ p.idType }}: {{ p.idNumber }}</view>
+										<view class="p-sub">{{ p.idType }}: {{ p.idType === '身份证' ?
+											stringUtil.maskIdCard(p.idNumber) : (p.idType === '护照' ?
+												stringUtil.maskPassport(p.idNumber) : p.idNumber) }}</view>
 										<view class="p-sub">
 											<text>票号:{{ p.ticketNo }}</text>
 											<image src="/static/image/other/air-tickets/qunar/copy-black.png"
@@ -345,7 +353,7 @@ import NavBar from '@/components/nav-bar/nav-bar.vue';
 import { ref, onMounted, reactive, toRefs, computed } from 'vue';
 import { onShow } from '@dcloudio/uni-app';
 import defualtData from '@/pages/other/air-tickets/commom/defualt.json';
-import { util } from '@/utils/common.js';
+import { util, stringUtil } from '@/utils/common.js';
 import airlineJson from '@/static/json/air-line.json';
 
 const buttonGroup = [{
diff --git a/pages/other/video-group-chat/video-group-chat.vue b/pages/other/video-group-chat/video-group-chat.vue
index 96d777a..af8013d 100644
--- a/pages/other/video-group-chat/video-group-chat.vue
+++ b/pages/other/video-group-chat/video-group-chat.vue
@@ -15,7 +15,7 @@
 					<image class="icon" src="/static/image/other/video-call/float.png"></image>
 				</view>
 				<view class="center">
-					<text class="time">{{ videoData.timeText }}</text>
+					<text class="time">{{ data.timing }}</text>
 				</view>
 				<view v-if="data.isEdit" class="right" @click.stop>
 					<view class="button" @click="confirmEdit">完成</view>
@@ -169,7 +169,7 @@ const data = reactive({
 	videoData: {
 		micOn: true,
 		speakerOn: true,
-		cameraOn: false,
+		cameraOn: true,
 		mainVideoIndex: 0,
 		timeText: '125:22',
 		videoList: [
@@ -178,9 +178,10 @@ const data = reactive({
 			{ preview: '/static/image/other/video-call/defualt/voice_chat_3.jpg', videoUrl: '', savedVideoUrl: '', iconType: 0 },
 			{ preview: '/static/image/other/video-call/defualt/voice_chat_4.jpg', videoUrl: '', savedVideoUrl: '', iconType: 0 },
 			{ preview: '/static/image/other/video-call/defualt/voice_chat_5.jpg', videoUrl: '', savedVideoUrl: '', iconType: 0 },
-			{ preview: '/static/image/other/video-call/defualt/voice_chat_me.jpg', videoUrl: '', savedVideoUrl: '', iconType: 1 }
+			{ preview: '/static/image/other/video-call/defualt/voice_chat_me.jpg', videoUrl: '', savedVideoUrl: '', iconType: 0 }
 		]
 	},
+	timing: 0,
 	videoDataBackup: null,  // 编辑模式备份
 	isEdit: false,
 	statusBarHeight: 0,
@@ -205,6 +206,7 @@ const data = reactive({
 
 // 定时器引用，用于页面卸载时清理
 let statusBarTimer = null
+let timingTimer = null // 计时定时器
 
 let { videoData, statusBarHeight } = toRefs(data)
 
@@ -261,11 +263,13 @@ onLoad(() => {
 	console.log('videoData1', videoData)
 	const videoDataNew = {
 		...videoData,
+		iconType: videoData.onMic ? videoData.iconType : 1,
 		videoList: videoData.videoList.map((item) => {
 			item.videoUrl = plus.io.convertLocalFileSystemURL(item.savedVideoUrl)
 			return item
 		})
 	}
+	data.timing = videoData.timeText
 	data.videoData = videoDataNew
 	console.log('videoData2', data.videoData)
 
@@ -279,6 +283,13 @@ onLoad(() => {
 })
 
 onShow(() => {
+	// 恢复计时
+	const videoData = uni.getStorageSync('videoData')
+	if (videoData && videoData.timeText) {
+		data.timing = videoData.timeText
+	}
+	startTimer()
+
 	// #ifdef APP-PLUS
 	util.setAndroidSystemBarColor('#232323')
 	// 保存定时器引用，以便在页面卸载时清理
@@ -306,6 +317,13 @@ onHide(() => {
 	data.dragState.isDragging = false
 	data.dragState.draggingIndex = -1
 
+	// 保存当前计时
+	if (data.timing) {
+		data.videoData.timeText = data.timing
+		uni.setStorageSync('videoData', data.videoData)
+	}
+
+	stopTimer() // 停止计时
 	console.log('🚪 页面隐藏，已清理定时器和状态')
 })
 
@@ -317,6 +335,14 @@ onUnmounted(() => {
 		statusBarTimer = null
 	}
 
+	// 保存当前计时
+	if (data.timing) {
+		data.videoData.timeText = data.timing
+		uni.setStorageSync('videoData', data.videoData)
+	}
+
+	stopTimer() // 停止计时
+
 	// 清理长按定时器
 	if (data.dragState.longPressTimer) {
 		clearTimeout(data.dragState.longPressTimer)
@@ -329,7 +355,7 @@ onUnmounted(() => {
 // 打开时间编辑弹窗
 const openTimeEditPopup = () => {
 	// 解析当前时间 (格式: "125:22")
-	const parts = data.videoData.timeText.split(':')
+	const parts = data.timing.split(':')
 	data.tempMinutes = parts[0] || '0'
 	data.tempSeconds = parts[1] || '00'
 	data.showTimeEditPopup = true
@@ -353,6 +379,10 @@ const saveTimeEdit = () => {
 	// 保存到storage
 	uni.setStorageSync('videoData', data.videoData)
 
+	// 更新当前计时显示并重启计时器以确保同步
+	data.timing = data.videoData.timeText
+	startTimer()
+
 	// 关闭弹窗
 	data.showTimeEditPopup = false
 }
@@ -448,11 +478,10 @@ const saveImage = async () => {
 
 const changeIconType = (item, index) => {
 
-	if (index == data.videoData.videoList.length - 1) {
-		item.iconType = item.iconType == 2 ? 0 : item.iconType + 1
-	} else {
-		item.iconType = item.iconType == 2 ? 0 : 2
+	if (index == data.videoData.videoList.length - 1 && !data.videoData.micOn) {
+		return
 	}
+	item.iconType = item.iconType == 2 ? 0 : 2
 	uni.setStorageSync('videoData', data.videoData)
 }
 
@@ -610,6 +639,13 @@ const chooseImage = () => {
 // 改变信息
 const changeInfo = (key) => {
 	data.videoData[key] = !data.videoData[key]
+	if (key == 'micOn') {
+		if (!data.videoData[key]) {
+			data.videoData.videoList[data.videoData.videoList.length - 1].iconType = 1
+		} else {
+			data.videoData.videoList[data.videoData.videoList.length - 1].iconType = 0
+		}
+	}
 	uni.setStorageSync('videoData', data.videoData)
 }
 
@@ -772,6 +808,36 @@ const handleTouchEnd = (event, index) => {
 const hangup = () => {
 	uni.navigateBack()
 }
+
+// 开始计时
+const startTimer = () => {
+	stopTimer()
+	timingTimer = setInterval(() => {
+		if (!data.timing) return
+		let timeStr = String(data.timing)
+		if (timeStr.indexOf(':') === -1) return
+
+		let parts = timeStr.split(':')
+		let minutes = parseInt(parts[0]) || 0
+		let seconds = parseInt(parts[1]) || 0
+
+		seconds++
+		if (seconds >= 60) {
+			seconds = 0
+			minutes++
+		}
+
+		data.timing = `${minutes}:${seconds.toString().padStart(2, '0')}`
+	}, 1000)
+}
+
+// 停止计时
+const stopTimer = () => {
+	if (timingTimer) {
+		clearInterval(timingTimer)
+		timingTimer = null
+	}
+}
 </script>
 
 <style lang="less" scoped>
diff --git a/static/image/other/air-tickets/ctrip-air/level-1.png b/static/image/other/air-tickets/ctrip-air/level-1.png
index ced0e2e..aa5e6e4 100644
Binary files a/static/image/other/air-tickets/ctrip-air/level-1.png and b/static/image/other/air-tickets/ctrip-air/level-1.png differ
diff --git a/static/image/other/air-tickets/ctrip-air/level-2.png b/static/image/other/air-tickets/ctrip-air/level-2.png
index d46b6fa..56f0c82 100644
Binary files a/static/image/other/air-tickets/ctrip-air/level-2.png and b/static/image/other/air-tickets/ctrip-air/level-2.png differ
diff --git a/static/image/other/air-tickets/ctrip-air/level-3.png b/static/image/other/air-tickets/ctrip-air/level-3.png
index e05d880..e5697d6 100644
Binary files a/static/image/other/air-tickets/ctrip-air/level-3.png and b/static/image/other/air-tickets/ctrip-air/level-3.png differ
diff --git a/static/image/other/air-tickets/ctrip-air/level-4.png b/static/image/other/air-tickets/ctrip-air/level-4.png
index bfd93ab..61574f6 100644
Binary files a/static/image/other/air-tickets/ctrip-air/level-4.png and b/static/image/other/air-tickets/ctrip-air/level-4.png differ
diff --git a/utils/common.js b/utils/common.js
index a5381b3..3a66351 100644
--- a/utils/common.js
+++ b/utils/common.js
@@ -229,6 +229,20 @@ export const stringUtil = {
     if (length < 8) return idCard;
 
     return idCard.substring(0, 4) + '*'.repeat(length - 8) + idCard.substring(length - 4);
+  },
+
+  /**
+   * 护照号脱敏
+   * @param {string} passport - 护照号
+   * @returns {string} 脱敏后的护照号
+   */
+  maskPassport(passport) {
+    if (!passport) return passport;
+
+    const length = passport.length;
+    if (length <= 4) return passport;
+
+    return passport.substring(0, 2) + '*'.repeat(length - 4) + passport.substring(length - 2);
   }
 };
 
diff --git a/utils/globalMethods.js b/utils/globalMethods.js
index 2ba9468..5259d5a 100644
--- a/utils/globalMethods.js
+++ b/utils/globalMethods.js
@@ -213,6 +213,7 @@ export default {
 				console.log("模拟请求：", JSON.stringify(user))
 				if (user.code == 0) {
 					uni.setStorageSync('AppUser', user.data)
+					uni.setStorageSync('userInfo', user.data)
 					// uni.showModal({
 					// 	title: '提示',
 					// 	content: JSON.stringify(user.data),