From 3586dc4a359c4f05f6d4c3337baed9c00e075347 Mon Sep 17 00:00:00 2001
From: tangxinyue <524779910@qq.com>
Date: Thu, 30 Apr 2026 15:26:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9webview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                          | 356 ++++++++++++++++---------------
 main.js                          |   2 +-
 pages/common/webview/webview.vue | 229 +++++++++++---------
 pages/index/index.nvue           |   2 +-
 static/image/close.png           | Bin 0 -> 339 bytes
 5 files changed, 304 insertions(+), 285 deletions(-)
 create mode 100644 static/image/close.png

diff --git a/App.vue b/App.vue
index e533e63..114d844 100644
--- a/App.vue
+++ b/App.vue
@@ -1,201 +1,203 @@
 <script>
-export default {
-	globalData: {
-		NativeEvent: true,
-		recentNativeEvent: "", // 初始化一个全局变量
-		recentNativeData: 0 // 初始化一个全局变量
-	},
-	onLaunch: function (options) {
-		
+	export default {
+		globalData: {
+			NativeEvent: true,
+			recentNativeEvent: "", // 初始化一个全局变量
+			recentNativeData: 0 // 初始化一个全局变量
+		},
+		onLaunch: function(options) {
+
 			// console.log=()=>{}
-		// === wgt 包启动诊断日志 ===
-		console.log('=== App Launch 开始 ===')
-		console.log('启动参数:', JSON.stringify(options))
-		console.log('环境:', process.env.NODE_ENV)
+			// === wgt 包启动诊断日志 ===
+			console.log('=== App Launch 开始 ===')
+			console.log('启动参数:', JSON.stringify(options))
+			console.log('环境:', process.env.NODE_ENV)
 
 
-		uni.setStorageSync('onNativeEventReceive', "no")
-		// 清除上次遗留的跳转指令，防止正常启动时自动跳转
-		uni.removeStorageSync('jumpTarget_url');
-		const startTime = Date.now()
+			uni.setStorageSync('onNativeEventReceive', "no")
+			// 清除上次遗留的跳转指令，防止正常启动时自动跳转
+			uni.removeStorageSync('jumpTarget_url');
+			const startTime = Date.now()
 
-		// 1. 获取并存储系统信息（只获取一次）
-		const systemInfo = uni.getSystemInfoSync()
-		uni.setStorageSync('systemInfo', {
-			platform: systemInfo.platform,
-			system: systemInfo.system,
-			osName: systemInfo.osName,
-			osVersion: systemInfo.osVersion,
-			statusBarHeight: systemInfo.statusBarHeight,
-			windowWidth: systemInfo.windowWidth,
-			windowHeight: systemInfo.windowHeight,
-			isIOS: systemInfo.platform === 'ios',
-			isAndroid: systemInfo.platform === 'android'
-		})
+			// 1. 获取并存储系统信息（只获取一次）
+			const systemInfo = uni.getSystemInfoSync()
+			uni.setStorageSync('systemInfo', {
+				platform: systemInfo.platform,
+				system: systemInfo.system,
+				osName: systemInfo.osName,
+				osVersion: systemInfo.osVersion,
+				statusBarHeight: systemInfo.statusBarHeight,
+				windowWidth: systemInfo.windowWidth,
+				windowHeight: systemInfo.windowHeight,
+				isIOS: systemInfo.platform === 'ios',
+				isAndroid: systemInfo.platform === 'android'
+			})
 
-		// 2. 立即设置宿主消息监听（避免错过消息）
-		this.setupNativeEventListener()
+			// 2. 立即设置宿主消息监听（避免错过消息）
+			this.setupNativeEventListener()
 
-		// 3. 同步初始化配置（必须完成）
-		this.initConfig(options)
+			// 3. 同步初始化配置（必须完成）
+			this.initConfig(options)
 
-		// 启动完成
-		console.log(`=== App 启动完成，耗时: ${Date.now() - startTime}ms ===`)
+			// 启动完成
+			console.log(`=== App 启动完成，耗时: ${Date.now() - startTime}ms ===`)
 
-		// 初始化埋点，进入支付宝模拟器首页
-		this.$apiUserEvent('all', {
-			type: 'event',
-			key: 'index',
-			value: "进入支付宝模拟器首页",
-		})
-	},
+			// 初始化埋点，进入支付宝模拟器首页
+			this.$apiUserEvent('all', {
+				type: 'event',
+				key: 'index',
+				value: "进入支付宝模拟器首页",
+			})
+		},
 
-	onShow: function () {
-		console.log('App Show')
-		// 监听已在 onLaunch 中设置，这里不再重复
-	},
+		onShow: function() {
+			console.log('App Show')
+			// 监听已在 onLaunch 中设置，这里不再重复
+		},
 
-	onHide: function () {
-		console.log('App Hide')
-	},
-	onExit: function () {
-		// 关闭数据库
-		// #ifdef APP
-		// plus.sqlite.closeDatabase({ name: 'zyds' })
-		uni.sendNativeEvent('unimp_stop_alipay', "stop", ret => {
-			// console.log('宿主App回传的数据：' + ret);
-		});
-		// #endif
-		console.log('App onExit')
-	},
+		onHide: function() {
+			console.log('App Hide')
+		},
+		onExit: function() {
+			// 关闭数据库
+			// #ifdef APP
+			// plus.sqlite.closeDatabase({ name: 'zyds' })
+			uni.sendNativeEvent('unimp_stop_alipay', "stop", ret => {
+				// console.log('宿主App回传的数据：' + ret);
+			});
+			// #endif
+			console.log('App onExit')
+		},
 
-	methods: {
-		/**
-		 * 设置宿主消息监听（在 onLaunch 中调用）
-		 */
-		setupNativeEventListener() {
-			if (this.globalData.NativeEvent) {
-				this.globalData.NativeEvent = false
-				console.log('开始监听宿主消息')
+		methods: {
+			/**
+			 * 设置宿主消息监听（在 onLaunch 中调用）
+			 */
+			setupNativeEventListener() {
+				if (this.globalData.NativeEvent) {
+					this.globalData.NativeEvent = false
+					console.log('开始监听宿主消息')
 
-				if (typeof uni.onNativeEventReceive === 'function') {
-					uni.onNativeEventReceive((event, data) => {
-						if (event) {
-							console.log('接收到宿主消息:', event, data)
+					if (typeof uni.onNativeEventReceive === 'function') {
+						uni.onNativeEventReceive((event, data) => {
+							if (event) {
+								console.log('接收到宿主消息:', event, data)
 
-							if (event == "token") {
-								let header = uni.getStorageSync('header') || {}
-								header["x-token"] = data
-								uni.setStorageSync('header', header)
-								console.log('已更新 token')
+								if (event == "token") {
+									let header = uni.getStorageSync('header') || {}
+									header["x-token"] = data
+									uni.setStorageSync('header', header)
+									console.log('已更新 token')
 
-								//获取宿主用户信息
-								try {
-									this.$getUserInfo()
-								} catch (error) {
-									console.error('获取用户信息失败:', error)
+									//获取宿主用户信息
+									try {
+										this.$getUserInfo()
+									} catch (error) {
+										console.error('获取用户信息失败:', error)
+									}
+								} else if (event == "jump") {
+									if (data) {
+										console.log('接收到跳转指令，已缓存目标地址:', data);
+										uni.setStorageSync('jumpTarget_url', data);
+										// 强制重定向到首页，触发onShow获取用户信息后再跳转
+										uni.reLaunch({
+											url: '/pages/index/index'
+										});
+									}
+								} else if (event == 'wx_pay_result' || event == 'ios_pay_result') {
+									this.globalData.recentNativeEvent = event
+									this.globalData.recentNativeData = data
 								}
-							} else if (event == "jump") {
-								if (data) {
-									console.log('接收到跳转指令，已缓存目标地址:', data);
-									uni.setStorageSync('jumpTarget_url', data);
-									// 强制重定向到首页，触发onShow获取用户信息后再跳转
-									uni.reLaunch({
-										url: '/pages/index/index'
-									});
-								}
-							} else if (event == 'wx_pay_result' || event == 'ios_pay_result') {
-								this.globalData.recentNativeEvent = event
-								this.globalData.recentNativeData = data
 							}
-						}
-					})
-				} else {
-					console.log('uni.onNativeEventReceive 不可用，跳过监听')
-				}
-			}
-		},
-
-		/**
-		 * 初始化应用配置
-		 */
-		initConfig(options) {
-			console.log('=== 配置初始化 ===')
-
-			// 检查是否有外部传入的配置数据
-			const hasExtraData = options?.referrerInfo?.extraData &&
-				JSON.stringify(options.referrerInfo.extraData) !== '{}'
-
-			console.log('宿主是否传递配置:', hasExtraData)
-
-			if (hasExtraData) {
-				console.log('→ 使用宿主 extraData')
-				this.initFromExtraData(options.referrerInfo.extraData)
-			} else {
-				console.log('→ 宿主未传递配置，使用默认配置')
-				// ⚠️ 关键修改：不再强制退出，使用默认配置
-				this.initDevelopmentConfig()
-			}
-		},
-
-		/**
-		 * 从外部数据初始化配置
-		 */
-		initFromExtraData(extraData) {
-			// 批量设置 Storage，减少 I/O 次数
-			const storageData = {
-				host: extraData.host,
-				header: {
-					"x-token": extraData['x-token'],
-					"x-version": extraData['x-version'],
-					"x-platform": extraData['x-platform'],
-					"x-device-id": extraData['x-device-id'],
-					"x-mobile-brand": extraData['x-mobile-brand'],
-					"x-mobile-model": extraData['x-mobile-model'],
-					"x-channel": extraData['x-channel'],
-					"x-package": extraData['x-package'],
-					"x-click-id": extraData['x-click-id'],
-					// #ifdef APP-PLUS
-					"header": {
-						"version": this.$version,
+						})
+					} else {
+						console.log('uni.onNativeEventReceive 不可用，跳过监听')
 					}
-					// #endif
-				},
-				encrypt: extraData['encrypt'],
-				decrypt: extraData['decrypt']
+				}
+			},
+
+			/**
+			 * 初始化应用配置
+			 */
+			initConfig(options) {
+				console.log('=== 配置初始化 ===')
+
+				// 检查是否有外部传入的配置数据
+				const hasExtraData = options?.referrerInfo?.extraData &&
+					JSON.stringify(options.referrerInfo.extraData) !== '{}'
+
+				console.log('宿主是否传递配置:', hasExtraData)
+
+				if (hasExtraData) {
+					console.log('→ 使用宿主 extraData')
+					this.initFromExtraData(options.referrerInfo.extraData)
+				} else {
+					console.log('→ 宿主未传递配置，使用默认配置')
+					// ⚠️ 关键修改：不再强制退出，使用默认配置
+					this.initDevelopmentConfig()
+				}
+			},
+
+			/**
+			 * 从外部数据初始化配置
+			 */
+			initFromExtraData(extraData) {
+				// 批量设置 Storage，减少 I/O 次数
+				const storageData = {
+					host: extraData.host,
+					header: {
+						"x-token": extraData['x-token'],
+						"x-version": extraData['x-version'],
+						"x-platform": extraData['x-platform'],
+						"x-device-id": extraData['x-device-id'],
+						"x-mobile-brand": extraData['x-mobile-brand'],
+						"x-mobile-model": extraData['x-mobile-model'],
+						"x-channel": extraData['x-channel'],
+						"x-package": extraData['x-package'],
+						"x-click-id": extraData['x-click-id'],
+						// #ifdef APP-PLUS
+						"header": {
+							"version": this.$version,
+						}
+						// #endif
+					},
+					encrypt: extraData['encrypt'],
+					decrypt: extraData['decrypt']
+				}
+
+				// 批量写入
+				Object.keys(storageData).forEach(key => {
+					uni.setStorageSync(key, storageData[key])
+				})
+				if (extraData['isCombo']) {
+					uni.setStorageSync('isCombo', extraData['isCombo'])
+				}
+			},
+
+			/**
+			 * 初始化开发环境配置（也作为默认配置）
+			 */
+			initDevelopmentConfig() {
+				console.log('初始化默认配置')
+
+				// 批量设置开发环境配置
+				const devConfig = {
+					host: "https://flaunt.batiao8.com/",
+					header: {
+						"x-token": "ebe42caa-845a-4cb2-a324-18abe8ced7c0"
+					},
+					decrypt: "e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB",
+					encrypt: "xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil"
+				}
+
+				Object.keys(devConfig).forEach(key => {
+					uni.setStorageSync(key, devConfig[key])
+				})
+
+				console.log('默认配置初始化完成')
 			}
-
-			// 批量写入
-			Object.keys(storageData).forEach(key => {
-				uni.setStorageSync(key, storageData[key])
-			})
-			if (extraData['isCombo']) {
-				uni.setStorageSync('isCombo', extraData['isCombo'])
-			}
-		},
-
-		/**
-		 * 初始化开发环境配置（也作为默认配置）
-		 */
-		initDevelopmentConfig() {
-			console.log('初始化默认配置')
-
-			// 批量设置开发环境配置
-			const devConfig = {
-				host: "https://flaunt.batiao8.com/",
-				header: { "x-token": "da884e6e-fbd7-4d8d-ab0e-cb7b07f9f6fa" },
-				decrypt: "e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB",
-				encrypt: "xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil"
-			}
-
-			Object.keys(devConfig).forEach(key => {
-				uni.setStorageSync(key, devConfig[key])
-			})
-
-			console.log('默认配置初始化完成')
 		}
 	}
-}
 </script>
 
 <style>
diff --git a/main.js b/main.js
index 7157c08..d9f4ec4 100644
--- a/main.js
+++ b/main.js
@@ -29,7 +29,7 @@ export function createApp() {
 	app.config.globalProperties.$system = plus.os.name;
 	// #endif
 	app.config.globalProperties.$systemInfo = systemInfo
-	uni.setStorageSync('version', '1.0.4.sp21')
+	uni.setStorageSync('version', '1.0.4.sp23')
 	app.config.globalProperties.$version = uni.getStorageSync('version')
 	app.use(globalMethods);
 	return {
diff --git a/pages/common/webview/webview.vue b/pages/common/webview/webview.vue
index 95f93e1..8801933 100644
--- a/pages/common/webview/webview.vue
+++ b/pages/common/webview/webview.vue
@@ -1,134 +1,151 @@
 <!-- pages/webview/webview.vue -->
 <template>
 	<view class="webview-container">
-		<navBar class="nav-bar" :title="pageTitle" :bgColor="data.navBar.bgColor" isBack></navBar>
+		<navBar class="nav-bar" :title="pageTitle" :bgColor="data.navBar.bgColor" isBack>
+			<template v-if="isClose" v-slot:right>
+				<image style="width:22px;height: 22px;" src='/static/image/close.png' @click="onConfirm()"></image>
+			</template>
+		</navBar>
 		<web-view :src="url" :webview-styles="webviewStyles"></web-view>
 	</view>
 </template>
 
 <script setup>
-// 自定义头部
-// import ZdyNavbar from "@/components/navbar/navbar.vue"
-import navBar from '@/components/nav-bar/nav-bar.vue'
-import { util } from '@/utils/common.js'
+	// 自定义头部
+	// import ZdyNavbar from "@/components/navbar/navbar.vue"
+	import navBar from '@/components/nav-bar/nav-bar.vue'
+	import {
+		util
+	} from '@/utils/common.js'
 
-import {
-	ref,
-	reactive,
-	watch,
-	nextTick,
-	getCurrentInstance,
-	onMounted,
-	onBeforeUnmount,
-	toRefs,
-	computed
-} from "vue";
-import {
-	onLoad,
-	onReady,
-	onShow
-} from '@dcloudio/uni-app'
+	import {
+		ref,
+		reactive,
+		watch,
+		nextTick,
+		getCurrentInstance,
+		onMounted,
+		onBeforeUnmount,
+		toRefs,
+		computed
+	} from "vue";
+	import {
+		onLoad,
+		onReady,
+		onShow
+	} from '@dcloudio/uni-app'
 
-const data = reactive({
-	navBar: {
-		title: "",
-		bgColor: '#ffffff',
-	},
-	dark: "dark",
-	// 状态栏高度
-	systemBarHeight: "0",
-})
+	const data = reactive({
+		navBar: {
+			title: "",
+			bgColor: '#ffffff',
+		},
+		dark: "dark",
+		// 状态栏高度
+		systemBarHeight: "0",
+		isClose: false
+	})
 
-let {
-	systemBarHeight
-} = toRefs(data)
+	let {
+		systemBarHeight,
+		isClose
+	} = toRefs(data)
 
-const url = ref('')
-const pageTitle = ref('')
+	const url = ref('')
+	const pageTitle = ref('')
 
-onLoad((options) => {
-	uni.getSystemInfo({
-		success: res => {
-			systemBarHeight.value = res.statusBarHeight; // 获取状态栏高度
+	onLoad((options) => {
+		if (options.isClose) {
+			isClose.value = options.isClose
+		}
+		uni.getSystemInfo({
+			success: res => {
+				systemBarHeight.value = res.statusBarHeight; // 获取状态栏高度
+			}
+		})
+		if (options.url) {
+			url.value = decodeURIComponent(options.url)
+			// const videoExps = [/\.mp4$/i, /\.m3u8$/i, /\.flv$/i, /\.avi$/i, /\.mov$/i, /\.wmv$/i, /\.webm$/i,
+			// 	/\.mkv$/i
+			// ];
+			// const isVideo = videoExps.some(exp => exp.test(url.value))
+			// console.log(isVideo)
+			// if (isVideo) {
+			// 	plus.navigator.setStatusBarStyle("light");
+			// } else {
+			// 	plus.navigator.setStatusBarStyle("dark");
+			// }
+		}
+		console.log("options参数", options);
+		if (options.title) {
+			console.log("标题", options.title);
+			pageTitle.value = decodeURIComponent(options.title)
 		}
 	})
-	if (options.url) {
-		url.value = decodeURIComponent(options.url)
-		// const videoExps = [/\.mp4$/i, /\.m3u8$/i, /\.flv$/i, /\.avi$/i, /\.mov$/i, /\.wmv$/i, /\.webm$/i,
-		// 	/\.mkv$/i
-		// ];
-		// const isVideo = videoExps.some(exp => exp.test(url.value))
-		// console.log(isVideo)
-		// if (isVideo) {
-		// 	plus.navigator.setStatusBarStyle("light");
-		// } else {
-		// 	plus.navigator.setStatusBarStyle("dark");
-		// }
+
+	onShow(() => {
+		// #ifdef APP-PLUS
+		util.setAndroidSystemBarColor('#ffffff')
+		setTimeout(() => {
+			plus.navigator.setStatusBarStyle("dark");
+		}, 500);
+		// #endif
+	})
+
+	const onConfirm = () => {
+		uni.reLaunch({
+			url: '/pages/index/index'
+		})
 	}
-	console.log("options参数", options);
-	if (options.title) {
-		console.log("标题", options.title);
-		pageTitle.value = decodeURIComponent(options.title)
+
+	const goBack = () => {
+		uni.navigateBack()
 	}
-})
 
-onShow(() => {
-	// #ifdef APP-PLUS
-	util.setAndroidSystemBarColor('#ffffff')
-	setTimeout(() => {
-		plus.navigator.setStatusBarStyle("dark");
-	}, 500);
-	// #endif
-})
+	const isVideo = computed(() => {
+		if (!url.value) return false
+		const videoExps = [/\.mp4$/i, /\.m3u8$/i, /\.flv$/i, /\.avi$/i, /\.mov$/i, /\.wmv$/i, /\.webm$/i,
+			/\.mkv$/i
+		];
+		return videoExps.some(exp => exp.test(url.value));
+	})
 
-const goBack = () => {
-	uni.navigateBack()
-}
-
-const isVideo = computed(() => {
-	if (!url.value) return false
-	const videoExps = [/\.mp4$/i, /\.m3u8$/i, /\.flv$/i, /\.avi$/i, /\.mov$/i, /\.wmv$/i, /\.webm$/i,
-		/\.mkv$/i
-	];
-	return videoExps.some(exp => exp.test(url.value));
-})
-
-const webviewStyles = computed(() => {
-	return {
-		top: `${Number(systemBarHeight.value) + 40}px`,
-		bottom: '0px',
-		'padding-bottom': '20px'
-	}
-})
+	const webviewStyles = computed(() => {
+		return {
+			top: `${Number(systemBarHeight.value) + 40}px`,
+			bottom: '0px',
+			'padding-bottom': '20px'
+		}
+	})
 </script>
 
 <style scoped>
-.webview-container {
-	flex: 1;
-	display: flex;
-	flex-direction: column;
-}
+	.webview-container {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
 
-.header {
-	padding: 20rpx;
-	background: #fff;
-	border-bottom: 1rpx solid #eee;
-}
+	.header {
+		padding: 20rpx;
+		background: #fff;
+		border-bottom: 1rpx solid #eee;
+	}
 
-.title {
-	font-size: 32rpx;
-	font-weight: bold;
-	text-align: center;
-}
+	.title {
+		font-size: 32rpx;
+		font-weight: bold;
+		text-align: center;
+	}
 
-.video-web {
-	position: fixed;
-	width: 100%;
-	background-color: #000;
-}
+	.video-web {
+		position: fixed;
+		width: 100%;
+		background-color: #000;
+	}
 </style>
 <style>
-page {
-	background-color: #ffffff;
-}
+	page {
+		background-color: #ffffff;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/index/index.nvue b/pages/index/index.nvue
index 4b0c501..0e702cb 100644
--- a/pages/index/index.nvue
+++ b/pages/index/index.nvue
@@ -529,7 +529,7 @@ 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}`)
+	util.goPage(`/pages/common/webview/webview?url=${encodeURIComponent(url)}&title=${noticeInfo.value.title}&isClose=${true}`)
 }
 
 /**
diff --git a/static/image/close.png b/static/image/close.png
new file mode 100644
index 0000000000000000000000000000000000000000..90b23f00aa6535b34780a27c3aaca0f6d773fc49
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xZ3?!EyURMI7<N|y`T!Azmuw5fR3n<N1666=m
zz$2%U-`KwD-qV{WBSnFtw>(`OLp+YZovJHz$UvagoWrCoi|?W&UxU*lt(Drlx|k36
z*fQU}{mAK?y7l?VrL{kA{+;wjJFr{KvPygImJK`mqh8suFO~VZak7_GMcCwXd*YUE
ziv8j0R@J@s(pjCwCLgLaTmL3;DZH97|LON5Hc<&HUzy(fr?xwM<--Ct8<WY0TrVH}
zl~J^&No~`W3od&@w=iw!3u9o*us^_|%j}jRY2b9aK~c(%)2m&iPlmB%#)+*C;ykvZ
zPcAB+7tdl@vUI_-mRmB0JV&Y&gqz<87=@i!q`0}gPFnY$<-VI;6R*}S{X88MG@h=0
JF6*2Ung9-#egyyk

literal 0
HcmV?d00001