From b149dbd8584e47c391b6c9ba524340b454b08ecd Mon Sep 17 00:00:00 2001
From: tangxinyue <524779910@qq.com>
Date: Thu, 5 Mar 2026 16:26:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=81=AB=E8=BD=A6=E7=A5=A8?=
 =?UTF-8?q?=E5=9F=8B=E7=82=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.js                                       |    2 +-
 pages.json                                    |    8 +
 pages/index/index.nvue                        | 1454 ++++++++---------
 pages/other/tickets-app/index.vue             |   73 +-
 .../12306-tickets/12306-tickets.vue           |    8 -
 .../ctrip-train-tickets.vue                   |   33 +-
 pages/other/train-tickets/edit/edit.vue       |    2 +-
 .../qunar-train-tickets.vue                   |  657 ++++++++
 8 files changed, 1460 insertions(+), 777 deletions(-)
 create mode 100644 pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue

diff --git a/main.js b/main.js
index 1ff7b0b..34b979d 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.2.sp8')
+	uni.setStorageSync('version', '1.0.2.sp9')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 
 	app.use(globalMethods);
diff --git a/pages.json b/pages.json
index da23e09..27c76c0 100644
--- a/pages.json
+++ b/pages.json
@@ -184,6 +184,14 @@
 						"navigationBarTitleText": "携程火车票",
 						"navigationStyle": "custom"
 					}
+				},
+				{
+					"path" : "train-tickets/qunar-train-tickets/qunar-train-tickets",
+					"style" : 
+					{
+						"navigationBarTitleText" : "去哪儿",
+						"navigationStyle": "custom"
+					}
 				}
 			]
 		},
diff --git a/pages/index/index.nvue b/pages/index/index.nvue
index bcdf6f9..04befa7 100644
--- a/pages/index/index.nvue
+++ b/pages/index/index.nvue
@@ -136,814 +136,814 @@
 	</view>
 </template>
 <script setup>
-	import {
-		util,
-		uiUtil
-	} from '@/utils/common.js'
-	import {
-		storage
-	} from '@/utils/storage.js'
-	import {
-		get,
-		postJson
-	} from '@/utils/requests.js'
-	import {
-		ref,
-		reactive,
-		toRefs
-	} from 'vue';
+import {
+	util,
+	uiUtil
+} from '@/utils/common.js'
+import {
+	storage
+} from '@/utils/storage.js'
+import {
+	get,
+	postJson
+} from '@/utils/requests.js'
+import {
+	ref,
+	reactive,
+	toRefs
+} from 'vue';
 
-	import {
-		onLoad,
-		onShow,
-		onHide,
-		onUnload
-	} from '@dcloudio/uni-app';
+import {
+	onLoad,
+	onShow,
+	onHide,
+	onUnload
+} from '@dcloudio/uni-app';
 
-	// 内部埋点方法
-	const apiUserEvent = async (type, adminData) => {
-		let uni_version = uni.getStorageSync("version")
-		if (type != 'uni') {
-			await postJson('a', 'api/user/event', {
-				type: adminData.type,
-				key: adminData.type + ".uni.alipay." + adminData.key,
-				value: adminData.value,
-				extra: JSON.stringify({
-					uni_version: uni_version,
-					...adminData.extra
-				}),
-			})
-		}
-	}
-
-	// 内部跳转充值页方法
-	const goRechargePage = () => {
-		// 进入页面
-		apiUserEvent('all', {
-			type: "event",
-			key: "payment_onload",
-			value: "进入充值页面",
-			extra: {
-				from: "支付宝模拟器首页"
-			}
+// 内部埋点方法
+const apiUserEvent = async (type, adminData) => {
+	let uni_version = uni.getStorageSync("version")
+	if (type != 'uni') {
+		await postJson('a', 'api/user/event', {
+			type: adminData.type,
+			key: adminData.type + ".uni.alipay." + adminData.key,
+			value: adminData.value,
+			extra: JSON.stringify({
+				uni_version: uni_version,
+				...adminData.extra
+			}),
 		})
-		uni.navigateTo({
-			url: '/pages/common/recharge/index'
-		});
 	}
+}
 
-	// 菜单列表
-	const menuList = [{
-			icon: "yuemoni",
-			name: "余额模拟",
-			isHot: false,
-			path: "/pages/balance/index"
-		},
-		{
-			icon: "zhangdanshencheng",
-			name: "账单生成",
-			isHot: false,
-			path: "/pages/bill/bill-list/bill-list"
-		},
-		{
-			icon: "licaiheika",
-			name: "理财黑卡",
-			isHot: true,
-			path: "/pages/finance-management/index"
-			// path: ""
-		},
-		{
-			icon: "huabei",
-			name: "花呗",
-			isHot: false,
-			path: "/pages/ant-credit-pay/index"
-		},
-	]
-	const otherList = [{
-			icon: "/static/image/index/qita/jipiao.png",
-			name: "机票",
-			path: "/pages/other/tickets-app/index?type=airTicket"
-		},
-		{
-			icon: "/static/image/index/qita/huochepiao.png",
-			name: "火车票",
-			// path: "/pages/other/train-tickets/12306-tickets/12306-tickets"
-			path: "/pages/other/tickets-app/index?type=trainTicket"
-		},
-		{
-			icon: "/static/image/index/qita/gongzidan.png",
-			name: "工资单",
-			path: "/pages/other/splash/splash"
-		},
-		{
-			icon: "/static/image/index/qita/shipinqunliao.png",
-			name: "视频群聊",
-			path: "/pages/other/video-group-chat/video-group-chat"
-		},
-		{
-			icon: "/static/image/index/qita/card.png",
-			name: "身份证",
-			path: "/pages/other/card/card"
-		},
-	]
-
-	const data = reactive({
-		navBarBgColor: 'transparent',
-		statusBarHeight: 0,
-		windowWidth: 0,
-		windowHeight: 0,
-		userInfo: {},
-		videoHelpList: [],
-		noticeInfo: {},
-		vision: "",
-		platform: '', // 添加平台信息,
-		qqgroup: {}
+// 内部跳转充值页方法
+const goRechargePage = () => {
+	// 进入页面
+	apiUserEvent('all', {
+		type: "event",
+		key: "payment_onload",
+		value: "进入充值页面",
+		extra: {
+			from: "支付宝模拟器首页"
+		}
 	})
+	uni.navigateTo({
+		url: '/pages/common/recharge/index'
+	});
+}
 
-	const {
-		statusBarHeight,
-		windowWidth,
-		windowHeight,
-		userInfo,
-		videoHelpList,
-		noticeInfo,
-		vision,
-		platform,
-		qqgroup
-	} = toRefs(data);
+// 菜单列表
+const menuList = [{
+	icon: "yuemoni",
+	name: "余额模拟",
+	isHot: false,
+	path: "/pages/balance/index"
+},
+{
+	icon: "zhangdanshencheng",
+	name: "账单生成",
+	isHot: false,
+	path: "/pages/bill/bill-list/bill-list"
+},
+{
+	icon: "licaiheika",
+	name: "理财黑卡",
+	isHot: true,
+	path: "/pages/finance-management/index"
+	// path: ""
+},
+{
+	icon: "huabei",
+	name: "花呗",
+	isHot: false,
+	path: "/pages/ant-credit-pay/index"
+},
+]
+const otherList = [{
+	icon: "/static/image/index/qita/jipiao.png",
+	name: "机票",
+	path: "/pages/other/tickets-app/index?type=airTicket"
+},
+{
+	icon: "/static/image/index/qita/huochepiao.png",
+	name: "火车票",
+	// path: "/pages/other/train-tickets/12306-tickets/12306-tickets"
+	path: "/pages/other/tickets-app/index?type=trainTicket"
+},
+{
+	icon: "/static/image/index/qita/gongzidan.png",
+	name: "工资单",
+	path: "/pages/other/splash/splash"
+},
+{
+	icon: "/static/image/index/qita/shipinqunliao.png",
+	name: "视频群聊",
+	path: "/pages/other/video-group-chat/video-group-chat"
+},
+{
+	icon: "/static/image/index/qita/card.png",
+	name: "身份证",
+	path: "/pages/other/card/card"
+},
+]
 
-	/**
-	 * 处理页面滚动事件
-	 */
-	const handleScroll = (e) => {
-		const scrollTop = e.detail.scrollTop
-		// 滚动超过20px时显示蓝色背景，否则显示透明背景
-		if (scrollTop > 20) {
-			data.navBarBgColor = '#DDF0FD'
-		} else {
-			data.navBarBgColor = 'transparent'
-		}
+const data = reactive({
+	navBarBgColor: 'transparent',
+	statusBarHeight: 0,
+	windowWidth: 0,
+	windowHeight: 0,
+	userInfo: {},
+	videoHelpList: [],
+	noticeInfo: {},
+	vision: "",
+	platform: '', // 添加平台信息,
+	qqgroup: {}
+})
+
+const {
+	statusBarHeight,
+	windowWidth,
+	windowHeight,
+	userInfo,
+	videoHelpList,
+	noticeInfo,
+	vision,
+	platform,
+	qqgroup
+} = toRefs(data);
+
+/**
+ * 处理页面滚动事件
+ */
+const handleScroll = (e) => {
+	const scrollTop = e.detail.scrollTop
+	// 滚动超过20px时显示蓝色背景，否则显示透明背景
+	if (scrollTop > 20) {
+		data.navBarBgColor = '#DDF0FD'
+	} else {
+		data.navBarBgColor = 'transparent'
 	}
+}
 
-	onLoad(async () => {
-		// 获取平台信息
-		const systemInfo = uni.getSystemInfoSync()
-		data.platform = systemInfo.platform
-		data.vision = uni.getStorageSync('version')
-	})
+onLoad(async () => {
+	// 获取平台信息
+	const systemInfo = uni.getSystemInfoSync()
+	data.platform = systemInfo.platform
+	data.vision = uni.getStorageSync('version')
+})
 
-	onShow(() => {
-		// 启动时获取数据
-		fetchUserData()
-		// 每次显示时刷新数据
-		setUserData()
-		// 获取系统信息
-		const systemInfo = uni.getSystemInfoSync();
-		data.statusBarHeight = systemInfo.statusBarHeight;
-		data.windowWidth = systemInfo.windowWidth;
-		data.windowHeight = systemInfo.windowHeight;
-		// #ifdef APP-PLUS
-		util.setAndroidSystemBarColor('#F0F4F9')
-		setTimeout(() => {
-			plus.navigator.setStatusBarStyle("dark");
-		}, 500)
-		// #endif
-	})
-
-	/**
-	 * 获取用户数据(从服务器)
-	 */
-	const fetchUserData = async () => {
-		try {
-			// 先设置默认值,避免页面显示异常
-			setUserData()
-
-			// 并行获取用户信息和配置
-			const [userResult, configResult] = await Promise.allSettled([
-				fetchUserInfo(),
-				fetchUserConfig()
-			])
-
-			// 处理用户信息结果
-			if (userResult.status === 'fulfilled') {
-				console.log('用户信息获取成功')
-			} else {
-				console.error('获取用户信息失败:', userResult.reason)
-			}
-
-			// 处理用户配置结果
-			if (configResult.status === 'fulfilled') {
-				console.log('用户配置获取成功')
-			} else {
-				console.error('获取用户配置失败:', configResult.reason)
-			}
-
-			// 刷新页面数据
-			setUserData()
-
-			// 检查是否有延迟跳转
-			const jumpTarget = uni.getStorageSync('jumpTarget_url');
-			if (jumpTarget) {
-				console.log('执行延迟跳转:', jumpTarget);
-				uni.removeStorageSync('jumpTarget_url');
-				uni.navigateTo({
-					url: '/' + jumpTarget
-				});
-			}
-		} catch (error) {
-			console.error('获取用户数据异常:', error)
-		}
-	}
-
-	/**
-	 * 获取用户信息
-	 */
-	const fetchUserInfo = async () => {
-		const data = await get('', 'api/user', {})
-		if (data.code === 0) {
-			uni.setStorageSync('userInfo', data.data)
-			return data.data
-		} else {
-			throw new Error(data.message || '获取用户信息失败')
-		}
-	}
-
-	/**
-	 * 获取用户配置
-	 */
-	const fetchUserConfig = async () => {
-		const data = await get('', 'api/user/config', {})
-		if (data.code === 0) {
-			uni.setStorageSync('config', data.data)
-			return data.data
-		} else {
-			throw new Error(data.message || '获取用户配置失败')
-		}
-	}
-
-
-	/**
-	 * 设置用户数据(从本地存储读取)
-	 */
-	const setUserData = () => {
-		// 用户信息 - 提供默认值
-		const userInfoData = storage.get("userInfo")
-		data.userInfo = userInfoData || {
-			user_id: '加载中...',
-			avater: '/static/default-avatar.png',
-			vip: 0,
-			vip_expire: ''
-		}
-
-		// 配置信息 - 安全访问
-		const configData = storage.get("config")
-		if (configData && configData.config) {
-			console.log("公告牌配置信息", configData.config['client.uniapp.notice'])
-			data.noticeInfo = configData.config['client.uniapp.notice'] || {
-				text: '加载中...',
-				url: '',
-				enable: false
-			}
-			data.noticeInfo = configData.config['client.uniapp.notice'] || {
-				text: '加载中...',
-				url: '',
-				enable: false
-			}
-			// 启动走马灯
-			startMarquee();
-			data.videoHelpList = configData.config['client.uniapp.alipay.video_help'] || []
-			// data.videoHelpList.push(configData.config['client.uniapp.alipay.video_help'][0])
-			data.qqgroup = configData.config['client.uniapp.qqgroup'] || {
-				enable: false,
-				number: "",
-				text: ""
-			}
-
-		} else {
-			data.noticeInfo = {
-				text: '加载中...',
-				url: '',
-				enable: false
-			}
-			data.videoHelpList = []
-		}
-	}
-
-	const clickMenu = (item) => {
-		if (!item.path) {
-			uiUtil.showError('开发中')
-		} else {
-			const isOverdue = storage.get("huabei_info_storage").isOverdue || false
-			let url = item.path
-			if (item.name == "花呗" && isOverdue) {
-				url = "/pages/ant-credit-pay/overdue-payment/overdue-payment"
-			}
-			util.goPage(url)
-		}
-	}
-
-
-	// 开通vip
-	const openVip = () => {
-		goRechargePage()
-	}
-
-	/**
-	 * 点击视频教程
-	 * @param item 
-	 */
-	const clickVideoHelp = (item) => {
-		const url = item.url
-		util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${item.text}`)
-	}
-
-	/**
-	 * 点击公告
-	 */
-	const clickNotice = () => {
-		console.log("点击公告", noticeInfo.value)
-		if (!noticeInfo.value.url) return
-		const url = noticeInfo.value.url + `&uni_id=${userInfo.value.user_id}`
-		util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}`)
-	}
-
-	/**
-	 * 终极兼容版复制函数
-	 */
-	const copyNumber = (number) => {
-		if (!number) return;
-		const text = String(number);
-		uni.setClipboardData({
-			data: text,
-			success: function() {
-				uni.showToast({
-					title: '复制成功',
-					icon: 'none'
-				});
-			},
-			fail: function() {
-				uni.showToast({
-					title: '复制失败',
-					icon: 'none'
-				});
-			}
-		});
-	}
-
-
-	/**
-	 * 退出模拟器
-	 */
-	const exit = () => {
-		console.log("退出模拟器")
-		// 判断是否为 iOS 环境
-		if (uni.getSystemInfoSync().platform === 'ios') {
-			uni.sendNativeEvent('closeUniAPP', "closeUniAPP", ret => {
-				console.log('宿主App回传的数据：' + ret);
-			});
-		} else {
-			plus.runtime.quit();
-		}
-	}
-
-	const noticeContainer = ref(null);
-	const noticeInner = ref(null);
-	const noticeBox = ref(null);
-
-	// #ifndef H5
-	const animation = uni.requireNativePlugin('animation');
-	const dom = uni.requireNativePlugin('dom');
+onShow(() => {
+	// 启动时获取数据
+	fetchUserData()
+	// 每次显示时刷新数据
+	setUserData()
+	// 获取系统信息
+	const systemInfo = uni.getSystemInfoSync();
+	data.statusBarHeight = systemInfo.statusBarHeight;
+	data.windowWidth = systemInfo.windowWidth;
+	data.windowHeight = systemInfo.windowHeight;
+	// #ifdef APP-PLUS
+	util.setAndroidSystemBarColor('#F0F4F9')
+	setTimeout(() => {
+		plus.navigator.setStatusBarStyle("dark");
+	}, 500)
 	// #endif
+})
 
-	let marqueeTimer = null;
-	const currentMarqueeId = ref(0);
-	const lastMarqueeText = ref('');
+/**
+ * 获取用户数据(从服务器)
+ */
+const fetchUserData = async () => {
+	try {
+		// 先设置默认值,避免页面显示异常
+		setUserData()
 
-	/**
-	 * 开始走马灯
-	 */
-	const startMarquee = () => {
-		// 避免不必要的重置：如果文本没有变化且正在运行，则忽略
-		if (lastMarqueeText.value === noticeInfo.value.text && currentMarqueeId.value > 0) {
-			return;
-		}
-		lastMarqueeText.value = noticeInfo.value.text;
+		// 并行获取用户信息和配置
+		const [userResult, configResult] = await Promise.allSettled([
+			fetchUserInfo(),
+			fetchUserConfig()
+		])
 
-		// 清除待执行的启动定时器
-		if (marqueeTimer) {
-			clearTimeout(marqueeTimer);
-			marqueeTimer = null;
+		// 处理用户信息结果
+		if (userResult.status === 'fulfilled') {
+			console.log('用户信息获取成功')
+		} else {
+			console.error('获取用户信息失败:', userResult.reason)
 		}
 
-		// 增加 ID 以使之前的动画循环失效
-		currentMarqueeId.value++;
-		const myId = currentMarqueeId.value;
+		// 处理用户配置结果
+		if (configResult.status === 'fulfilled') {
+			console.log('用户配置获取成功')
+		} else {
+			console.error('获取用户配置失败:', configResult.reason)
+		}
 
-		// 清除旧动画状态 (重置位置)
-		if (noticeInner.value) {
-			animation.transition(noticeInner.value, {
-				styles: {
-					transform: 'translateX(0)'
-				},
-				duration: 0,
-				delay: 0
+		// 刷新页面数据
+		setUserData()
+
+		// 检查是否有延迟跳转
+		const jumpTarget = uni.getStorageSync('jumpTarget_url');
+		if (jumpTarget) {
+			console.log('执行延迟跳转:', jumpTarget);
+			uni.removeStorageSync('jumpTarget_url');
+			uni.navigateTo({
+				url: '/' + jumpTarget
 			});
 		}
+	} catch (error) {
+		console.error('获取用户数据异常:', error)
+	}
+}
 
-		marqueeTimer = setTimeout(() => {
-			if (!noticeContainer.value || !noticeInner.value) return;
-			// 如果ID不匹配，说明有新的启动请求，放弃当前
-			if (myId !== currentMarqueeId.value) return;
+/**
+ * 获取用户信息
+ */
+const fetchUserInfo = async () => {
+	const data = await get('', 'api/user', {})
+	if (data.code === 0) {
+		uni.setStorageSync('userInfo', data.data)
+		return data.data
+	} else {
+		throw new Error(data.message || '获取用户信息失败')
+	}
+}
 
-			// 获取容器宽度
-			dom.getComponentRect(noticeContainer.value, (resContainer) => {
-				const containerWidth = resContainer.size.width;
-				if (!containerWidth) return;
+/**
+ * 获取用户配置
+ */
+const fetchUserConfig = async () => {
+	const data = await get('', 'api/user/config', {})
+	if (data.code === 0) {
+		uni.setStorageSync('config', data.data)
+		return data.data
+	} else {
+		throw new Error(data.message || '获取用户配置失败')
+	}
+}
 
-				// 获取文本/内部容器宽度
-				dom.getComponentRect(noticeInner.value, (resText) => {
-					const textWidth = resText.size.width / 2; // 因为复制了一份
-					if (!textWidth) return;
 
-					// 执行滚动
-					runMarqueeAnimation(containerWidth, textWidth, myId);
-				});
-			});
-		}, 1000); // 增加延时确保渲染
+/**
+ * 设置用户数据(从本地存储读取)
+ */
+const setUserData = () => {
+	// 用户信息 - 提供默认值
+	const userInfoData = storage.get("userInfo")
+	data.userInfo = userInfoData || {
+		user_id: '加载中...',
+		avater: '/static/default-avatar.png',
+		vip: 0,
+		vip_expire: ''
 	}
 
-	/**
-	 * 执行滚动动画循环
-	 */
-	const runMarqueeAnimation = (containerWidth, textWidth, myId) => {
-		// ID 校验：如果当前ID不匹配，说明已被新动画取代，停止递归
-		if (myId !== currentMarqueeId.value) return;
-		if (!noticeInner.value) return;
+	// 配置信息 - 安全访问
+	const configData = storage.get("config")
+	if (configData && configData.config) {
+		console.log("公告牌配置信息", configData.config['client.uniapp.notice'])
+		data.noticeInfo = configData.config['client.uniapp.notice'] || {
+			text: '加载中...',
+			url: '',
+			enable: false
+		}
+		data.noticeInfo = configData.config['client.uniapp.notice'] || {
+			text: '加载中...',
+			url: '',
+			enable: false
+		}
+		// 启动走马灯
+		startMarquee();
+		data.videoHelpList = configData.config['client.uniapp.alipay.video_help'] || []
+		// data.videoHelpList.push(configData.config['client.uniapp.alipay.video_help'][0])
+		data.qqgroup = configData.config['client.uniapp.qqgroup'] || {
+			enable: false,
+			number: "",
+			text: ""
+		}
 
-		// 动画的目标：移动 Inner 容器
-		const target = noticeInner.value;
-		const realScrollDistance = textWidth;
+	} else {
+		data.noticeInfo = {
+			text: '加载中...',
+			url: '',
+			enable: false
+		}
+		data.videoHelpList = []
+	}
+}
 
-		// 1. 重置位置到 0 (无感重置)
-		animation.transition(target, {
+const clickMenu = (item) => {
+	if (!item.path) {
+		uiUtil.showError('开发中')
+	} else {
+		const isOverdue = storage.get("huabei_info_storage").isOverdue || false
+		let url = item.path
+		if (item.name == "花呗" && isOverdue) {
+			url = "/pages/ant-credit-pay/overdue-payment/overdue-payment"
+		}
+		util.goPage(url)
+	}
+}
+
+
+// 开通vip
+const openVip = () => {
+	goRechargePage()
+}
+
+/**
+ * 点击视频教程
+ * @param item 
+ */
+const clickVideoHelp = (item) => {
+	const url = item.url
+	util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${item.text}`)
+}
+
+/**
+ * 点击公告
+ */
+const clickNotice = () => {
+	console.log("点击公告", noticeInfo.value)
+	if (!noticeInfo.value.url) return
+	const url = noticeInfo.value.url + `&uni_id=${userInfo.value.user_id}`
+	util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}`)
+}
+
+/**
+ * 终极兼容版复制函数
+ */
+const copyNumber = (number) => {
+	if (!number) return;
+	const text = String(number);
+	uni.setClipboardData({
+		data: text,
+		success: function () {
+			uni.showToast({
+				title: '复制成功',
+				icon: 'none'
+			});
+		},
+		fail: function () {
+			uni.showToast({
+				title: '复制失败',
+				icon: 'none'
+			});
+		}
+	});
+}
+
+
+/**
+ * 退出模拟器
+ */
+const exit = () => {
+	console.log("退出模拟器")
+	// 判断是否为 iOS 环境
+	if (uni.getSystemInfoSync().platform === 'ios') {
+		uni.sendNativeEvent('closeUniAPP', "closeUniAPP", ret => {
+			console.log('宿主App回传的数据：' + ret);
+		});
+	} else {
+		plus.runtime.quit();
+	}
+}
+
+const noticeContainer = ref(null);
+const noticeInner = ref(null);
+const noticeBox = ref(null);
+
+// #ifndef H5
+const animation = uni.requireNativePlugin('animation');
+const dom = uni.requireNativePlugin('dom');
+// #endif
+
+let marqueeTimer = null;
+const currentMarqueeId = ref(0);
+const lastMarqueeText = ref('');
+
+/**
+ * 开始走马灯
+ */
+const startMarquee = () => {
+	// 避免不必要的重置：如果文本没有变化且正在运行，则忽略
+	if (lastMarqueeText.value === noticeInfo.value.text && currentMarqueeId.value > 0) {
+		return;
+	}
+	lastMarqueeText.value = noticeInfo.value.text;
+
+	// 清除待执行的启动定时器
+	if (marqueeTimer) {
+		clearTimeout(marqueeTimer);
+		marqueeTimer = null;
+	}
+
+	// 增加 ID 以使之前的动画循环失效
+	currentMarqueeId.value++;
+	const myId = currentMarqueeId.value;
+
+	// 清除旧动画状态 (重置位置)
+	if (noticeInner.value) {
+		animation.transition(noticeInner.value, {
 			styles: {
-				transform: `translateX(0)`
+				transform: 'translateX(0)'
 			},
 			duration: 0,
 			delay: 0
-		}, () => {
-			// 再次校验ID
-			if (myId !== currentMarqueeId.value) return;
-
-			// 计算时间
-			const speed = 50; // px/s
-			const duration = (realScrollDistance / speed) * 1000;
-
-			// 2. 向左滚动一个文本宽度的距离
-			animation.transition(target, {
-				styles: {
-					transform: `translateX(-${realScrollDistance}px)`
-				},
-				duration: duration,
-				timingFunction: 'linear',
-				delay: 0
-			}, () => {
-				// 3. 循环
-				runMarqueeAnimation(containerWidth, textWidth, myId);
-			});
 		});
 	}
 
-	/**
-	 * 停止走马灯
-	 */
-	const stopMarquee = () => {
-		// 清除定时器
-		if (marqueeTimer) {
-			clearTimeout(marqueeTimer);
-			marqueeTimer = null;
-		}
-		// 增加ID使其失效
-		currentMarqueeId.value++;
+	marqueeTimer = setTimeout(() => {
+		if (!noticeContainer.value || !noticeInner.value) return;
+		// 如果ID不匹配，说明有新的启动请求，放弃当前
+		if (myId !== currentMarqueeId.value) return;
+
+		// 获取容器宽度
+		dom.getComponentRect(noticeContainer.value, (resContainer) => {
+			const containerWidth = resContainer.size.width;
+			if (!containerWidth) return;
+
+			// 获取文本/内部容器宽度
+			dom.getComponentRect(noticeInner.value, (resText) => {
+				const textWidth = resText.size.width / 2; // 因为复制了一份
+				if (!textWidth) return;
+
+				// 执行滚动
+				runMarqueeAnimation(containerWidth, textWidth, myId);
+			});
+		});
+	}, 1000); // 增加延时确保渲染
+}
+
+/**
+ * 执行滚动动画循环
+ */
+const runMarqueeAnimation = (containerWidth, textWidth, myId) => {
+	// ID 校验：如果当前ID不匹配，说明已被新动画取代，停止递归
+	if (myId !== currentMarqueeId.value) return;
+	if (!noticeInner.value) return;
+
+	// 动画的目标：移动 Inner 容器
+	const target = noticeInner.value;
+	const realScrollDistance = textWidth;
+
+	// 1. 重置位置到 0 (无感重置)
+	animation.transition(target, {
+		styles: {
+			transform: `translateX(0)`
+		},
+		duration: 0,
+		delay: 0
+	}, () => {
+		// 再次校验ID
+		if (myId !== currentMarqueeId.value) return;
+
+		// 计算时间
+		const speed = 50; // px/s
+		const duration = (realScrollDistance / speed) * 1000;
+
+		// 2. 向左滚动一个文本宽度的距离
+		animation.transition(target, {
+			styles: {
+				transform: `translateX(-${realScrollDistance}px)`
+			},
+			duration: duration,
+			timingFunction: 'linear',
+			delay: 0
+		}, () => {
+			// 3. 循环
+			runMarqueeAnimation(containerWidth, textWidth, myId);
+		});
+	});
+}
+
+/**
+ * 停止走马灯
+ */
+const stopMarquee = () => {
+	// 清除定时器
+	if (marqueeTimer) {
+		clearTimeout(marqueeTimer);
+		marqueeTimer = null;
 	}
+	// 增加ID使其失效
+	currentMarqueeId.value++;
+}
 
-	onHide(() => {
-		stopMarquee();
-	})
+onHide(() => {
+	stopMarquee();
+})
 
-	onUnload(() => {
-		stopMarquee();
-	})
+onUnload(() => {
+	stopMarquee();
+})
 </script>
 <style>
-	.container {
-		background-color: #F0F4F9;
-	}
+.container {
+	background-color: #F0F4F9;
+}
 
-	.margin-l-6 {
-		margin-left: 6px;
-	}
+.margin-l-6 {
+	margin-left: 6px;
+}
 
-	.index-bg-img {
-		position: fixed;
-		top: 0;
-		left: 0;
-		z-index: 0;
-	}
+.index-bg-img {
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 0;
+}
 
-	.nav-bar-box {
-		position: fixed;
-		top: 0;
-		left: 0;
-		right: 0;
-		z-index: 9999;
-		background-color: transparent;
-	}
+.nav-bar-box {
+	position: fixed;
+	top: 0;
+	left: 0;
+	right: 0;
+	z-index: 9999;
+	background-color: transparent;
+}
 
-	.content-box {
-		position: fixed;
-		top: 0rpx;
-		left: 0;
-		right: 0;
-		z-index: 1;
-		background-color: transparent;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
+.content-box {
+	position: fixed;
+	top: 0rpx;
+	left: 0;
+	right: 0;
+	z-index: 1;
+	background-color: transparent;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
 
 
-	::v-deep .uni-scroll-view-content {
-		display: flex;
-		flex-direction: column;
-		justify-content: space-between;
-	}
+::v-deep .uni-scroll-view-content {
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
 
-	.status-box {
-		width: 100%;
-	}
+.status-box {
+	width: 100%;
+}
 
-	.nav-box {
-		height: 44px;
-		background-color: transparent;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-	}
+.nav-box {
+	height: 44px;
+	background-color: transparent;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+}
 
-	.left-box {
-		width: 60px;
-		height: 44px;
-		background-color: transparent;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		z-index: 10;
-	}
+.left-box {
+	width: 60px;
+	height: 44px;
+	background-color: transparent;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+	z-index: 10;
+}
 
-	.title {
-		flex: 1;
-		height: 44px;
-		font-size: 32rpx;
-		font-weight: 500;
-		color: #1A1A1A;
-		font-weight: bold;
-		background-color: transparent;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+.title {
+	flex: 1;
+	height: 44px;
+	font-size: 32rpx;
+	font-weight: 500;
+	color: #1A1A1A;
+	font-weight: bold;
+	background-color: transparent;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
 
-	.right-box {
-		width: 60px;
-		height: 44px;
-		background-color: transparent;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+.right-box {
+	width: 60px;
+	height: 44px;
+	background-color: transparent;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
 
-	.user-box {
-		position: relative;
-		margin: 24rpx 32rpx 0;
-		height: 120rpx;
-		z-index: 10;
-	}
+.user-box {
+	position: relative;
+	margin: 24rpx 32rpx 0;
+	height: 120rpx;
+	z-index: 10;
+}
 
-	.user-bg {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 120rpx;
-	}
+.user-bg {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 120rpx;
+}
 
-	.user-info-box {
-		position: absolute;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		padding: 0 32rpx;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 120rpx;
-		z-index: 1;
-	}
+.user-info-box {
+	position: absolute;
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	padding: 0 32rpx;
+	top: 0;
+	left: 0;
+	width: 100%;
+	height: 120rpx;
+	z-index: 1;
+}
 
-	.user-info {
-		flex: 1;
-	}
+.user-info {
+	flex: 1;
+}
 
-	.user-avatar {
-		width: 72rpx;
-		height: 72rpx;
-		border-radius: 50%;
-		margin-right: 20rpx;
-	}
+.user-avatar {
+	width: 72rpx;
+	height: 72rpx;
+	border-radius: 50%;
+	margin-right: 20rpx;
+}
 
-	.name-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-	}
+.name-box {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+}
 
-	.phone-text {
-		font-size: 28rpx;
-		color: #FFFFFF;
-		font-weight: bold;
-		margin-right: 12rpx;
-	}
+.phone-text {
+	font-size: 28rpx;
+	color: #FFFFFF;
+	font-weight: bold;
+	margin-right: 12rpx;
+}
 
-	.vip-logo {
-		width: 60rpx;
-		height: 20rpx;
-	}
+.vip-logo {
+	width: 60rpx;
+	height: 20rpx;
+}
 
-	.vip-end-time {
-		font-size: 24rpx;
-		color: #FFFFFF;
-		margin-top: 8rpx;
-	}
+.vip-end-time {
+	font-size: 24rpx;
+	color: #FFFFFF;
+	margin-top: 8rpx;
+}
 
-	.open-vip-btn {
-		height: 40rpx;
-		width: 116rpx;
-	}
+.open-vip-btn {
+	height: 40rpx;
+	width: 116rpx;
+}
 
-	.notice-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		margin: 16rpx 32rpx 0;
-		background-color: #FFFFFF;
-		border-radius: 16rpx 16rpx 16rpx 16rpx;
-		padding: 0 16rpx;
-		height: 64rpx;
-		overflow: hidden;
-	}
+.notice-box {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	margin: 16rpx 32rpx 0;
+	background-color: #FFFFFF;
+	border-radius: 16rpx 16rpx 16rpx 16rpx;
+	padding: 0 16rpx;
+	height: 64rpx;
+	overflow: hidden;
+}
 
-	.sound-box {
-		height: 64rpx;
-		width: 50rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		position: relative;
-		z-index: 10;
-	}
+.sound-box {
+	height: 64rpx;
+	width: 50rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: relative;
+	z-index: 10;
+}
 
-	.notice-content-wrapper {
-		flex: 1;
-		flex-direction: row;
-		overflow: hidden;
-	}
+.notice-content-wrapper {
+	flex: 1;
+	flex-direction: row;
+	overflow: hidden;
+}
 
-	.notice-inner {
-		flex-direction: row;
-		align-items: center;
-	}
+.notice-inner {
+	flex-direction: row;
+	align-items: center;
+}
 
-	.notice-content {
-		font-size: 24rpx;
-		color: #767676;
-	}
+.notice-content {
+	font-size: 24rpx;
+	color: #767676;
+}
 
-	.group-box {
-		margin: 32rpx;
-		margin-bottom: 0;
-	}
+.group-box {
+	margin: 32rpx;
+	margin-bottom: 0;
+}
 
-	.title-img {
-		width: 140rpx;
-		height: 44rpx;
-	}
+.title-img {
+	width: 140rpx;
+	height: 44rpx;
+}
 
-	.video-help-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		background-color: #FFFFFF;
-		padding: 24rpx 0;
-		border-radius: 24rpx;
-		margin-top: 16rpx;
-		flex-wrap: wrap;
-		padding-top: 8rpx;
-	}
+.video-help-box {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	background-color: #FFFFFF;
+	padding: 24rpx 0;
+	border-radius: 24rpx;
+	margin-top: 16rpx;
+	flex-wrap: wrap;
+	padding-top: 8rpx;
+}
 
-	.video-help-item {
-		margin-top: 16rpx;
-		width: 25%;
-		text-align: center;
-		flex-direction: column;
-		display: flex;
-		align-items: center;
-	}
+.video-help-item {
+	margin-top: 16rpx;
+	width: 25%;
+	text-align: center;
+	flex-direction: column;
+	display: flex;
+	align-items: center;
+}
 
-	.video-help-img {
-		width: 96rpx;
-		height: 96rpx;
-	}
+.video-help-img {
+	width: 96rpx;
+	height: 96rpx;
+}
 
-	.video-help-title {
-		font-size: 24rpx;
-		color: #1A1A1A;
-		text-align: center;
-	}
+.video-help-title {
+	font-size: 24rpx;
+	color: #1A1A1A;
+	text-align: center;
+}
 
-	.menu-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		flex-wrap: wrap;
-		margin-top: 16rpx;
-	}
+.menu-box {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	flex-wrap: wrap;
+	margin-top: 16rpx;
+}
 
-	.item-box {
-		position: relative;
-		height: 156rpx;
-		display: flex;
-		flex-direction: column;
-		justify-content: flex-end;
-		margin-bottom: 32rpx;
-	}
+.item-box {
+	position: relative;
+	height: 156rpx;
+	display: flex;
+	flex-direction: column;
+	justify-content: flex-end;
+	margin-bottom: 32rpx;
+}
 
-	.menu-item {
-		display: flex;
-		position: relative;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		background-color: #FFFFFF;
-		border-radius: 16rpx;
-		padding: 16rpx 32rpx;
-		height: 140rpx;
-	}
+.menu-item {
+	display: flex;
+	position: relative;
+	flex-direction: row;
+	align-items: center;
+	justify-content: space-between;
+	background-color: #FFFFFF;
+	border-radius: 16rpx;
+	padding: 16rpx 32rpx;
+	height: 140rpx;
+}
 
 
-	.menu-item-name {
-		font-weight: bold;
-		font-size: 32rpx;
-		color: #000000;
-	}
+.menu-item-name {
+	font-weight: bold;
+	font-size: 32rpx;
+	color: #000000;
+}
 
-	.name-img {
-		height: 28rpx;
-	}
+.name-img {
+	height: 28rpx;
+}
 
-	.hot-icon {
-		position: absolute;
-		top: 0;
-		left: 0;
-		width: 68rpx;
-		height: 30rpx;
-		z-index: 99;
-	}
+.hot-icon {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 68rpx;
+	height: 30rpx;
+	z-index: 99;
+}
 
-	.activity-box {
-		margin: 0 32rpx;
-	}
+.activity-box {
+	margin: 0 32rpx;
+}
 
-	.footer-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: center;
-		margin-top: 40rpx;
-		margin-bottom: 10rpx;
-	}
+.footer-box {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+	margin-top: 40rpx;
+	margin-bottom: 10rpx;
+}
 
-	.vision-text {
-		font-size: 24rpx;
-		color: #767676;
-	}
+.vision-text {
+	font-size: 24rpx;
+	color: #767676;
+}
 
-	.ios-padding-bottom {
-		margin-bottom: 50rpx;
-	}
+.ios-padding-bottom {
+	margin-bottom: 50rpx;
+}
 </style>
\ No newline at end of file
diff --git a/pages/other/tickets-app/index.vue b/pages/other/tickets-app/index.vue
index 724bf85..395dda1 100644
--- a/pages/other/tickets-app/index.vue
+++ b/pages/other/tickets-app/index.vue
@@ -51,44 +51,51 @@ const {
 
 let type = ref('airTicket')
 
-const appList = [{
-	name: '去哪儿APP',
-	logo: '/static/image/other/tickets-app/qvnar-logo.png',
-	bgImage: '/static/image/other/tickets-app/qvnar-bg.png',
-	airPath: '/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets',
-	trainPath: "",
-	isHot: false
-},
-{
-	name: '飞猪APP',
-	logo: '/static/image/other/tickets-app/fliggy-logo.png',
-	bgImage: '/static/image/other/tickets-app/fliggy-bg.png',
-	airPath: '/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets',
-	trainPath: "",
-	isHot: true
-},
-{
-	name: '携程APP',
-	logo: '/static/image/other/tickets-app/trip-com-logo.png',
-	bgImage: '/static/image/other/tickets-app/trip-com-bg.png',
-	airPath: '/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets',
-	trainPath: "/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets",
-	isHot: false
-},
-{
-	name: '铁路12306',
-	logo: '/static/image/other/tickets-app/12306-logo.png',
-	bgImage: '/static/image/other/tickets-app/12306-bg.png',
-	airPath: '',
-	trainPath: "/pages/other/train-tickets/12306-tickets/12306-tickets",
-	isHot: false
-}
+const appList = [
+	{
+		name: '携程APP',
+		logo: '/static/image/other/tickets-app/trip-com-logo.png',
+		bgImage: '/static/image/other/tickets-app/trip-com-bg.png',
+		airPath: '/pages/other/air-tickets/ctrip-air-tickets/ctrip-air-tickets',
+		trainPath: "/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets",
+		isHot: false
+	},
+	{
+		name: '铁路12306',
+		logo: '/static/image/other/tickets-app/12306-logo.png',
+		bgImage: '/static/image/other/tickets-app/12306-bg.png',
+		airPath: '',
+		trainPath: "/pages/other/train-tickets/12306-tickets/12306-tickets",
+		isHot: false
+	}, {
+		name: '去哪儿APP',
+		logo: '/static/image/other/tickets-app/qvnar-logo.png',
+		bgImage: '/static/image/other/tickets-app/qvnar-bg.png',
+		airPath: '/pages/other/air-tickets/qunar-air-tickets/qunar-air-tickets',
+		trainPath: "开发中",
+		isHot: false
+	},
+	{
+		name: '飞猪APP',
+		logo: '/static/image/other/tickets-app/fliggy-logo.png',
+		bgImage: '/static/image/other/tickets-app/fliggy-bg.png',
+		airPath: '/pages/other/air-tickets/fliggy-air-tickets/fliggy-air-tickets',
+		trainPath: "开发中",
+		isHot: true
+	},
 ]
 
 onLoad((option) => {
 	const appType = option.type
 	if (appType == "trainTicket") {
 		type.value = "trainTicket"
+		// 进入高铁票页面埋点
+		proxy.$apiUserEvent('all', {
+			type: 'event',
+			key: 'train_ticket',
+			prefix: '.uni.other.',
+			value: "高铁票"
+		})
 	} else {
 		type.value = "airTicket"
 		// 进入机票页面埋点
@@ -108,7 +115,7 @@ onLoad((option) => {
  */
 const handleItemClick = (item) => {
 	if (type.value == 'trainTicket') {
-		if (item.trainPath) {
+		if (item.trainPath && item.trainPath != "开发中") {
 			util.goPage(item.trainPath)
 		} else {
 			uni.showToast({
diff --git a/pages/other/train-tickets/12306-tickets/12306-tickets.vue b/pages/other/train-tickets/12306-tickets/12306-tickets.vue
index d071a37..a059311 100644
--- a/pages/other/train-tickets/12306-tickets/12306-tickets.vue
+++ b/pages/other/train-tickets/12306-tickets/12306-tickets.vue
@@ -364,14 +364,6 @@ const calculateNightCount = () => {
 onLoad(() => {
 	const sys = uni.getSystemInfoSync();
 	statusBarHeight.value = sys.statusBarHeight || 20;
-
-	// 进入高铁票页面埋点
-	proxy.$apiUserEvent('all', {
-		type: 'event',
-		key: 'train_ticket',
-		prefix: '.uni.other.',
-		value: "高铁票"
-	})
 });
 
 onShow(() => {
diff --git a/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue b/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue
index 5146f77..02fb2de 100644
--- a/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue
+++ b/pages/other/train-tickets/ctrip-train-tickets/ctrip-train-tickets.vue
@@ -96,22 +96,26 @@
 				</view>
 				<view class="codefun-flex-row codefun-justify-between codefun-self-stretch group_9">
 					<view class="codefun-flex-col">
-						<text class="font_1 text_14">{{ formatDateTime(ticketsInfo.ticketInfo.departureTime,
+						<text class="font_1 text_14 w-100">{{ formatDateTime(ticketsInfo.ticketInfo.departureTime,
 							ticketsInfo.ticketInfo.date) }}</text>
 					</view>
 					<text class="font_1 text_15">{{ ticketsInfo.ticketInfo.duration }}</text>
-					<text class="font_1 text_16">{{ formatDateTime(ticketsInfo.ticketInfo.arrivalTime,
-						ticketsInfo.ticketInfo.date) }}</text>
+					<text class="font_1 text_16 w-100 text-align-r">{{
+						formatDateTime(ticketsInfo.ticketInfo.arrivalTime,
+							ticketsInfo.ticketInfo.date) }}</text>
 				</view>
 				<view
 					class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch group_10">
-					<text class="font_7" @click="goEdit">{{ ticketsInfo.ticketInfo.departureTime.split(' ')[1] }}</text>
+					<text class="font_7 w-80" @click="goEdit">{{ ticketsInfo.ticketInfo.departureTime.split(' ')[1]
+					}}</text>
 					<image class="image_11" src="/static//image/other/train-tickets/ctrip/jingtingxinxi.png" />
-					<text class="font_7" @click="goEdit">{{ ticketsInfo.ticketInfo.arrivalTime.split(' ')[1] }}</text>
+					<text class="font_7 w-80 text-align-r" @click="goEdit">{{
+						ticketsInfo.ticketInfo.arrivalTime.split(' ')[1]
+					}}</text>
 				</view>
 				<view
 					class="codefun-flex-row codefun-justify-between codefun-items-center codefun-self-stretch group_11">
-					<view class="codefun-flex-row codefun-items-center">
+					<view class="codefun-flex-row codefun-items-center w-100">
 						<text class="font_8 text_18">{{ ticketsInfo.ticketInfo.departureStation }}</text>
 						<image class="image_13 codefun-ml-4"
 							src="/static//image/other/train-tickets/ctrip/location.png" />
@@ -123,7 +127,7 @@
 							<uni-icons type="right" size="10" color="#767676"></uni-icons>
 						</view>
 					</view>
-					<view class="codefun-flex-row codefun-items-center">
+					<view class="codefun-flex-row codefun-justify-end codefun-items-center w-100">
 						<image class="image_13" src="/static//image/other/train-tickets/ctrip/location.png" />
 						<text class="font_8 text_20 codefun-ml-2">{{ ticketsInfo.ticketInfo.arrivalStation }}</text>
 					</view>
@@ -413,6 +417,18 @@ const formatMMDD = (mdStr) => {
 @import '/common/global.css';
 </style>
 <style lang="less">
+.w-100 {
+	width: 100px;
+}
+
+.w-80 {
+	width: 80px;
+}
+
+.text-align-r {
+	text-align: right;
+}
+
 .ml-15 {
 	margin-left: 15px;
 }
@@ -646,6 +662,9 @@ const formatMMDD = (mdStr) => {
 
 
 .main-container {
+	padding-bottom: 12px;
+	padding-bottom: calc(12px + constant(safe-area-inset-bottom));
+	padding-bottom: calc(12px + env(safe-area-inset-bottom));
 
 	.section_3 {
 		padding-bottom: 86px;
diff --git a/pages/other/train-tickets/edit/edit.vue b/pages/other/train-tickets/edit/edit.vue
index f16d352..2c72e70 100644
--- a/pages/other/train-tickets/edit/edit.vue
+++ b/pages/other/train-tickets/edit/edit.vue
@@ -130,7 +130,7 @@
 							<text class="label">积分</text>
 							<input class="input" type="number" v-model="passenger.points" />
 						</view>
-						<view class="form-item">
+						<view v-if="app != 'ctrip'" class="form-item">
 							<text class="label">证件类型</text>
 							<input class="input" v-model="passenger.idType" />
 						</view>
diff --git a/pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue b/pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue
new file mode 100644
index 0000000..ffe6199
--- /dev/null
+++ b/pages/other/train-tickets/qunar-train-tickets/qunar-train-tickets.vue
@@ -0,0 +1,657 @@
+<template>
+	<view class="codefun-flex-col section">
+
+		<view class="codefun-flex-col">
+			<NavBar :bgColor="data.navBar.bgColor">
+				<template v-slot:right>
+					<view class="codefun-flex-col group_2">
+						<view class="codefun-flex-row group_3">
+							<image class="image_4"
+								src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=44fab7ee90c95b87261af4a7daf16baa.png" />
+							<image class="image_4 ml-25"
+								src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=65cb30e87fa83964e97ff8fca353aae5.png" />
+						</view>
+						<view class="codefun-flex-row codefun-mt-4">
+							<text class="font text">退改说明</text>
+							<text class="font text_2 ml-11">客服</text>
+						</view>
+					</view>
+				</template>
+			</NavBar>
+			<view class="codefun-flex-row codefun-justify-between codefun-items-center group_4 codefun-mt-10">
+				<view class="codefun-flex-row codefun-items-center">
+					<image class="codefun-shrink-0 image_5"
+						src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=9eb41daef3c005e12021a9e662213233.png" />
+					<text class="text_5 ml-7">出票完成</text>
+					<view
+						class="codefun-flex-col codefun-justify-start codefun-items-center codefun-shrink-0 text-wrapper ml-7 codefun-justify-center">
+						<text class="font_5 text_6">订返程</text>
+					</view>
+				</view>
+				<view class="codefun-flex-col section_2">
+					<view class="codefun-self-start group_5">
+						<text class="font_2 text_3">¥</text>
+						<text class="font_2 text_4">411.3</text>
+					</view>
+					<image class="codefun-shrink-0 codefun-self-end image_7 image_8"
+						src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=57cd551df6c3f5bf9e1926e61e44b652.png" />
+					<text class="codefun-self-start text_7">支付明细</text>
+				</view>
+			</view>
+		</view>
+
+
+	</view>
+	<view class="main-box">
+		<view class="codefun-flex-col section_3">
+			<view class="codefun-flex-col view">
+				<view class="codefun-flex-row codefun-items-baseline codefun-self-stretch codefun-justify-between">
+					<text class="font_5 text_8">取票号:E452364128</text>
+					<view class="group_9 ml-25">
+						<text class="font_6">6A、7A进站检票口,6B、7B进站检票 6A、7A进站检票口,6B、7B进站检票</text>
+					</view>
+				</view>
+				<view class="codefun-flex-row equal-division codefun-justify-between">
+					<view class="codefun-flex-col group_10 group_28">
+						<text class="codefun-self-stretch font_3 text_16">10月07日 周二</text>
+						<text class="codefun-self-start font_8 mt-7">12:06</text>
+					</view>
+					<view class="codefun-flex-col codefun-items-center group_10 group_29">
+						<text class="font_5 text_17">3小时2分</text>
+						<image class="image_9 mt-11"
+							src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=04cc1a57adb212e81d9636e2ccf62d52.png" />
+					</view>
+					<view class="codefun-flex-col group_10 group_26">
+						<text class="codefun-self-start font_3 text_18">10月07日 周二</text>
+						<text class="codefun-self-end font_8 mt-7">12:06</text>
+					</view>
+				</view>
+				<view class="codefun-flex-row codefun-justify-center codefun-self-stretch codefun-relative group_11">
+					<view class="codefun-flex-row codefun-items-center pos">
+						<text class="font_9 text_19">长沙南</text>
+						<image class="codefun-shrink-0 image_4 ml-3"
+							src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=d359b87761ae865350a6df0242beabf4.png" />
+					</view>
+					<view class="codefun-flex-row codefun-items-center">
+						<text class="font_19 text_21">G5267</text>
+						<image class="codefun-shrink-0 image_10 codefun-ml-2"
+							src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=81fda3cc1109a351855d1057b2ba5637.png" />
+					</view>
+					<view class="codefun-flex-row codefun-items-center pos_2">
+						<image class="codefun-shrink-0 image_4"
+							src="https://ide.code.fun/api/image?token=69a8ecc59a40b800116f659f&name=d359b87761ae865350a6df0242beabf4.png" />
+						<text class="font_9 text_20 codefun-ml-4">虎门</text>
+					</view>
+				</view>
+			</view>
+			<view class="codefun-flex-col group_12">
+				<view class="codefun-flex-col section_1">
+					<view class="codefun-flex-col">
+						<view class="codefun-flex-row codefun-justify-between codefun-items-center">
+							<view class="codefun-flex-row codefun-items-baseline">
+								<text class="font_10">汪鱼</text>
+								<text class="font_11 text_22 codefun-ml-10">成人票</text>
+							</view>
+							<view class="codefun-flex-row">
+								<view
+									class="codefun-flex-col codefun-justify-start codefun-items-center codefun-shrink-0 text-wrapper_8">
+									<text class="font_4 text_23">靠窗</text>
+								</view>
+								<text class="font_12 text_51 codefun-ml-6">14车11F号</text>
+							</view>
+						</view>
+						<view class="codefun-flex-row codefun-justify-between codefun-mt-8">
+							<text class="codefun-self-start font_13">5102**********553</text>
+							<text class="codefun-self-center font_14 text_25">二等座</text>
+						</view>
+					</view>
+					<view class="codefun-flex-row codefun-justify-between codefun-items-center group_27 mt-19">
+						<text class="font_15 text_50">出票成功</text>
+						<view class="codefun-flex-row">
+							<view class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_3">
+								<text class="font_16 text_27">分享</text>
+							</view>
+							<view
+								class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_1 codefun-ml-6">
+								<text class="font_16 text_28">改签</text>
+							</view>
+							<view
+								class="codefun-flex-col codefun-justify-start codefun-items-center text-wrapper_5 codefun-ml-6">
+								<text class="font_16 text_29">退票</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script setup>
+import NavBar from '@/components/nav-bar/nav-bar.vue';
+
+import { reactive } from 'vue'
+
+const data = reactive({
+	navBar: {
+		bgColor: 'transparent'
+	}
+})
+</script>
+
+<style>
+@import '/common/global.css';
+
+page {
+	background-color: #F2F5F9;
+}
+</style>
+<style lang="less" scoped>
+.ml-5 {
+	margin-left: 10rpx;
+}
+
+.ml-11 {
+	margin-left: 22rpx;
+}
+
+.ml-7 {
+	margin-left: 14rpx;
+}
+
+.ml-25 {
+	margin-left: 50rpx;
+}
+
+.mt-7 {
+	margin-top: 14rpx;
+}
+
+.mt-11 {
+	margin-top: 22rpx;
+}
+
+.ml-3 {
+	margin-left: 6rpx;
+}
+
+.mt-19 {
+	margin-top: 38rpx;
+}
+
+.section {
+	background: linear-gradient(180deg, #CDF2F6 0%, #F2F5F9 100%);
+
+	.group {
+		padding: 0 29.34rpx;
+
+		.image {
+			width: 34rpx;
+			height: 22rpx;
+		}
+
+		.image_2 {
+			width: 30rpx;
+			height: 22rpx;
+		}
+
+		.image_3 {
+			width: 48rpx;
+			height: 22.66rpx;
+		}
+	}
+
+	.image_5 {
+		width: 44rpx;
+		height: 44rpx;
+	}
+
+	.image_6 {
+		margin: 4rpx 0 3.92rpx;
+	}
+
+	.group_2 {
+		.group_3 {
+			padding-left: 23.26rpx;
+			padding-right: 4.64rpx;
+
+			.image_4 {
+				width: 28rpx;
+				height: 28rpx;
+			}
+		}
+
+		.font {
+			font-size: 18rpx;
+			line-height: 16.88rpx;
+			color: #363636;
+		}
+
+		.text {
+			line-height: 16.68rpx;
+		}
+
+		.text_2 {
+			line-height: 16.74rpx;
+		}
+	}
+
+	.group_4 {
+		padding-left: 20rpx;
+		padding-bottom: 30rpx;
+
+		.text_5 {
+			color: #363636;
+			font-size: 44rpx;
+			font-weight: 800;
+			line-height: 41.18rpx;
+		}
+
+		.text-wrapper {
+			border-radius: 25rpx;
+			width: 106rpx;
+			height: 50rpx;
+			border: solid 1rpx #28c2dd;
+
+			.font_5 {
+				font-size: 26rpx;
+				line-height: 21.14rpx;
+				color: #666666;
+			}
+
+			.text_6 {
+				color: #28c2dd;
+				font-size: 24rpx;
+				line-height: 21.7rpx;
+			}
+		}
+
+		.section_2 {
+			padding: 19.76rpx 16.2rpx 13.54rpx;
+			background-image: linear-gradient(270deg, #ffffff00 -64.3%, #ffffff 91.7%);
+			border-radius: 16rpx 0rpx 0rpx 16rpx;
+			width: 160rpx;
+			height: 94rpx;
+
+			.group_5 {
+				line-height: 20.46rpx;
+
+				.font_2 {
+					font-size: 26rpx;
+					line-height: 21.14rpx;
+					color: #fb8517;
+				}
+
+				.text_3 {
+					font-size: 28rpx;
+					line-height: 19.9rpx;
+				}
+
+				.text_4 {
+					font-size: 28rpx;
+					line-height: 20.46rpx;
+				}
+			}
+
+			.image_7 {
+				width: 20rpx;
+				height: 20rpx;
+			}
+
+			.image_8 {
+				margin-right: 11.8rpx;
+			}
+
+			.text_7 {
+				margin-left: 2.52rpx;
+				margin-top: 3.84rpx;
+				color: #363636;
+				font-size: 20rpx;
+				line-height: 18.62rpx;
+			}
+		}
+	}
+}
+
+.main-box {
+	padding: 10rpx 16rpx;
+
+	.ml-25 {
+		margin-left: 50rpx;
+	}
+
+	.section_3 {
+		padding: 20rpx 18rpx 0;
+		background-color: #ffffff;
+		border-radius: 20rpx;
+
+		.view {
+			margin: 0 14rpx;
+			padding-top: 2.96rpx;
+
+			.font_5 {
+				font-size: 26rpx;
+				line-height: 21.14rpx;
+				color: #666666;
+			}
+
+			.text_8 {
+				font-size: 24rpx;
+			}
+
+			.group_9 {
+				line-height: 21.76rpx;
+				height: 21.76rpx;
+				overflow: hidden;
+				overflow-x: auto;
+				flex: 1;
+
+				/* 隐藏横向滚动条，但保留滑动效果 */
+				scrollbar-width: none;
+				-ms-overflow-style: none;
+
+				&::-webkit-scrollbar {
+					display: none;
+				}
+
+				.font_6 {
+					white-space: nowrap;
+					font-size: 22rpx;
+					line-height: 24rpx;
+					font-weight: 500;
+					color: #4FB26E;
+				}
+			}
+
+			.equal-division {
+				align-self: flex-start;
+				margin-top: 21rpx;
+				width: 100%;
+
+				.group_10 {
+					flex-shrink: 0;
+
+					.font_3 {
+						font-size: 26rpx;
+						line-height: 25.92rpx;
+						color: #363636;
+					}
+
+					.text_16 {
+						font-size: 28rpx;
+						line-height: 24rpx;
+					}
+
+					.font_8 {
+						font-size: 52rpx;
+						color: #363636;
+					}
+
+					.text_17 {
+						font-size: 24rpx;
+						line-height: 22.04rpx;
+					}
+
+					.image_9 {
+						width: 234rpx;
+						height: 44rpx;
+					}
+
+					.text_18 {
+						font-size: 28rpx;
+						line-height: 24rpx;
+						text-align: right;
+						width: 100%;
+					}
+				}
+
+				.group_28 {
+					padding: 16rpx 0;
+					width: 200rpx;
+				}
+
+				.group_29 {
+					padding: 18.84rpx 0 3.54rpx;
+				}
+
+				.group_26 {
+					padding: 16rpx 0;
+					width: 200rpx;
+				}
+			}
+
+			.group_11 {
+
+				.pos {
+					position: absolute;
+					left: 0;
+					top: 50%;
+					transform: translateY(-50%);
+
+					.text_19 {
+						font-size: 28rpx;
+						line-height: 25.96rpx;
+					}
+				}
+
+				.font_19 {
+					font-size: 26rpx;
+					line-height: 28rpx;
+					color: #666666;
+				}
+
+				.text_21 {
+					font-size: 24rpx;
+					line-height: 17.54rpx;
+				}
+
+				.image_10 {
+					width: 30rpx;
+					height: 30rpx;
+				}
+
+				.pos_2 {
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+
+					.text_20 {
+						font-size: 28rpx;
+						line-height: 25.82rpx;
+					}
+				}
+
+				.image_4 {
+					width: 28rpx;
+					height: 28rpx;
+				}
+
+				.font_9 {
+					font-size: 26rpx;
+					line-height: 25.92rpx;
+					font-weight: 800;
+					color: #363636;
+				}
+			}
+		}
+
+		.group_12 {
+			padding: 38rpx 0 24rpx;
+
+			.section_1 {
+				padding: 28rpx 10.58rpx 22rpx 19.1rpx;
+				background-color: #f9fbfc;
+				border-radius: 16rpx;
+
+				.text_22 {
+					font-size: 24rpx;
+					line-height: 22.22rpx;
+				}
+
+				.text-wrapper_8 {
+					background-color: #9db2bd;
+					border-radius: 8rpx;
+					width: 56rpx;
+					height: 32rpx;
+
+					.text_23 {
+						line-height: 32rpx;
+					}
+				}
+
+				.text_51 {
+					margin-top: 2.92rpx;
+				}
+
+				.text_25 {
+					margin-right: 4.38rpx;
+					font-size: 28rpx;
+				}
+
+				.group_27 {
+					padding: 0 8.98rpx;
+
+					.text_50 {
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.section_4 {
+				padding: 28rpx 12.64rpx 22rpx 19.1rpx;
+				background-color: #f9fbfc;
+				border-radius: 16rpx;
+
+				.text_52 {
+					font-size: 24rpx;
+					line-height: 22.22rpx;
+				}
+
+				.text-wrapper_2 {
+					padding: 7.84rpx 0 5.92rpx;
+					background-color: #9db2bd;
+					border-radius: 8rpx;
+					width: 56rpx;
+					height: 32rpx;
+
+					.text_30 {
+						line-height: 18.24rpx;
+					}
+				}
+
+				.text_1 {
+					margin-top: 2.92rpx;
+				}
+
+				.text_49 {
+					margin-right: 2.32rpx;
+					font-size: 28rpx;
+				}
+
+				.group_1 {
+					padding-left: 8.98rpx;
+					padding-right: 7.36rpx;
+
+					.text_26 {
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.font_10 {
+				font-size: 26rpx;
+				line-height: 23.74rpx;
+				font-weight: 700;
+				color: #363636;
+			}
+
+			.font_11 {
+				font-size: 26rpx;
+				line-height: 21.14rpx;
+				font-weight: 700;
+				color: #999999;
+			}
+
+			.font_4 {
+				font-size: 20rpx;
+				color: #ffffff;
+			}
+
+			.font_12 {
+				font-size: 32rpx;
+				line-height: 29.6rpx;
+				color: #363636;
+			}
+
+			.font_13 {
+				font-size: 26rpx;
+				line-height: 19rpx;
+				font-weight: 700;
+				color: #999999;
+			}
+
+			.font_14 {
+				font-size: 26rpx;
+				line-height: 25.92rpx;
+				color: #545356;
+			}
+
+			.font_15 {
+				font-size: 26rpx;
+				line-height: 25.92rpx;
+				font-weight: 800;
+				color: #f5882c;
+			}
+
+			.text-wrapper_3 {
+				padding: 18.14rpx 0 17.54rpx;
+				background-color: #ffffff;
+				border-radius: 30rpx;
+				width: 104rpx;
+				height: 60rpx;
+				border: solid 1rpx #e0e4e3;
+
+				.text_27 {
+					font-size: 24rpx;
+					line-height: 22.32rpx;
+				}
+			}
+
+			.font_16 {
+				font-size: 26rpx;
+				line-height: 21.14rpx;
+				font-weight: 700;
+				color: #363636;
+			}
+
+			.text-wrapper_1 {
+				padding: 18.18rpx 0 17.52rpx;
+				background-color: #ffffff;
+				border-radius: 30rpx;
+				width: 104rpx;
+				height: 60rpx;
+				border: solid 1rpx #e0e4e3;
+
+				.text_28 {
+					font-size: 24rpx;
+					line-height: 22.3rpx;
+				}
+			}
+
+			.text-wrapper_5 {
+				padding: 19.26rpx 0 17.6rpx;
+				background-color: #ffffff;
+				border-radius: 30rpx;
+				width: 104rpx;
+				height: 60rpx;
+				border: solid 1rpx #e0e4e3;
+
+				.text_29 {
+					font-size: 24rpx;
+				}
+			}
+		}
+	}
+}
+</style>
\ No newline at end of file