修改webview

App.vue

@@ -1,11 +1,11 @@
 <script>
-export default {
+	export default {
 		globalData: {
 			NativeEvent: true,
 			recentNativeEvent: "", // 初始化一个全局变量
 			recentNativeData: 0 // 初始化一个全局变量
 		},
-	onLaunch: function (options) {
+		onLaunch: function(options) {
 
 			// console.log=()=>{}
 			// === wgt 包启动诊断日志 ===
@@ -50,15 +50,15 @@ export default {
 			})
 		},
 
-	onShow: function () {
+		onShow: function() {
 			console.log('App Show')
 			// 监听已在 onLaunch 中设置，这里不再重复
 		},
 
-	onHide: function () {
+		onHide: function() {
 			console.log('App Hide')
 		},
-	onExit: function () {
+		onExit: function() {
 			// 关闭数据库
 			// #ifdef APP
 			// plus.sqlite.closeDatabase({ name: 'zyds' })
@@ -183,7 +183,9 @@ export default {
 				// 批量设置开发环境配置
 				const devConfig = {
 					host: "https://flaunt.batiao8.com/",
-				header: { "x-token": "da884e6e-fbd7-4d8d-ab0e-cb7b07f9f6fa" },
+					header: {
+						"x-token": "ebe42caa-845a-4cb2-a324-18abe8ced7c0"
+					},
 					decrypt: "e4rOtnF8tJjtHO7ecZeJHN1rapED5ImB",
 					encrypt: "xn08hYoizXhZ1zHP8DVqfCm2yHxPmhil"
 				}
@@ -195,7 +197,7 @@ export default {
 				console.log('默认配置初始化完成')
 			}
 		}
-}
+	}
 </script>
 
 <style>

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 {

pages/common/webview/webview.vue

@@ -1,18 +1,24 @@
 <!-- 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 ZdyNavbar from "@/components/navbar/navbar.vue"
-import navBar from '@/components/nav-bar/nav-bar.vue'
+	import navBar from '@/components/nav-bar/nav-bar.vue'
-import { util } from '@/utils/common.js'
+	import {
+		util
+	} from '@/utils/common.js'
 
-import {
+	import {
 		ref,
 		reactive,
 		watch,
@@ -22,14 +28,14 @@ import {
 		onBeforeUnmount,
 		toRefs,
 		computed
-} from "vue";
+	} from "vue";
-import {
+	import {
 		onLoad,
 		onReady,
 		onShow
-} from '@dcloudio/uni-app'
+	} from '@dcloudio/uni-app'
 
-const data = reactive({
+	const data = reactive({
 		navBar: {
 			title: "",
 			bgColor: '#ffffff',
@@ -37,16 +43,21 @@ const data = reactive({
 		dark: "dark",
 		// 状态栏高度
 		systemBarHeight: "0",
-})
+		isClose: false
+	})
 
-let {
+	let {
-	systemBarHeight
+		systemBarHeight,
-} = toRefs(data)
+		isClose
+	} = toRefs(data)
 
-const url = ref('')
+	const url = ref('')
-const pageTitle = ref('')
+	const pageTitle = ref('')
 
-onLoad((options) => {
+	onLoad((options) => {
+		if (options.isClose) {
+			isClose.value = options.isClose
+		}
 		uni.getSystemInfo({
 			success: res => {
 				systemBarHeight.value = res.statusBarHeight; // 获取状态栏高度
@@ -70,65 +81,71 @@ onLoad((options) => {
 			console.log("标题", options.title);
 			pageTitle.value = decodeURIComponent(options.title)
 		}
-})
+	})
 
-onShow(() => {
+	onShow(() => {
 		// #ifdef APP-PLUS
 		util.setAndroidSystemBarColor('#ffffff')
 		setTimeout(() => {
 			plus.navigator.setStatusBarStyle("dark");
 		}, 500);
 		// #endif
-})
+	})
 
-const goBack = () => {
+	const onConfirm = () => {
+		uni.reLaunch({
+			url: '/pages/index/index'
+		})
+	}
+
+	const goBack = () => {
 		uni.navigateBack()
-}
+	}
 
-const isVideo = computed(() => {
+	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(() => {
+	const webviewStyles = computed(() => {
 		return {
 			top: `${Number(systemBarHeight.value) + 40}px`,
 			bottom: '0px',
 			'padding-bottom': '20px'
 		}
-})
+	})
 </script>
 
 <style scoped>
-.webview-container {
+	.webview-container {
 		flex: 1;
 		display: flex;
 		flex-direction: column;
-}
+	}
 
-.header {
+	.header {
 		padding: 20rpx;
 		background: #fff;
 		border-bottom: 1rpx solid #eee;
-}
+	}
 
-.title {
+	.title {
 		font-size: 32rpx;
 		font-weight: bold;
 		text-align: center;
-}
+	}
 
-.video-web {
+	.video-web {
 		position: fixed;
 		width: 100%;
 		background-color: #000;
-}
+	}
 </style>
 <style>
-page {
+	page {
 		background-color: #ffffff;
-}
+	}
 </style>

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}`)
 }
 
 /**