From 2831de027c99d70b8ff7268cde67571e064bb99f Mon Sep 17 00:00:00 2001
From: zoujiandong <10130823232@qq.com>
Date: Thu, 12 Mar 2026 14:38:11 +0800
Subject: [PATCH] =?UTF-8?q?3.12=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api.js                                    |    6 +
 pages.json                                    |    2 +-
 pages/loading/loading.vue                     |    2 +-
 pages/patientClass/patientClass.vue           |    6 +-
 pages_app/idcardAuth/bankCardList.vue         |   13 +-
 pages_app/newsList/newsList.vue               |   35 +-
 pages_app/patientDetail/patientDetail.vue     |   12 +-
 ...tientMsg copy.vue => patientMsg  copy.vue} |  176 ++-
 pages_app/patientMsg/patientMsg.vue           |   36 +-
 pages_app/webview/webviewClass copy 2.vue     | 1250 +++++++++++++++++
 pages_app/webview/webviewClass copy.vue       | 1177 ++++++++++++++++
 pages_app/webview/webviewClass.vue            |  387 +++--
 pages_chat/video/searchVideo.vue              |    2 +-
 static/new_patient.png                        |  Bin 0 -> 5968 bytes
 14 files changed, 2852 insertions(+), 252 deletions(-)
 rename pages_app/patientMsg/{patientMsg copy.vue => patientMsg  copy.vue} (91%)
 create mode 100644 pages_app/webview/webviewClass copy 2.vue
 create mode 100644 pages_app/webview/webviewClass copy.vue
 create mode 100644 static/new_patient.png

diff --git a/api/api.js b/api/api.js
index e6abf11..d4453bd 100644
--- a/api/api.js
+++ b/api/api.js
@@ -711,6 +711,9 @@ const api = {
 	getCollect(data){
 		return request('/expertAPI/collection', data, 'post', false);
 	},
+	getDiscollect(data){
+		return request('/expertAPI/discollection', data, 'post', false);
+	},
 	getGanDanFileOrder(data){
 		return request('/expertPay/getGanDanFileOrder', data, 'post', false);
 	},
@@ -720,6 +723,9 @@ const api = {
 	polularScienceArticleListIndexNew(data){
 		return request('/expertAPI/polularScienceArticleListIndexNew', data, 'post', false);
 	},
+	getNewsDetail(data){
+		return request('/expertAPI/newsDetial', data, 'post', false);
+	},
 	
 	//https://dev-app.igandan.com/app/expertPay/getGanDanFileOrder
 
diff --git a/pages.json b/pages.json
index 232a597..a8568de 100644
--- a/pages.json
+++ b/pages.json
@@ -1709,7 +1709,7 @@
 		"list": [
 			{
 				"name": "",
-				"path": "pages_app/patientMsg/patientMsg",
+				"path": "pages_app/newsList/newsList",
 				"query": ""
 			}
 		]
diff --git a/pages/loading/loading.vue b/pages/loading/loading.vue
index 26171a6..5dad091 100644
--- a/pages/loading/loading.vue
+++ b/pages/loading/loading.vue
@@ -15,7 +15,7 @@ const countDown=()=>{
   }
   timer.value=setInterval(()=>{
     count.value++;
-    if(count.value>=5){
+    if(count.value>=8){
       clearInterval(timer.value);
       plus.runtime.quit();
     }
diff --git a/pages/patientClass/patientClass.vue b/pages/patientClass/patientClass.vue
index 1dd38cb..cacef76 100644
--- a/pages/patientClass/patientClass.vue
+++ b/pages/patientClass/patientClass.vue
@@ -383,7 +383,8 @@
 	};
 	
 	onShow(() => {
-		polularScienceArticleListByKeywordsNew(false);
+
+		polularScienceArticleListByKeywordsNew(true);
 		loadGuideTags();
 	});
 </script>
@@ -513,13 +514,14 @@ $padding-small: 20rpx;
 		border-radius: $border-radius;
 		padding: $padding;
 		display: flex;
-		gap: 24rpx;
+		
 
 		.article-image {
 			width: 260rpx;
 			height: 160rpx;
 			border-radius: $border-radius-small;
 			flex-shrink: 0;
+			margin-right: 24rpx;
 		}
 
 		.article-content {
diff --git a/pages_app/idcardAuth/bankCardList.vue b/pages_app/idcardAuth/bankCardList.vue
index fda71e3..be03538 100644
--- a/pages_app/idcardAuth/bankCardList.vue
+++ b/pages_app/idcardAuth/bankCardList.vue
@@ -24,6 +24,7 @@
 				<uni-swipe-action-item
 					v-for="(card, index) in bankCards"
 					:key="card.uuid"
+					style="margin-bottom: 20rpx;"
 					@change="onSwipeChange($event, card)"
 				>
 					<template v-slot:right>
@@ -71,7 +72,7 @@ import empty from "@/components/empty/empty.vue"
 import emptyBankImg from "@/static/empty_bank.png"
 const bankCards = ref([]);
 const openedSwipeUuid = ref('');
-import { onLoad,onBackPress } from '@dcloudio/uni-app';
+import { onLoad,onBackPress,onShow } from '@dcloudio/uni-app';
 const from = ref('');
 const returnTo = ref('');
 onLoad((options) => {
@@ -82,9 +83,12 @@ onLoad((options) => {
 		returnTo.value = decodeURIComponent(options.returnTo);
 	}
 });
+onShow(() => {
+	getBankCardList();
+});
 onBackPress(() => {
 	if(!from.value){
-		uni.navigateBack();
+		plus.runtime.quit();
 		return true;
 	}
 });
@@ -200,9 +204,6 @@ const getBankLogo = (bankName) => {
 	return bankLogos[bankName] || bankName.charAt(0);
 };
 
-onMounted(() => {
-	getBankCardList();
-});
 </script>
 
 <style lang="scss" scoped>
@@ -265,7 +266,7 @@ onMounted(() => {
 		border-radius: 16rpx;
 		padding: 30rpx;
 		display: flex;
-		margin-bottom: 20rpx;
+		
 		align-items: center;
 		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.1);
 
diff --git a/pages_app/newsList/newsList.vue b/pages_app/newsList/newsList.vue
index 76ca102..a196f16 100644
--- a/pages_app/newsList/newsList.vue
+++ b/pages_app/newsList/newsList.vue
@@ -75,7 +75,7 @@
 		   		<swiper-item 
 		   			v-for="(banner, index) in bannerList" 
 		   			:key="banner.id"
-		   			@click="playBannerVideo(banner)"
+		   			@click="goToNewsDetail(banner)"
 		   		>
 		   			<view class="banner-item">
 		   				<image 
@@ -112,7 +112,7 @@
 							<uni-icons type="eye" size="14" color="#999"></uni-icons>
 							<text>{{ news.readnum || 0 }}</text>
 							<uni-icons type="hand-up" size="14" color="#999" style="margin-left: 20rpx;"></uni-icons>
-							<text>{{ news.likenum || 0 }}</text>
+							<text>{{ news.agreenum || 0 }}</text>
 						</view>
 					</view>
 				</view>
@@ -138,13 +138,25 @@
 
 <script setup>
 	import { ref, onMounted, reactive } from 'vue';
-	import { onShow, onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app';
+	import { onShow, onPullDownRefresh, onReachBottom,onLoad,onBackPress} from '@dcloudio/uni-app';
 	import api from '@/api/api.js';
 	import docUrl from '@/utils/docUrl.js';
 	import navTo  from "@/utils/navTo.js";
 	import navBar from '@/components/navBar/navBar.vue';
 	import dayjs from 'dayjs';
 	import searchImg from "@/static/search.png";
+	const from=ref('');
+	onLoad((options) => {
+		if(options.from){
+			from.value = options.from;
+		}
+	});
+	onBackPress(() => {
+		if(!from.value){
+			plus.runtime.quit();
+			return true
+		}
+	});
 	// Banner相关数据
 	const bannerList = ref([]);
 	const currentBannerIndex = ref(0);
@@ -222,7 +234,11 @@
 
 	// 方法
 	const goBack = () => {
-		uni.navigateBack();
+		if(!from.value){
+			plus.runtime.quit();
+		}else{
+			uni.navigateBack();
+		}
 	};
 
 	const goToSearch = () => {
@@ -493,10 +509,13 @@
 	const goToNewsDetail = (item) => {
 		console.log('Go to news detail:', item);
 		// Implement navigation to news detail page
-		const encoded = encodeURIComponent(docUrl+item.path);
-		navTo({
-			url: `/pages_app/webview/webview?url=${encoded}&type=news&share=1&sharetitle=${item.title}`
-		});
+		//const encoded = encodeURIComponent(docUrl+item.path);
+		// navTo({
+		// 	url: `/pages_app/webview/webview?url=${encoded}&type=news&share=1&sharetitle=${item.title}`
+		// });
+		 navTo({
+				url: `/pages_app/webview/webviewClass?url=${encodeURIComponent(docUrl+item.path+'?fromtype=doctor')}&title=新闻详情&uuid=${item.uuid}&sharetitle=${item.title}&summary=${item.summary}&type=huanjiao_news&imgPath=${encodeURIComponent(item.headImg)}`
+			});
 		// uni.navigateTo({
 		// 	url: `/pages_app/newsDetail/newsDetail?id=${item.uuid || item.id}`
 		// });
diff --git a/pages_app/patientDetail/patientDetail.vue b/pages_app/patientDetail/patientDetail.vue
index 0d2c292..0a993de 100644
--- a/pages_app/patientDetail/patientDetail.vue
+++ b/pages_app/patientDetail/patientDetail.vue
@@ -21,7 +21,7 @@
 
 		<!-- 头部信息卡片 -->
 		<view class="card header-card">
-			<image class="avatar" :src="docUrl+patientInfo.photo" mode="aspectFill"></image>
+			<image class="avatar" :src="avatarSrc" mode="aspectFill" @error="handleAvatarError"></image>
 			<view class="base-info">
 				<view class="name-row">
 					<text class="name">{{ patientInfo.realName || '未知' }}</text>
@@ -110,15 +110,24 @@
 	import recordImg from "@/static/image_backgrond_red_big.png"
 	import manImg from "@/static/new_man_big.png"
 	import womanImg from "@/static/new_woman_big.png"
+	import defaultImg from "@/static/default.png"
 	
 	const showAllHistory = ref(false);
 	const patientDetail = ref({});
 	const patient_uuid = ref('');
 	const note = ref('');
+	const avatarLoadError = ref(false);
 	// 计算属性：患者基本信息
 	const patientInfo = computed(() => {
 		return patientDetail.value.patient || {};
 	});
+	const avatarSrc = computed(() => {
+		if (avatarLoadError.value) return defaultImg;
+		return patientInfo.value.photo ? (docUrl + patientInfo.value.photo) : defaultImg;
+	});
+	const handleAvatarError = () => {
+		avatarLoadError.value = true;
+	};
 	
 	
 	
@@ -205,6 +214,7 @@
 		}).then(res=>{
 			if(res.code == 200){
 				patientDetail.value = res.data;
+				avatarLoadError.value = false;
 				console.log('患者详情数据:', res.data);
 			} else {
 				uni.showToast({
diff --git a/pages_app/patientMsg/patientMsg copy.vue b/pages_app/patientMsg/patientMsg  copy.vue
similarity index 91%
rename from pages_app/patientMsg/patientMsg copy.vue
rename to pages_app/patientMsg/patientMsg  copy.vue
index 17c9580..acbf1e7 100644
--- a/pages_app/patientMsg/patientMsg copy.vue	
+++ b/pages_app/patientMsg/patientMsg  copy.vue	
@@ -97,16 +97,75 @@
 		<!-- 患者列表区域 -->
 		<view class="patient-list" v-if="activeTab === 'list'">
 			
-			<!-- <view class="listbox" style="z-index:99;" v-if="showAlert">
+			<view class="listbox alertContent"  v-if="showAlert">
 				<image :src="alertImg" class="alert-img" mode="widthFix"></image>
 				<image :src="delImg" class="del-img" mode="widthFix" @click="hideAlert"></image>
-			</view> -->
-			<view class="listbox">
+			</view>
+			<view class="listbox" v-if="patientList.length>0">
+				<!-- 使用 up-index-list 索引组件，数据动态渲染 -->
+				<up-index-list :index-list="indexList" v-if="loadFinish" >
+
+					<!-- 特殊操作项 -->
+					<template #header>
+			<view class="special-actions" >
+				<view class="action-item" @click="addNewPatient">
+					
+					<view class="action-icon new-patient">
+						<up-image :src="newPatientImg" width="60rpx" height="60rpx" ></up-image>
+					</view> 
+					<text class="action-text">新的患者<text class="new-patient-count" v-if="applyList.length > 0">(待审核{{ applyList.length }}人)</text></text>
+					<uni-icons type="right" size="20" color="#999"></uni-icons>
+				</view>
+				
+				<view class="action-item" @click="managePatientGroups">
+					<view class="action-icon group-icon">
+						<view class="grid-icon">
+							<view class="grid-item"></view>
+							<view class="grid-item"></view>
+							<view class="grid-item"></view>
+							<view class="grid-item"></view>
+						</view>
+					</view>
+					<text class="action-text">患者分组 <text class="new-patient-count" v-if="patientList.length > 0">(随访{{ patientList.length }}人)</text></text>
+					<uni-icons type="right" size="20" color="#999"></uni-icons>
+				</view>
+			</view>
+		</template>
+					<template v-for="group in patientGroups" :key="group.letter" >
+						<up-index-item >
+							<up-index-anchor :text="group.letter" />
+							<view class="group-section">
+								<view class="patient-item" v-for="item in group.items" :key="item.uuid || item.id" >
+									<!-- <template v-if="item.placeholder">
+										<view class="patient-avatar-placeholder">
+											<uni-icons type="person" size="32" color="#ffffff" @click="goPatientDetail(item.uuid)"></uni-icons>
+										</view>
+									</template> -->
+								
+									<image class="patient-avatar" :src="item._avatarLoadError ? defaultImg : item.avatarUrl" mode="aspectFill" @error="handlePatientAvatarError(item)" @click="goPatientDetail(item.uuid)"></image>
+									
+									<view class="patient-info" @click="goPatientDetail(item.uuid)">
+										<text class="patient-name">{{ item.realName }}</text>
+										<view class="patient-badge" v-if="item.badge">
+											<text class="badge-text">{{ item.badge }}</text>
+										</view>
+									</view>
+									<view class="patient-status">
+										<uni-icons type="compose" size="20" color="#8B2316" @click.stop="editPatient(item.uuid)"></uni-icons>
+										<text class="follow-date">随访于{{ item.joinDateYMD }}</text>
+									</view>
+								</view>
+							</view>
+						</up-index-item>
+					</template>
+				</up-index-list>
+				
+			</view>
+			<view class="listbox" v-if="patientList.length === 0">
 				<view class="special-actions" >
 				<view class="action-item" @click="addNewPatient">
 					<view class="action-icon new-patient">
-						<uni-icons type="person" size="24" color="#ffffff"></uni-icons>
-						<uni-icons type="plus" size="16" color="#ffffff" style="position: absolute; right: 8rpx; bottom: 8rpx;"></uni-icons>
+						<up-image :src="newPatientImg" width="60rpx" height="60rpx" ></up-image>
 					</view>
 					<text class="action-text">新的患者<text class="new-patient-count" v-if="applyList.length > 0">(待审核{{ applyList.length }}人)</text></text>
 					<uni-icons type="right" size="20" color="#999"></uni-icons>
@@ -125,34 +184,7 @@
 					<uni-icons type="right" size="20" color="#999"></uni-icons>
 				</view>
 			</view>
-				<!-- 使用 up-index-list 索引组件，数据动态渲染 -->
-				<up-index-list :index-list="indexList"  v-if="loadFinish">
-					<template v-for="group in patientGroups" :key="group.letter" >
-						<up-index-item >
-							<up-index-anchor :text="group.letter" v-if="group.items.length > 0"/>
-							
-							<view class="group-section">
-								<view class="patient-item" v-for="item in group.items" :key="item.uuid || item.id" v-if="group.items.length > 0">
-									<template >
-										<image class="patient-avatar" :src="item.avatarUrl" mode="aspectFill" @click="goPatientDetail(item.uuid)"></image>
-									</template>
-									<view class="patient-info" @click="goPatientDetail(item.uuid)">
-										<text class="patient-name">{{ item.realName }}</text>
-										<view class="patient-badge" v-if="item.badge">
-											<text class="badge-text">{{ item.badge }}</text>
-										</view>
-									</view>
-									<view class="patient-status">
-										<up-image :src="editImg" width="35rpx" height="35rpx" @click.stop="editPatient(item.uuid)"></up-image>
-										<text class="follow-date">随访于{{ item.joinDateYMD }}</text>
-									</view>
-								</view>
-								<empty v-if="group.items.length === 0" :emptyDesc="'您暂无随访患者'"></empty>
-							</view>
-						</up-index-item>
-					</template>
-				</up-index-list>
-				<empty v-if="patientList.length === 0"></empty>
+				<empty ></empty>
 			</view>
 		</view>
 		<view class="plan" v-if="activeTab === 'plan'">
@@ -247,20 +279,23 @@
 	import { onShow,onLoad,onBackPress} from "@dcloudio/uni-app";
 	import dayImg from "@/static/visit_data11.png"
 	import planImg from "@/static/visitplan.png"
-	import editImg from "@/static/edit_patitent.png"
 	import api from '@/api/api.js';
 	import navTo from '@/utils/navTo.js';
 	import docUrl  from '@/utils/docUrl.js';
+	import defaultImg from "@/static/default.png"
+	import newPatientImg from "@/static/new_patient.png"
+	import delImg from "@/static/iv_delete.png"
 	const patientList = ref([]);
-	const showAlert = ref(false);
 	const patientDataLoaded = ref(false);
 	const patientDataLoading = ref(false);
 	const firstLetterCache = new Map();
+	const showAlert = ref(false);
 	const navHeight = ref(40);
 	onBackPress(() => {
 		plus.runtime.quit();
 		return true;
 	});
+	import alertImg from "@/static/patientgif.png"
 	const getNavHeight = () => {
 		const systemInfo = uni.getSystemInfoSync();
 		console.log(2223);
@@ -271,17 +306,9 @@
 	import pinyin from 'pinyin';
 	import dayjs from 'dayjs'
 	import lineImg from "@/static/item_visitplan_fg.png"
-	import empty from '@/components/empty/empty.vue'
-	import defaultImg from "@/static/default.png"
-	import delImg from "@/static/iv_delete.png"
 	const loadFinish = ref(false);
-	import alertImg from "@/static/patientgif.png"
 	//import ConversationList from './conversation-list/index.vue'
     const title = ref('患者消息');
-	const hideAlert = () => {
-		showAlert.value = false;
-		uni.setStorageSync('hasAlert', true);
-	}
     const goPatientDetail = (uuid) => {
 		navTo({
 			url: `/pages_app/patientDetail/patientDetail?uuid=${uuid}`
@@ -293,6 +320,10 @@
 			url: `/pages_app/patientSetting/patientSetting?uuid=${uuid}`
 		})
 	}
+	const handlePatientAvatarError = (item) => {
+		if (!item) return
+		item._avatarLoadError = true
+	}
 	const goCode = () => {
 		navTo({
 			url: `/pages_app/myCode/myCode`
@@ -403,10 +434,8 @@
 		}
 		const letters = Array.from(map.keys()).sort((a,b) => a.localeCompare(b));
 		patientGroups.value = letters.map(l => ({ letter: l, items: map.get(l) }));
-		console.log(patientGroups.value)
 		rebuildIndexList();
-		if(source.length === 0){
-			console.log(111122)
+		if(patientList.value.length==0){
 			indexList.value=[]
 		}
 		nextTick(() => {
@@ -491,6 +520,10 @@
 			});
 		}
 	};
+	const hideAlert = () => {
+		showAlert.value = false;
+		uni.setStorageSync('hasAlert', true);
+	}
 	const patientListByGBK = async () => {
 		if (patientDataLoading.value) return;
 		patientDataLoading.value = true;
@@ -634,15 +667,14 @@
 				break;
 			case 'list':
 				title.value = '患者列表';
-				// if (patientDataLoaded.value) {
-				// 	loadFinish.value = true;
-				// 	break;
-				// }
+				if (patientDataLoaded.value) {
+					loadFinish.value = true;
+					break;
+				}
 				uni.showLoading({
 					title: '加载中...',
 					mask: true
 				});
-				getApplyList();
 				patientListByGBK();
 				// 显示患者列表
 				break;
@@ -752,19 +784,23 @@
 </script>
 
 <style lang="scss" scoped>
-.alert-img{
-	position: absolute;
-	top:0;
-	width: 100%;
-	bottom: 0;
-}
-.del-img{
-	position: absolute;
-	top: 280rpx;
-	z-index: 999;
-	right: 100rpx;
-	width: 48rpx;
-	height: 48rpx;
+.alertContent{
+	z-index:99;
+	position: fixed;
+	bottom: 100rpx;
+	width:100%;
+	top:calc(var(--status-bar-height) + 44px);
+	.alert-img{
+		width:100%;
+	}
+	.del-img{
+		position: absolute;
+		top: 280rpx;
+		z-index: 999;
+		right: 100rpx;
+		width: 48rpx;
+		height: 48rpx;
+	}
 }
 .save-btn {
   font-size: 32rpx;
@@ -912,7 +948,7 @@
 			}
 			
 			.tab-text {
-				font-size: 32rpx;
+				font-size: 28rpx;
 				color: #999999;
 				transition: color 0.3s;
 			}
@@ -944,21 +980,19 @@
 	
 	// 患者列表样式
 	.patient-list {
+		:deep(.u-index-list__letter){
+			top:50%!important;
+		}
 		:deep(.u-index-list__scroll-view){
 			height:calc(100vh - var(--status-bar-height) - 44px - 103rpx);
 		}
-		:deep(.hide-index-bar .u-index-list__sidebar),
-		:deep(.hide-index-bar .u-index-list__index-box) {
-			display: none !important;
-		}
     // position: fixed;
 	    width: 100%;
 	  
 		margin-top:calc(var(--status-bar-height) + 44px);
 		height:calc(100vh - var(--status-bar-height) - 44px - 103rpx);
 		overflow-y: scroll;
-		display: flex;
-		flex-direction:column;
+		
 		background-color: #ffffff;
 		
 		bottom: 103rpx;
diff --git a/pages_app/patientMsg/patientMsg.vue b/pages_app/patientMsg/patientMsg.vue
index c4cc557..f7b38b7 100644
--- a/pages_app/patientMsg/patientMsg.vue
+++ b/pages_app/patientMsg/patientMsg.vue
@@ -6,9 +6,7 @@
 				left-icon="left"
 				:title="title"
 				@clickLeft="goBack"
-				
 				color="#8B2316"
-			
 				:border="false"
 				backgroundColor="#eee"
 			>
@@ -97,7 +95,7 @@
 		<!-- 患者列表区域 -->
 		<view class="patient-list" v-show="activeTab === 'list'">
 			
-			<view class="listbox" style="z-index:99;" v-if="showAlert">
+			<view class="listbox alertContent"  v-if="showAlert">
 				<image :src="alertImg" class="alert-img" mode="widthFix"></image>
 				<image :src="delImg" class="del-img" mode="widthFix" @click="hideAlert"></image>
 			</view>
@@ -109,10 +107,10 @@
 					<template #header>
 			<view class="special-actions" >
 				<view class="action-item" @click="addNewPatient">
+					
 					<view class="action-icon new-patient">
-						<uni-icons type="person" size="24" color="#ffffff"></uni-icons>
-						<uni-icons type="plus" size="16" color="#ffffff" style="position: absolute; right: 8rpx; bottom: 8rpx;"></uni-icons>
-					</view>
+						<up-image :src="newPatientImg" width="60rpx" height="60rpx" ></up-image>
+					</view> 
 					<text class="action-text">新的患者<text class="new-patient-count" v-if="applyList.length > 0">(待审核{{ applyList.length }}人)</text></text>
 					<uni-icons type="right" size="20" color="#999"></uni-icons>
 				</view>
@@ -165,8 +163,7 @@
 				<view class="special-actions" >
 				<view class="action-item" @click="addNewPatient">
 					<view class="action-icon new-patient">
-						<uni-icons type="person" size="24" color="#ffffff"></uni-icons>
-						<uni-icons type="plus" size="16" color="#ffffff" style="position: absolute; right: 8rpx; bottom: 8rpx;"></uni-icons>
+						<up-image :src="newPatientImg" width="60rpx" height="60rpx" ></up-image>
 					</view>
 					<text class="action-text">新的患者<text class="new-patient-count" v-if="applyList.length > 0">(待审核{{ applyList.length }}人)</text></text>
 					<uni-icons type="right" size="20" color="#999"></uni-icons>
@@ -284,6 +281,8 @@
 	import navTo from '@/utils/navTo.js';
 	import docUrl  from '@/utils/docUrl.js';
 	import defaultImg from "@/static/default.png"
+	import newPatientImg from "@/static/new_patient.png"
+	import delImg from "@/static/iv_delete.png"
 	const patientList = ref([]);
 	const patientDataLoaded = ref(false);
 	const patientDataLoading = ref(false);
@@ -783,6 +782,24 @@
 </script>
 
 <style lang="scss" scoped>
+.alertContent{
+	z-index:99;
+	position: fixed;
+	bottom: 100rpx;
+	width:100%;
+	top:calc(var(--status-bar-height) + 44px);
+	.alert-img{
+		width:100%;
+	}
+	.del-img{
+		position: absolute;
+		top: 280rpx;
+		z-index: 999;
+		right: 100rpx;
+		width: 48rpx;
+		height: 48rpx;
+	}
+}
 .save-btn {
   font-size: 32rpx;
   color: #8b2316;
@@ -973,8 +990,7 @@
 		margin-top:calc(var(--status-bar-height) + 44px);
 		height:calc(100vh - var(--status-bar-height) - 44px - 103rpx);
 		overflow-y: scroll;
-		display: flex;
-		flex-direction:column;
+		
 		background-color: #ffffff;
 		
 		bottom: 103rpx;
diff --git a/pages_app/webview/webviewClass copy 2.vue b/pages_app/webview/webviewClass copy 2.vue
new file mode 100644
index 0000000..53c3548
--- /dev/null
+++ b/pages_app/webview/webviewClass copy 2.vue	
@@ -0,0 +1,1250 @@
+<template>
+  <view class="container" :style="{ backgroundColor: backgroundColor }">
+    <!-- 分享弹窗 -->
+
+    <view class="navbox">
+      <view class="status_bar"></view>
+      <uni-nav-bar
+        left-icon="left"
+        :title="title"
+        @clickLeft="goBack"
+        color="#8B2316"
+        :border="false"
+        backgroundColor="#eeeeee"
+      >
+        <template #right>
+          <view class="nav-actions">
+            <view class="collect-img" @click="shareToggle" v-if="canShare">
+              <image
+                class="share-img-icon"
+                :src="shareIcon"
+                mode="aspectFill"
+              />
+            </view>
+          </view>
+        </template>
+      </uni-nav-bar>
+    </view>
+  </view>
+  <web-view
+    v-if="safeUrl"
+    class="content-box"
+    :src="safeUrl"
+    :webview-styles="webviewStyles"
+  ></web-view>
+  <view class="bottom-box">
+    <view class="bottom-cell">
+      <image class="bottom-cell-img" :src="readImg" />
+      <text class="bottom-cell-text">{{ readnum }}</text>
+    </view>
+    <view class="bottom-cell" @click="toggleAgree">
+      <image
+        class="bottom-cell-img"
+        :src="isAgree == 1 ? likeImg : dislikeImg"
+      />
+      <text class="bottom-cell-text">{{ agreenum }}</text>
+    </view>
+    <view class="bottom-cell" @click="toggleCollect">
+      <image
+        class="bottom-cell-img"
+        :src="isCollection == 1 ? collectImg : discollectImg"
+      />
+      <text class="bottom-cell-text">收藏</text>
+    </view>
+    <view class="bottom-cell" @click="shareToggle">
+      <image class="bottom-cell-img" :src="shareImgBottom" />
+      <text class="bottom-cell-text">分享</text>
+    </view>
+  </view>
+  <uni-popup ref="shareRef" type="bottom" safeArea backgroundColor="#fff">
+    <view class="share-popup">
+      <view class="share-title">分享到</view>
+      <view class="share-content">
+        <view class="share-item" @click="shareToWechat">
+          <view class="share-icon wechat-icon">
+            <image class="share-img" :src="wxImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">微信</text>
+        </view>
+        <view class="share-item" @click="shareToMoments">
+          <view class="share-icon moments-icon">
+            <image class="share-img" :src="friendImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">朋友圈</text>
+        </view>
+        <view class="share-item" @click="shareToWeibo">
+          <view class="share-icon weibo-icon">
+            <image class="share-img" :src="sinaImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">新浪微博</text>
+        </view>
+      </view>
+      <view class="share-cancel" @click="closeShare">
+        <text>取消</text>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { onLoad, onHide, onShow, onUnload } from "@dcloudio/uni-app";
+import api from "@/api/api";
+import navBar from "@/components/navBar/navBar.vue";
+import shareIcon from "@/static/icon_share.png";
+import sinaImg from "@/static/share_sina.png";
+import wxImg from "@/static/share_weixin.png";
+import friendImg from "@/static/share_wxc.png";
+import logoImg from "@/static/weiboShare.png";
+import collectImg from "@/static/icon_book_collect_sel.png";
+import discollectImg from "@/static/icon_book_collect_nor.png";
+import readImg from "@/static/reading.png";
+import likeImg from "@/static/argee_sure.png";
+import dislikeImg from "@/static/argee_no.png";
+import shareImgBottom from "@/static/icon_share.png";
+
+const title = ref("新闻详情");
+const type = ref("");
+const safeUrl = ref("");
+const backgroundColor = ref("");
+const hasBg = ref(false);
+const canShare = ref(false);
+const summary = ref("");
+const shareLink = ref("");
+const shareImg = ref("");
+const shareTitle = ref("");
+const uuid = ref("");
+const isCollection = ref(0);
+const readnum = ref(0);
+const agreenum = ref(0);
+const isAgree = ref(0);
+const user_uuid = ref("");
+const bottomHeight = ref(65);
+const NAV_BAR_HEIGHT_PX = 44;
+const WEBVIEW_BOTTOM_PX = 65;
+const webviewTopPx = ref(88);
+const webviewHeightPx = ref(600);
+
+const webviewStyles = ref({
+  width: "100%",
+  top: `${webviewTopPx.value}px`,
+  height: `${webviewHeightPx.value}px`,
+  bottom: `${WEBVIEW_BOTTOM_PX}px`,
+});
+const applyWebviewLayout = () => {
+ 
+ 
+};
+const initWebviewLayout = () => {
+  const resInfo = uni.getSystemInfoSync();
+  const statusBarHeight = Number(resInfo.statusBarHeight || 0);
+  const windowHeight = Number(resInfo.windowHeight || 0);
+  webviewTopPx.value = Math.round(statusBarHeight + NAV_BAR_HEIGHT_PX);
+  webviewHeightPx.value = Math.max(
+    200,
+    Math.round(windowHeight - webviewTopPx.value - WEBVIEW_BOTTOM_PX)
+  );
+  webviewStyles.value = {
+    width: "100%",
+    top: `${webviewTopPx.value}px`,
+    height: `${webviewHeightPx.value}px`,
+    bottom: `${WEBVIEW_BOTTOM_PX}px`,
+  };
+};
+
+const getCollect = () => {
+  api
+    .getCollect({
+      other_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      if (res.code == 200) {
+        uni.showToast({
+          title: "收藏成功",
+          icon: "none",
+        });
+        if (type.value == "huanjiao_news") {
+          getNewsDetail();
+        } else {
+          getKePuCollection();
+        }
+      }
+    });
+};
+const getDiscollect = () => {
+  api
+    .getDiscollect({
+      other_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      console.log(res);
+      if (res.code == 200) {
+        uni.showToast({
+          title: "取消收藏成功",
+          icon: "none",
+        });
+        if(type.value=='huanjiao_news'){
+    getNewsDetail();
+  }else{
+    getKePuCollection();
+  }
+      }
+    });
+};
+const toggleCollect = () => {
+  console.log("收藏状态" + isCollection.value);
+  if (isCollection.value == 0) {
+    getCollect();
+  } else {
+    getDiscollect();
+  }
+};
+const toggleAgree = () => {
+  if (isAgree.value == 0) {
+    getAgree();
+  } else {
+    getDisagree();
+  }
+};
+const getAgree = () => {
+  api
+    .getAgree({
+      news_article_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      if(type.value=='huanjiao_news'){
+    getNewsDetail();
+  }else{
+    getKePuCollection();
+  }
+    });
+};
+const getDisagree = () => {
+  api
+    .getDisagree({
+      news_article_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      console.log(res);
+      if(type.value=='huanjiao_news'){
+    getNewsDetail();
+  }else{
+    getKePuCollection();
+  }
+    });
+};
+const getOutRead = () => {
+  api
+    .getOutRead({
+      uuid: uuid.value,
+      type: type.value == "huanjiao_news" ? 1 : 2,
+    })
+    .then((res) => {
+      console.log(res);
+    });
+};
+const getNewsDetail = () => {
+  api
+    .getNewsDetail({
+      uuid: uuid.value,
+    })
+    .then((res) => {
+      console.log(res);
+      if (res.code == 200) {
+        isCollection.value = res.data.isCollection;
+        readnum.value = res.data.readnum;
+        agreenum.value = res.data.agreenum;
+        isAgree.value = res.data.isAgree;
+      }
+    });
+};
+const getKePuCollection = () => {
+  api
+    .getKePuCollection({
+      uuid: uuid.value,
+      user_uuid: user_uuid.value,
+    })
+    .then((res) => {
+      console.log(res.data);
+      if (res.code == 200) {
+        isCollection.value = res.data.isCollection;
+        readnum.value = res.data.readnum;
+        agreenum.value = res.data.agreenum;
+        isAgree.value = res.data.isAgree;
+      }
+    });
+};
+const goBack = () => {
+  uni.navigateBack({
+    fail() {
+      uni.redirectTo({
+        url: "/pages/index/index",
+      });
+    },
+  });
+};
+const webviewRef = ref(null);
+
+onShow(() => {
+ setTimeout(() => {
+  uni.hideLoading();
+ }, 2000);
+  // console.log('show');
+  // plus.screen.lockOrientation('portrait-primary');
+});
+onUnload(() => {
+  // console.log('onUnload');
+  // plus.screen.lockOrientation('portrait-primary');
+});
+onHide(() => {
+  // console.log('onHide');
+  // plus.screen.lockOrientation('landscape-primary');
+});
+onLoad((query) => {
+  uni.showLoading({
+    title: '加载中',
+    mask: true,
+  });
+  initWebviewLayout();
+  const userInfo = uni.getStorageSync("userInfo");
+  if (query.type) {
+      type.value = query.type;
+    }
+  user_uuid.value = userInfo.uuid;
+  if (query.title) {
+    title.value = query.title;
+  }
+  if (query.uuid) {
+    uuid.value = query.uuid;
+  }
+  if (query.share == 1) {
+    canShare.value = true;
+  }
+  if (query.bg == 1) {
+    hasBg.value = true;
+
+    backgroundColor.value = "linear-gradient(to bottom,'#fff' , '#398775')";
+  }
+  if (type.value == "huanjiao_news") {
+    getNewsDetail();
+  } else {
+    getKePuCollection();
+  }
+  getOutRead();
+  
+  const raw =
+    query && (query.url || query.href || query.link || query.src || "");
+  if (!raw) {
+    uni.showToast({
+      title: "未获取到网页链接",
+      icon: "none",
+    });
+  }
+  try {
+    safeUrl.value = decodeURIComponent(raw);
+    console.log( safeUrl.value);
+    // query.imgPath
+    //   ? decodeURIComponent(query.imgPath)
+    //   : "https://doc.igandan.com/app/html/img/2016/20160714132557.png";
+    shareImg.value ="https://doc.igandan.com/app/html/img/2016/20160714132557.png";
+    console.log(shareImg.value);
+   
+    if (query.type == "live_yugao") {
+      shareTitle.value = query.sharetitle;
+      summary.value = "分享一篇来自“肝胆相照”的会议预告：" + shareTitle.value;
+    } else if (query.type == "live_old") {
+      shareTitle.value = query.sharetitle;
+      summary.value = "分享一篇来自“肝胆相照”的历史会议：" + shareTitle.value;
+    } else if (query.type == "live") {
+      shareTitle.value = "肝胆相照直播：" + query.sharetitle;
+      summary.value = shareTitle.value;
+    } else if (query.type == "news") {
+      shareTitle.value = query.sharetitle;
+      summary.value = "";
+    } else if (query.type == "huanjiao" || query.type == "huanjiao_news") {
+      console.log(query.sharetitle);
+      console.log(query.summary);
+      shareTitle.value = query.sharetitle;
+      summary.value = query.summary;
+    }
+    // #ifdef APP-PLUS
+    // let wv = plus.webview.create("", "custom-webview", {
+    //   top: statusBarHeight + navHeight + "px",
+    //   height: calcWebviewHeight(baseWindowHeight) + "px",
+    //   bottom: fixedBottomHeight + "px",
+    // });
+    // webviewRef.value = wv;
+    // wv.loadURL(safeUrl.value);
+
+    // let pages = getCurrentPages();
+    // let page = pages[pages.length - 1];
+
+    // var currentWebview = page.$getAppWebview(); //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
+    // currentWebview.append(wv);
+    // const applyWebviewStyle = (windowH) => {
+    //   wv.setStyle({
+    //     top: statusBarHeight + navHeight + "px",
+    //     height: calcWebviewHeight(windowH) + "px",
+    //     bottom: fixedBottomHeight + "px",
+    //     scalable: true,
+    //     videoFullscreen: "landscape",
+    //     zIndex: -1,
+    //   });
+    // };
+    // setTimeout(function () {
+    //   wv = currentWebview.children()[0];
+    //   webviewRef.value = wv;
+    //   applyWebviewStyle(baseWindowHeight);
+    // }, 300); //如果是页面初始化调用时，需要延时一下
+    // wv.onloaded = (e) => {
+    //   wv.show();
+    // };
+
+    // uni.onWindowResize((res) => {
+    //   const resizeH = Number((res && res.size && res.size.windowHeight) || baseWindowHeight);
+    //   setTimeout(function () {
+    //     applyWebviewStyle(resizeH);
+    //   }, 0);
+    // });
+    // 创建并展示原生弹窗
+    createNativePopup();
+   
+    // #endif
+  } catch (e) {
+    safeUrl.value = raw;
+  }
+});
+const shareRef = ref(null);
+shareRef.value?.open();
+// 分享APP
+const shareToggle = () => {
+  showNativePopup();
+  // console.log(shareRef.value);
+  // shareRef.value?.open();
+  //  uni.showActionSheet({
+  //    title:"分享",
+  //    itemList: ['分享到微信', '分享到朋友圈', '分享到微博'],
+  //    success: function (res) {
+  //    		if(res.tapIndex==0){
+  // 			shareToWechat()
+  // 		}else if(res.tapIndex==1){
+  // 			shareToMoments()
+  // 		}else{
+  // 			shareToWeibo()
+  // 		}
+  //    	},
+  //  })
+};
+
+// 关闭分享弹窗
+const closeShare = () => {
+  shareRef.value.close();
+};
+
+// ========= 原生弹窗（plus.nativeObj.view）============
+const nativeMaskView = ref(null);
+const nativePopupView = ref(null);
+const popupShowing = ref(false);
+// 保存弹窗尺寸信息，供事件处理使用
+const popupInfo = ref({
+  screenW: 0,
+  screenH: 0,
+  panelH: 0,
+  cancelH: 0,
+  contentTop: 0,
+  iconSize: 0,
+  textSize: 0,
+});
+
+function createNativePopup() {
+  // #ifdef APP-PLUS
+  if (nativeMaskView.value || nativePopupView.value) return;
+  const screenW = plus.screen.resolutionWidth;
+  const screenH = plus.screen.resolutionHeight;
+  const panelH = uni.upx2px(520); // 面板高度（含标题+内容+取消）
+  const radius = uni.upx2px(20);
+
+  // 保存尺寸信息
+  const iconSize = 50; // 图标大小80px（与图标文件尺寸一致）
+  const titleH = uni.upx2px(80);
+  const cancelH = uni.upx2px(100);
+  const contentTop = uni.upx2px(90) + titleH;
+  const textSize = uni.upx2px(24);
+
+  popupInfo.value = {
+    screenW,
+    screenH,
+    panelH,
+    cancelH,
+    contentTop,
+    iconSize,
+    textSize,
+  };
+  // 遮罩
+  nativeMaskView.value = new plus.nativeObj.View(
+    "native-share-mask",
+    {
+      left: "0px",
+      top: "0px",
+      width: screenW + "px",
+      height: screenH + "px",
+      zindex: 99998,
+      touchable: true,
+      interceptTouchEvent: true,
+    },
+    [
+      {
+        tag: "rect",
+        id: "mask",
+        position: {
+          left: "0px",
+          top: "0px",
+          width: screenW + "px",
+          height: screenH + "px",
+        },
+        color: "rgba(0,0,0,0.5)",
+      },
+    ]
+  );
+  // 面板
+  nativePopupView.value = new plus.nativeObj.View(
+    "native-share-panel",
+    {
+      left: "0px",
+      top: screenH - panelH + "px",
+      width: screenW + "px",
+      height: panelH + "px",
+      zindex: 99999,
+      touchable: true,
+      interceptTouchEvent: true,
+    },
+    []
+  );
+  // 背景+圆角
+  nativePopupView.value.drawRect(
+    {
+      color: "#FFFFFF",
+      radius: radius,
+      rectStyles: {},
+    },
+    {
+      left: uni.upx2px(0) + "px",
+      top: uni.upx2px(0) + "px",
+      width: screenW + "px",
+      height: panelH + "px",
+    }
+  );
+  // 标题
+  nativePopupView.value.drawText(
+    "分享到",
+    {
+      left: "0px",
+      top: uni.upx2px(20) + "px",
+      width: screenW + "px",
+      height: titleH + "px",
+    },
+    {
+      size: uni.upx2px(32) + "px",
+      color: "#333333",
+      align: "center",
+      verticalAlign: "middle",
+      weight: "500",
+    }
+  );
+  const items = [
+    { id: "it-wechat", text: "微信" },
+    { id: "it-moments", text: "朋友圈" },
+    // { id: 'it-weibo', text: '微博' }
+  ];
+  // 三个分享项区域（使用图标）
+  const itemW = screenW / items.length;
+  const iconTop = contentTop;
+  const textTop = iconTop + iconSize + uni.upx2px(16);
+
+  console.log("图标布局信息:", {
+    screenW,
+    itemW,
+    iconSize,
+    iconTop,
+    contentTop,
+  });
+
+  // 图标文件名映射（直接使用文件名，避免路径转换问题）
+  const iconFiles = [
+    "share_weixin.png", // 微信
+    "share_wxc.png", // 朋友圈
+    "share_sina.png", // 微博
+  ];
+
+  items.forEach((it, idx) => {
+    const left = idx * itemW;
+    // 计算图标居中位置（确保是整数像素）
+    const iconLeft = Math.round(left + (itemW - iconSize) / 2);
+    const iconLeftPx = iconLeft;
+    // 确保所有图标使用相同的 top 值，保证在一行
+    const iconTopPx = Math.round(iconTop);
+    const iconSizePx = iconSize;
+
+    console.log(
+      `图标 ${idx} (${it.text}): left=${left}, itemW=${itemW.toFixed(
+        2
+      )}, iconLeft=${iconLeftPx}, iconTop=${iconTopPx}, iconSize=${iconSizePx}`
+    );
+
+    // 构建图标本地路径
+    // 说明：
+    //  - 在 Android 上使用 convertLocalFileSystemURL 可以得到 file:// 路径；
+    //  - 但在 iOS 上，plus.nativeObj.View.drawBitmap 对 file:// 路径兼容性较差，
+    //    更推荐直接使用 "_www" 相对路径。
+    // 这里统一使用 "_www/static/xxx.png" 相对路径，兼容 Android 和 iOS。
+    let iconPath = null;
+    try {
+      const iconFile = iconFiles[idx];
+      // 使用 _www 相对路径，避免 iOS 下 file:// 路径导致图片不显示
+      iconPath = "_www/static/" + iconFile;
+      console.log(`图标 ${it.text} 路径: ${iconPath}`);
+    } catch (e) {
+      console.log("构建图标路径失败:", e);
+      iconPath = null;
+    }
+
+    // 绘制图标
+    if (iconPath) {
+      try {
+        console.log(
+          `绘制图标 ${it.text}: 位置=(${iconLeftPx}, ${iconTopPx}), 大小=${iconSizePx}x${iconSizePx}`
+        );
+        // 使用 drawBitmap 绘制图标
+        // 尝试不同的参数格式，确保图标不变形且正确显示
+        // 格式1: drawBitmap(src, position, options)
+        try {
+          nativePopupView.value.drawBitmap(
+            iconPath,
+            {},
+            {
+              left: iconLeftPx + "px",
+              top: iconTopPx + "px",
+              width: iconSizePx + "px",
+              height: iconSizePx + "px",
+            }
+          );
+        } catch (e1) {
+          // 如果格式1失败，尝试格式2: drawBitmap(src, position)
+          try {
+            nativePopupView.value.drawBitmap(iconPath, {
+              left: iconLeftPx + "px",
+              top: iconTopPx + "px",
+              width: iconSizePx + "px",
+              height: iconSizePx + "px",
+            });
+          } catch (e2) {
+            console.log("drawBitmap 两种格式都失败:", e1, e2);
+            throw e2;
+          }
+        }
+      } catch (e) {
+        console.log("绘制图标失败，使用圆形色块代替:", e);
+        // 如果图标加载失败，使用圆形色块作为后备
+        const bgColor = idx === 2 ? "#E6162D" : "#07C160";
+        nativePopupView.value.drawRect(
+          {
+            color: bgColor,
+            radius: Math.round(iconSize / 2),
+          },
+          {
+            left: Math.round(iconLeft) + "px",
+            top: Math.round(iconTop) + "px",
+            width: Math.round(iconSize) + "px",
+            height: Math.round(iconSize) + "px",
+          }
+        );
+      }
+    } else {
+      // 如果没有图标路径，使用圆形色块
+      const bgColor = idx === 2 ? "#E6162D" : "#07C160";
+      nativePopupView.value.drawRect(
+        {
+          color: bgColor,
+          radius: Math.round(iconSize / 2),
+        },
+        {
+          left: Math.round(iconLeft) + "px",
+          top: Math.round(iconTop) + "px",
+          width: Math.round(iconSize) + "px",
+          height: Math.round(iconSize) + "px",
+        }
+      );
+    }
+
+    // 绘制文字
+    nativePopupView.value.drawText(
+      it.text,
+      {
+        left: left + "px",
+        top: textTop + "px",
+        width: itemW + "px",
+        height: textSize + uni.upx2px(20) + "px",
+      },
+      {
+        size: textSize + "px",
+        color: "#666666",
+        align: "center",
+        verticalAlign: "top",
+      }
+    );
+  });
+  // 取消按钮分割线
+  const cancelTop = panelH - cancelH;
+  nativePopupView.value.drawRect(
+    { color: "#F0F0F0" },
+    {
+      left: "0px",
+      top: cancelTop - 1 + "px",
+      width: screenW + "px",
+      height: "1px",
+    }
+  );
+  nativePopupView.value.drawText(
+    "取消",
+    {
+      left: "0px",
+      top: cancelTop + "px",
+      width: screenW + "px",
+      height: cancelH + "px",
+    },
+    {
+      size: uni.upx2px(32) + "px",
+      color: "#333333",
+      align: "center",
+      verticalAlign: "middle",
+    }
+  );
+  // 事件处理函数
+  const handleMaskClick = () => {
+    console.log("遮罩被点击");
+    closeNativePopup();
+  };
+
+  const handlePanelClick = (e) => {
+    console.log("面板被点击", e);
+    const info = popupInfo.value;
+
+    // 获取点击坐标
+    let x = 0;
+    let y = 0;
+
+    // 尝试多种方式获取坐标
+    if (e.clientX !== undefined && e.clientY !== undefined) {
+      x = e.clientX;
+      y = e.clientY;
+    } else if (e.pageX !== undefined && e.pageY !== undefined) {
+      x = e.pageX;
+      y = e.pageY;
+    } else if (e.touches && e.touches.length > 0) {
+      x = e.touches[0].clientX || e.touches[0].pageX || 0;
+      y = e.touches[0].clientY || e.touches[0].pageY || 0;
+    } else if (e.changedTouches && e.changedTouches.length > 0) {
+      x = e.changedTouches[0].clientX || e.changedTouches[0].pageX || 0;
+      y = e.changedTouches[0].clientY || e.changedTouches[0].pageY || 0;
+    }
+
+    console.log("原始坐标:", x, y);
+    console.log("屏幕信息:", info);
+
+    if (!x || !y) {
+      console.log("坐标无效");
+      return;
+    }
+
+    // 判断坐标是相对于屏幕还是相对于视图
+    // 如果 y 小于 panelH，说明是相对于视图的坐标
+    // 如果 y 大于等于 screenH - panelH，说明是相对于屏幕的坐标
+    let relativeY = y;
+    let relativeX = x;
+
+    if (y < info.panelH) {
+      // 相对于视图的坐标，直接使用
+      relativeY = y;
+      relativeX = x;
+      console.log("使用相对于视图的坐标:", relativeX, relativeY);
+    } else if (y >= info.screenH - info.panelH) {
+      // 相对于屏幕的坐标，转换为相对于视图的坐标
+      relativeY = y - (info.screenH - info.panelH);
+      relativeX = x;
+      console.log(
+        "使用相对于屏幕的坐标，转换为相对视图:",
+        relativeX,
+        relativeY
+      );
+    } else {
+      // 可能是其他情况，尝试直接使用
+      console.log("坐标类型不确定，尝试直接使用");
+    }
+
+    // 取消区域（底部取消按钮）- 相对于视图
+    const cancelTop = info.panelH - info.cancelH;
+    console.log(
+      "取消区域判断: relativeY =",
+      relativeY,
+      ", cancelTop =",
+      cancelTop
+    );
+    if (relativeY >= cancelTop) {
+      console.log("点击了取消按钮");
+      closeNativePopup();
+      return;
+    }
+
+    // 分享项区域（图标+文字区域）- 相对于视图
+    const shareAreaTop = info.contentTop;
+    const shareAreaBottom =
+      shareAreaTop + info.iconSize + info.textSize + uni.upx2px(20);
+
+    console.log(
+      "分享区域: relativeY =",
+      relativeY,
+      ", 范围 =",
+      shareAreaTop,
+      "到",
+      shareAreaBottom
+    );
+
+    if (relativeY >= shareAreaTop && relativeY <= shareAreaBottom) {
+      // 计算点击的是第几个分享项（0:微信, 1:朋友圈, 2:微博）
+      const itemWidth = info.screenW / items.length;
+      const idx = Math.min(2, Math.max(0, Math.floor(relativeX / itemWidth)));
+
+      console.log(
+        "点击了分享项:",
+        idx,
+        ", x =",
+        relativeX,
+        ", itemWidth =",
+        itemWidth
+      );
+
+      if (idx === 0) {
+        console.log("执行微信分享");
+        shareToWechat();
+        closeNativePopup();
+      } else if (idx === 1) {
+        console.log("执行朋友圈分享");
+        shareToMoments();
+        closeNativePopup();
+      } else if (idx === 2) {
+        console.log("执行微博分享");
+        // shareToWeibo();
+        // closeNativePopup();
+      }
+    } else {
+      console.log(
+        "点击位置不在分享区域内, relativeY =",
+        relativeY,
+        ", 需要范围:",
+        shareAreaTop,
+        "到",
+        shareAreaBottom
+      );
+    }
+  };
+
+  // 同时监听 click 和 touchstart 事件
+  nativeMaskView.value.addEventListener("click", handleMaskClick, false);
+  nativeMaskView.value.addEventListener("touchstart", handleMaskClick, false);
+
+  nativePopupView.value.addEventListener("click", handlePanelClick, false);
+  nativePopupView.value.addEventListener("touchstart", handlePanelClick, false);
+  nativePopupView.value.addEventListener("touchend", handlePanelClick, false);
+  // #endif
+}
+
+function showNativePopup() {
+  // #ifdef APP-PLUS
+  if (popupShowing.value) return;
+  if (!nativeMaskView.value || !nativePopupView.value) {
+    createNativePopup();
+  }
+  nativeMaskView.value && nativeMaskView.value.show();
+  nativePopupView.value && nativePopupView.value.show();
+  popupShowing.value = true;
+  // #endif
+}
+
+function closeNativePopup() {
+  // #ifdef APP-PLUS
+  if (!popupShowing.value) return;
+  nativeMaskView.value && nativeMaskView.value.hide();
+  nativePopupView.value && nativePopupView.value.hide();
+  popupShowing.value = false;
+  // #endif
+}
+
+// 分享到微信
+const shareToWechat = () => {
+  // #ifdef APP-PLUS
+  // 使用系统分享
+  uni.downloadFile({
+    url: shareImg.value,
+    success: function (res) {
+      uni.compressImage({
+        src: res.tempFilePath,
+        quality: 60,
+        success: function (res2) {
+          uni.share({
+            provider: "weixin",
+            scene: "WXSceneSession",
+            type: 0,
+            title: shareTitle.value,
+            summary: summary.value,
+            href: safeUrl.value,
+            imageUrl: res2.tempFilePath,
+            success: function (res) {
+              console.log("success:" + JSON.stringify(res));
+            },
+            fail: function (err) {
+              console.log("fail:" + JSON.stringify(err));
+            },
+          });
+        },
+      });
+    },
+  });
+
+  // #endif
+
+  // #ifdef H5
+  // H5环境下的分享
+  if (navigator.share) {
+    navigator
+      .share({
+        title: "肝胆相照APP",
+        text: "专业的医疗健康平台，快来下载体验吧！",
+        url: shareLink.value,
+      })
+      .then(() => {
+        uni.showToast({
+          title: "分享成功",
+          icon: "success",
+        });
+      })
+      .catch(() => {
+        uni.showToast({
+          title: "分享失败",
+          icon: "none",
+        });
+      });
+  } else {
+    // 复制到剪贴板
+    uni.setClipboardData({
+      data:
+        "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：" +
+        shareLink.value,
+      success: () => {
+        uni.showToast({
+          title: "已复制到剪贴板",
+          icon: "success",
+        });
+      },
+    });
+  }
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  // 微信小程序分享
+  uni.showShareMenu({
+    withShareTicket: true,
+    menus: ["shareAppMessage", "shareTimeline"],
+  });
+  // #endif
+
+  closeShare();
+};
+
+// 页面隐藏/销毁时清理原生弹窗
+onHide(() => {
+  // #ifdef APP-PLUS
+  closeNativePopup();
+  // #endif
+});
+onUnload(() => {
+  // #ifdef APP-PLUS
+  try {
+    nativeMaskView.value &&
+      nativeMaskView.value.close &&
+      nativeMaskView.value.close();
+    nativePopupView.value &&
+      nativePopupView.value.close &&
+      nativePopupView.value.close();
+  } catch (e) {}
+  nativeMaskView.value = null;
+  nativePopupView.value = null;
+  popupShowing.value = false;
+  // #endif
+});
+// 分享到朋友圈
+const shareToMoments = () => {
+  // #ifdef APP-PLUS
+  uni.downloadFile({
+    url: shareImg.value,
+    success: function (res) {
+      uni.compressImage({
+        src: res.tempFilePath,
+        quality: 60,
+        success: function (res2) {
+          uni.share({
+            provider: "weixin",
+            scene: "WXSceneTimeline",
+            type: 0,
+            title: shareTitle.value,
+            summary: summary.value,
+            href: safeUrl.value,
+            imageUrl: res2.tempFilePath,
+            success: function (res) {
+              console.log("success:" + JSON.stringify(res));
+            },
+            fail: function (err) {
+              console.log("fail:" + JSON.stringify(err));
+            },
+          });
+        },
+        fail: function (err) {
+          console.log("fail:" + JSON.stringify(err));
+        },
+      });
+    },
+  });
+
+  // #endif
+
+  // #ifdef H5
+  // 复制到剪贴板
+  uni.setClipboardData({
+    data: "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com",
+    success: () => {
+      uni.showToast({
+        title: "已复制到剪贴板，可分享到朋友圈",
+        icon: "success",
+      });
+    },
+  });
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  uni.showShareMenu({
+    withShareTicket: true,
+    menus: ["shareAppMessage", "shareTimeline"],
+  });
+  // #endif
+
+  closeShare();
+};
+
+// 分享到新浪微博
+const shareToWeibo = () => {
+  // #ifdef APP-PLUS
+  uni.share({
+    provider: "sinaweibo",
+    type: 0,
+    title: shareTitle.value,
+    summary: summary.value,
+    href: safeUrl.value,
+    imageUrl: logoImg,
+    success: function (res) {
+      console.log("分享成功");
+    },
+    fail: function (err) {
+      console.log("fail:" + JSON.stringify(err));
+    },
+  });
+  // plus.share.sendWithSystem({
+  // 	type: 'text',
+  // 	content: '肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com'
+  // }, () => {
+  // 	uni.showToast({
+  // 		title: '分享成功',
+  // 		icon: 'success'
+  // 	})
+  // }, (err) => {
+  // 	console.log('分享失败：', err)
+  // 	uni.showToast({
+  // 		title: '分享失败',
+  // 		icon: 'none'
+  // 	})
+  // })
+  // #endif
+
+  // #ifdef H5
+  // 复制到剪贴板
+  uni.setClipboardData({
+    data: "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com",
+    success: () => {
+      uni.showToast({
+        title: "已复制到剪贴板，可分享到微博",
+        icon: "success",
+      });
+    },
+  });
+  // #endif
+
+  closeShare();
+};
+</script>
+
+<style>
+
+
+.bottom-box {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  z-index: 99;
+  background-color: #fff;
+}
+.bottom-cell {
+  flex: 1;
+  height: 55px;
+  border-right: 2rpx solid #ccc;
+  border-top: 2rpx solid #ccc;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.bottom-cell:last-child {
+  border-right: none;
+}
+.bottom-cell-img {
+  width: 40rpx;
+  height: 40rpx;
+}
+.bottom-cell-text {
+  margin-left: 8rpx;
+  font-size: 28rpx;
+  color: #666;
+}
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 10000000;
+}
+/* 分享弹窗样式 */
+.share-popup {
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  padding: 40rpx 0 0;
+}
+.share-img {
+  width: 100rpx;
+  height: 100rpx;
+}
+.share-title {
+  text-align: center;
+  font-size: 32rpx;
+  color: #333;
+  margin-bottom: 40rpx;
+  font-weight: 500;
+}
+
+.share-content {
+  display: flex;
+  justify-content: space-around;
+  padding: 0 40rpx 40rpx;
+}
+
+.share-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 1;
+}
+
+.share-icon {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 20rpx;
+}
+
+.wechat-icon {
+  background-color: #07c160;
+}
+
+.moments-icon {
+  background-color: #07c160;
+}
+
+.weibo-icon {
+  background-color: #e6162d;
+}
+
+.qq-icon {
+  background-color: #12b7f5;
+}
+
+.share-icon-text {
+  font-size: 50rpx;
+  color: #fff;
+  font-weight: bold;
+}
+
+.share-text {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.share-cancel {
+  height: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-top: 1rpx solid #f0f0f0;
+  font-size: 32rpx;
+  color: #333;
+}
+
+.share-cancel:active {
+  background-color: #f5f5f5;
+}
+.nav-actions .share-img-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.nav-actions .collect-img-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.nav-actions {
+  display: flex;
+  align-items: center;
+}
+
+.container {
+  height: 100vh;
+  position: relative;
+  z-index: 0;
+  overflow: scroll;
+}
+.tip {
+  padding: 24rpx;
+  color: #666;
+  font-size: 28rpx;
+}
+</style>
diff --git a/pages_app/webview/webviewClass copy.vue b/pages_app/webview/webviewClass copy.vue
new file mode 100644
index 0000000..3a428f2
--- /dev/null
+++ b/pages_app/webview/webviewClass copy.vue	
@@ -0,0 +1,1177 @@
+<template>
+  <view class="container" :style="{ backgroundColor: backgroundColor }">
+    <!-- 分享弹窗 -->
+
+    <view class="navbox">
+      <view class="status_bar"></view>
+      <uni-nav-bar
+        left-icon="left"
+        :title="title"
+        @clickLeft="goBack"
+        color="#8B2316"
+        :border="false"
+        backgroundColor="#eeeeee"
+      >
+        <template #right>
+          <view class="nav-actions">
+            <view class="collect-img" @click="shareToggle" v-if="canShare">
+              <image
+                class="share-img-icon"
+                :src="shareIcon"
+                mode="aspectFill"
+              />
+            </view>
+          </view>
+        </template>
+      </uni-nav-bar>
+    </view>
+  </view>
+  <view class="bottom-box" >
+     <view class="bottom-cell">
+      <image class="bottom-cell-img" :src="readImg"  />
+      <text class="bottom-cell-text">{{ readnum }}</text>
+     </view>
+     <view class="bottom-cell" @click="toggleAgree">
+      <image class="bottom-cell-img" :src="isAgree==1?likeImg:dislikeImg"  />
+      <text class="bottom-cell-text">{{ agreenum }}</text>
+     </view>
+     <view class="bottom-cell" @click="toggleCollect">
+      <image class="bottom-cell-img" :src="isCollection==1?collectImg:discollectImg"  />
+      <text class="bottom-cell-text">收藏</text>
+     </view>
+     <view class="bottom-cell" @click="shareToggle">
+      <image class="bottom-cell-img" :src="shareImgBottom"  />
+      <text class="bottom-cell-text">分享</text>
+     </view>
+  </view>
+  <uni-popup ref="shareRef" type="bottom" safeArea backgroundColor="#fff">
+    <view class="share-popup">
+      <view class="share-title">分享到</view>
+      <view class="share-content">
+        <view class="share-item" @click="shareToWechat">
+          <view class="share-icon wechat-icon">
+            <image class="share-img" :src="wxImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">微信</text>
+        </view>
+        <view class="share-item" @click="shareToMoments">
+          <view class="share-icon moments-icon">
+            <image class="share-img" :src="friendImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">朋友圈</text>
+        </view>
+        <view class="share-item" @click="shareToWeibo">
+          <view class="share-icon weibo-icon">
+            <image class="share-img" :src="sinaImg" mode="aspectFill" />
+          </view>
+          <text class="share-text">新浪微博</text>
+        </view>
+      </view>
+      <view class="share-cancel" @click="closeShare">
+        <text>取消</text>
+      </view>
+    </view>
+  </uni-popup>
+</template>
+
+<script setup>
+import { ref } from "vue";
+import { onLoad, onHide, onShow, onUnload } from "@dcloudio/uni-app";
+import api from "@/api/api";
+import navBar from "@/components/navBar/navBar.vue";
+import shareIcon from "@/static/icon_share.png";
+import sinaImg from "@/static/share_sina.png";
+import wxImg from "@/static/share_weixin.png";
+import friendImg from "@/static/share_wxc.png";
+import logoImg from "@/static/weiboShare.png";
+import collectImg from "@/static/icon_book_collect_sel.png";
+import discollectImg from "@/static/icon_book_collect_nor.png";
+import readImg from "@/static/reading.png";
+import likeImg from "@/static/argee_sure.png";
+import dislikeImg from "@/static/argee_no.png";
+import shareImgBottom from "@/static/icon_share.png";
+
+const title = ref("新闻详情");
+const safeUrl = ref("");
+const backgroundColor = ref("");
+const hasBg = ref(false);
+const canShare = ref(false);
+const summary = ref("");
+const shareLink = ref("");
+const shareImg = ref("");
+const shareTitle = ref("");
+const uuid = ref("");
+const isCollection = ref(0);
+const readnum = ref(0);
+const agreenum = ref(0);
+const isAgree = ref(0);
+const user_uuid = ref("");
+const bottomHeight=ref(65);
+
+const getCollect = () => {
+  api.getCollect({
+    other_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+     if(res.code == 200) {
+        uni.showToast({
+          title: "收藏成功",
+          icon: "none",
+        });
+        getKePuCollection();
+     }
+  });
+};
+const getDiscollect = () => {
+  api.getDiscollect({
+    other_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+    console.log(res);
+    if(res.code == 200) {
+      uni.showToast({
+        title: "取消收藏成功",
+        icon: "none",
+      });
+      getKePuCollection();
+    }
+  });
+};
+const toggleCollect = () => {
+  if(isCollection.value == 0) {
+    getCollect();
+  } else {
+    getDiscollect();
+  }
+};
+const toggleAgree = () => {
+  if(isAgree.value == 0) {
+    getAgree();
+  } else {
+    getDisagree();
+  }
+};
+const getAgree = () => {
+  api.getAgree({
+    news_article_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+    getKePuCollection();
+  });
+};
+const getDisagree = () => {
+  api.getDisagree({
+    news_article_uuid: uuid.value,
+    user_uuid: user_uuid.value,
+    type: 2,
+  }).then(res => {
+    console.log(res);
+    getKePuCollection();
+  });
+};
+const getOutRead = () => {
+  api.getOutRead({
+    uuid: uuid.value,
+   type: 2,
+  }).then(res => {
+    console.log(res);
+  });
+};
+const getKePuCollection = () => {
+  api.getKePuCollection({
+    uuid: uuid.value,
+    user_uuid: user_uuid.value,
+  }).then(res => {
+    console.log(res.data);
+    if(res.code == 200) {
+      isCollection.value = res.data.isCollection;
+      readnum.value = res.data.readnum;
+      agreenum.value = res.data.agreenum;
+      isAgree.value = res.data.isAgree;
+    }
+  });
+};
+const goBack = () => {
+  uni.navigateBack({
+    fail() {
+      uni.redirectTo({
+        url: "/pages/index/index",
+      });
+    },
+  });
+};
+const webviewRef = ref(null);
+const updateWebviewHeight = (windowH) => {
+  // #ifdef APP-PLUS
+  try {
+    let wv = webviewRef.value;
+    if (!wv) {
+      const pages = getCurrentPages();
+      const page = pages[pages.length - 1];
+      const currentWebview = page && page.$getAppWebview && page.$getAppWebview();
+      if (currentWebview && currentWebview.children && currentWebview.children().length > 0) {
+        wv = currentWebview.children()[0];
+        webviewRef.value = wv;
+      }
+    }
+    if (!wv || !wv.setStyle) return;
+    const resInfo = uni.getSystemInfoSync();
+    const statusBarHeight = Number(resInfo.statusBarHeight || 0);
+    const navHeight = 44;
+    const fixedBottomHeight = 65;
+    const winH = Number(windowH || resInfo.windowHeight || 0);
+    const h = Math.max(200, winH - statusBarHeight - navHeight - fixedBottomHeight);
+    wv.setStyle({
+      top: statusBarHeight + navHeight + "px",
+      height: h + "px",
+      bottom: fixedBottomHeight + "px",
+      scalable: true,
+      videoFullscreen: "landscape",
+      zIndex: -1,
+    });
+  } catch (e) {}
+  // #endif
+};
+onShow(() => {
+  uni.hideLoading();
+  updateWebviewHeight();
+  // console.log('show');
+  // plus.screen.lockOrientation('portrait-primary');
+});
+onUnload(() => {
+  // console.log('onUnload');
+  // plus.screen.lockOrientation('portrait-primary');
+});
+onHide(() => {
+  // console.log('onHide');
+  // plus.screen.lockOrientation('landscape-primary');
+});
+onLoad((query) => {
+  const userInfo = uni.getStorageSync("userInfo");
+  user_uuid.value = userInfo.uuid;
+  if (query.title) {
+    title.value = query.title;
+  }
+  if (query.uuid) {
+    uuid.value = query.uuid;
+  }
+  if (query.share == 1) {
+    canShare.value = true;
+  }
+  if (query.bg == 1) {
+    hasBg.value = true;
+
+    backgroundColor.value = "linear-gradient(to bottom,'#fff' , '#398775')";
+  }
+  getKePuCollection();
+  getOutRead();
+  // 直接使用同步系统信息，避免部分机型异步回调导致 height 为 0
+  const baseSysInfo = uni.getSystemInfoSync();
+  const baseWindowHeight = Number(baseSysInfo.windowHeight || 0);
+  const raw = query && (query.url || "");
+  try {
+    safeUrl.value = decodeURIComponent(raw);
+    shareImg.value = query.imgPath?decodeURIComponent(query.imgPath):'https://doc.igandan.com/app/html/img/2016/20160714132557.png';
+    console.log(shareImg.value);
+    if (query.type == "live_yugao") {
+      shareTitle.value = query.sharetitle;
+      summary.value = "分享一篇来自“肝胆相照”的会议预告：" + shareTitle.value;
+    } else if (query.type == "live_old") {
+      shareTitle.value = query.sharetitle;
+      summary.value = "分享一篇来自“肝胆相照”的历史会议：" + shareTitle.value;
+    } else if (query.type == "live") {
+      shareTitle.value = "肝胆相照直播：" + query.sharetitle;
+      summary.value = shareTitle.value;
+    }else if(query.type=='news'){
+      shareTitle.value = query.sharetitle;
+      summary.value ='';
+    }else if(query.type=='huanjiao'){
+       console.log(query.sharetitle);
+       console.log(query.summary);
+      shareTitle.value = query.sharetitle;
+      summary.value = query.summary;
+    }
+    // #ifdef APP-PLUS
+    const resInfo = uni.getSystemInfoSync();
+    const statusBarHeight = Number(resInfo.statusBarHeight || 0);
+    const navHeight = 44;
+    const fixedBottomHeight = 65;
+    const calcWebviewHeight = (windowH) =>
+      Math.max(200, Number(windowH || 0) - statusBarHeight - navHeight - fixedBottomHeight);
+
+    let wv = plus.webview.create("", "custom-webview", {
+      top: statusBarHeight + navHeight + "px",
+      height: calcWebviewHeight(baseWindowHeight) + "px",
+      bottom: fixedBottomHeight + "px",
+    });
+    webviewRef.value = wv;
+    wv.loadURL(safeUrl.value);
+
+    let pages = getCurrentPages();
+    let page = pages[pages.length - 1];
+
+    var currentWebview = page.$getAppWebview(); //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
+    currentWebview.append(wv);
+    const applyWebviewStyle = (windowH) => {
+      wv.setStyle({
+        top: statusBarHeight + navHeight + "px",
+        height: calcWebviewHeight(windowH) + "px",
+        bottom: fixedBottomHeight + "px",
+        scalable: true,
+        videoFullscreen: "landscape",
+        zIndex: -1,
+      });
+    };
+    setTimeout(function () {
+      wv = currentWebview.children()[0];
+      webviewRef.value = wv;
+      applyWebviewStyle(baseWindowHeight);
+    }, 300); //如果是页面初始化调用时，需要延时一下
+    wv.onloaded = (e) => {
+      wv.show();
+    };
+
+    uni.onWindowResize((res) => {
+      const resizeH = Number((res && res.size && res.size.windowHeight) || baseWindowHeight);
+      setTimeout(function () {
+        applyWebviewStyle(resizeH);
+      }, 0);
+    });
+    // 创建并展示原生弹窗
+    createNativePopup();
+
+    // #endif
+  } catch (e) {
+    safeUrl.value = raw;
+  }
+});
+const shareRef = ref(null);
+shareRef.value?.open();
+// 分享APP
+const shareToggle = () => {
+  showNativePopup();
+  // console.log(shareRef.value);
+  // shareRef.value?.open();
+  //  uni.showActionSheet({
+  //    title:"分享",
+  //    itemList: ['分享到微信', '分享到朋友圈', '分享到微博'],
+  //    success: function (res) {
+  //    		if(res.tapIndex==0){
+  // 			shareToWechat()
+  // 		}else if(res.tapIndex==1){
+  // 			shareToMoments()
+  // 		}else{
+  // 			shareToWeibo()
+  // 		}
+  //    	},
+  //  })
+};
+
+// 关闭分享弹窗
+const closeShare = () => {
+  shareRef.value.close();
+};
+
+// ========= 原生弹窗（plus.nativeObj.view）============
+const nativeMaskView = ref(null);
+const nativePopupView = ref(null);
+const popupShowing = ref(false);
+// 保存弹窗尺寸信息，供事件处理使用
+const popupInfo = ref({
+  screenW: 0,
+  screenH: 0,
+  panelH: 0,
+  cancelH: 0,
+  contentTop: 0,
+  iconSize: 0,
+  textSize: 0,
+});
+
+function createNativePopup() {
+  // #ifdef APP-PLUS
+  if (nativeMaskView.value || nativePopupView.value) return;
+  const screenW = plus.screen.resolutionWidth;
+  const screenH = plus.screen.resolutionHeight;
+  const panelH = uni.upx2px(520); // 面板高度（含标题+内容+取消）
+  const radius = uni.upx2px(20);
+
+  // 保存尺寸信息
+  const iconSize = 50; // 图标大小80px（与图标文件尺寸一致）
+  const titleH = uni.upx2px(80);
+  const cancelH = uni.upx2px(100);
+  const contentTop = uni.upx2px(90) + titleH;
+  const textSize = uni.upx2px(24);
+
+  popupInfo.value = {
+    screenW,
+    screenH,
+    panelH,
+    cancelH,
+    contentTop,
+    iconSize,
+    textSize,
+  };
+  // 遮罩
+  nativeMaskView.value = new plus.nativeObj.View(
+    "native-share-mask",
+    {
+      left: "0px",
+      top: "0px",
+      width: screenW + "px",
+      height: screenH + "px",
+      zindex: 99998,
+      touchable: true,
+      interceptTouchEvent: true,
+    },
+    [
+      {
+        tag: "rect",
+        id: "mask",
+        position: {
+          left: "0px",
+          top: "0px",
+          width: screenW + "px",
+          height: screenH + "px",
+        },
+        color: "rgba(0,0,0,0.5)",
+      },
+    ]
+  );
+  // 面板
+  nativePopupView.value = new plus.nativeObj.View(
+    "native-share-panel",
+    {
+      left: "0px",
+      top: screenH - panelH + "px",
+      width: screenW + "px",
+      height: panelH + "px",
+      zindex: 99999,
+      touchable: true,
+      interceptTouchEvent: true,
+    },
+    []
+  );
+  // 背景+圆角
+  nativePopupView.value.drawRect(
+    {
+      color: "#FFFFFF",
+      radius: radius,
+      rectStyles: {},
+    },
+    {
+      left: uni.upx2px(0) + "px",
+      top: uni.upx2px(0) + "px",
+      width: screenW + "px",
+      height: panelH + "px",
+    }
+  );
+  // 标题
+  nativePopupView.value.drawText(
+    "分享到",
+    {
+      left: "0px",
+      top: uni.upx2px(20) + "px",
+      width: screenW + "px",
+      height: titleH + "px",
+    },
+    {
+      size: uni.upx2px(32) + "px",
+      color: "#333333",
+      align: "center",
+      verticalAlign: "middle",
+      weight: "500",
+    }
+  );
+  const items = [
+    { id: "it-wechat", text: "微信" },
+    { id: "it-moments", text: "朋友圈" },
+    // { id: 'it-weibo', text: '微博' }
+  ];
+  // 三个分享项区域（使用图标）
+  const itemW = screenW / items.length;
+  const iconTop = contentTop;
+  const textTop = iconTop + iconSize + uni.upx2px(16);
+
+  console.log("图标布局信息:", {
+    screenW,
+    itemW,
+    iconSize,
+    iconTop,
+    contentTop,
+  });
+
+  // 图标文件名映射（直接使用文件名，避免路径转换问题）
+  const iconFiles = [
+    "share_weixin.png", // 微信
+    "share_wxc.png", // 朋友圈
+    "share_sina.png", // 微博
+  ];
+
+  items.forEach((it, idx) => {
+    const left = idx * itemW;
+    // 计算图标居中位置（确保是整数像素）
+    const iconLeft = Math.round(left + (itemW - iconSize) / 2);
+    const iconLeftPx = iconLeft;
+    // 确保所有图标使用相同的 top 值，保证在一行
+    const iconTopPx = Math.round(iconTop);
+    const iconSizePx = iconSize;
+
+    console.log(
+      `图标 ${idx} (${it.text}): left=${left}, itemW=${itemW.toFixed(
+        2
+      )}, iconLeft=${iconLeftPx}, iconTop=${iconTopPx}, iconSize=${iconSizePx}`
+    );
+
+    // 构建图标本地路径
+    // 说明：
+    //  - 在 Android 上使用 convertLocalFileSystemURL 可以得到 file:// 路径；
+    //  - 但在 iOS 上，plus.nativeObj.View.drawBitmap 对 file:// 路径兼容性较差，
+    //    更推荐直接使用 "_www" 相对路径。
+    // 这里统一使用 "_www/static/xxx.png" 相对路径，兼容 Android 和 iOS。
+    let iconPath = null;
+    try {
+      const iconFile = iconFiles[idx];
+      // 使用 _www 相对路径，避免 iOS 下 file:// 路径导致图片不显示
+      iconPath = "_www/static/" + iconFile;
+      console.log(`图标 ${it.text} 路径: ${iconPath}`);
+    } catch (e) {
+      console.log("构建图标路径失败:", e);
+      iconPath = null;
+    }
+
+    // 绘制图标
+    if (iconPath) {
+      try {
+        console.log(
+          `绘制图标 ${it.text}: 位置=(${iconLeftPx}, ${iconTopPx}), 大小=${iconSizePx}x${iconSizePx}`
+        );
+        // 使用 drawBitmap 绘制图标
+        // 尝试不同的参数格式，确保图标不变形且正确显示
+        // 格式1: drawBitmap(src, position, options)
+        try {
+          nativePopupView.value.drawBitmap(
+            iconPath,
+            {},
+            {
+              left: iconLeftPx + "px",
+              top: iconTopPx + "px",
+              width: iconSizePx + "px",
+              height: iconSizePx + "px",
+            }
+          );
+        } catch (e1) {
+          // 如果格式1失败，尝试格式2: drawBitmap(src, position)
+          try {
+            nativePopupView.value.drawBitmap(iconPath, {
+              left: iconLeftPx + "px",
+              top: iconTopPx + "px",
+              width: iconSizePx + "px",
+              height: iconSizePx + "px",
+            });
+          } catch (e2) {
+            console.log("drawBitmap 两种格式都失败:", e1, e2);
+            throw e2;
+          }
+        }
+      } catch (e) {
+        console.log("绘制图标失败，使用圆形色块代替:", e);
+        // 如果图标加载失败，使用圆形色块作为后备
+        const bgColor = idx === 2 ? "#E6162D" : "#07C160";
+        nativePopupView.value.drawRect(
+          {
+            color: bgColor,
+            radius: Math.round(iconSize / 2),
+          },
+          {
+            left: Math.round(iconLeft) + "px",
+            top: Math.round(iconTop) + "px",
+            width: Math.round(iconSize) + "px",
+            height: Math.round(iconSize) + "px",
+          }
+        );
+      }
+    } else {
+      // 如果没有图标路径，使用圆形色块
+      const bgColor = idx === 2 ? "#E6162D" : "#07C160";
+      nativePopupView.value.drawRect(
+        {
+          color: bgColor,
+          radius: Math.round(iconSize / 2),
+        },
+        {
+          left: Math.round(iconLeft) + "px",
+          top: Math.round(iconTop) + "px",
+          width: Math.round(iconSize) + "px",
+          height: Math.round(iconSize) + "px",
+        }
+      );
+    }
+
+    // 绘制文字
+    nativePopupView.value.drawText(
+      it.text,
+      {
+        left: left + "px",
+        top: textTop + "px",
+        width: itemW + "px",
+        height: textSize + uni.upx2px(20) + "px",
+      },
+      {
+        size: textSize + "px",
+        color: "#666666",
+        align: "center",
+        verticalAlign: "top",
+      }
+    );
+  });
+  // 取消按钮分割线
+  const cancelTop = panelH - cancelH;
+  nativePopupView.value.drawRect(
+    { color: "#F0F0F0" },
+    {
+      left: "0px",
+      top: cancelTop - 1 + "px",
+      width: screenW + "px",
+      height: "1px",
+    }
+  );
+  nativePopupView.value.drawText(
+    "取消",
+    {
+      left: "0px",
+      top: cancelTop + "px",
+      width: screenW + "px",
+      height: cancelH + "px",
+    },
+    {
+      size: uni.upx2px(32) + "px",
+      color: "#333333",
+      align: "center",
+      verticalAlign: "middle",
+    }
+  );
+  // 事件处理函数
+  const handleMaskClick = () => {
+    console.log("遮罩被点击");
+    closeNativePopup();
+  };
+
+  const handlePanelClick = (e) => {
+    console.log("面板被点击", e);
+    const info = popupInfo.value;
+
+    // 获取点击坐标
+    let x = 0;
+    let y = 0;
+
+    // 尝试多种方式获取坐标
+    if (e.clientX !== undefined && e.clientY !== undefined) {
+      x = e.clientX;
+      y = e.clientY;
+    } else if (e.pageX !== undefined && e.pageY !== undefined) {
+      x = e.pageX;
+      y = e.pageY;
+    } else if (e.touches && e.touches.length > 0) {
+      x = e.touches[0].clientX || e.touches[0].pageX || 0;
+      y = e.touches[0].clientY || e.touches[0].pageY || 0;
+    } else if (e.changedTouches && e.changedTouches.length > 0) {
+      x = e.changedTouches[0].clientX || e.changedTouches[0].pageX || 0;
+      y = e.changedTouches[0].clientY || e.changedTouches[0].pageY || 0;
+    }
+
+    console.log("原始坐标:", x, y);
+    console.log("屏幕信息:", info);
+
+    if (!x || !y) {
+      console.log("坐标无效");
+      return;
+    }
+
+    // 判断坐标是相对于屏幕还是相对于视图
+    // 如果 y 小于 panelH，说明是相对于视图的坐标
+    // 如果 y 大于等于 screenH - panelH，说明是相对于屏幕的坐标
+    let relativeY = y;
+    let relativeX = x;
+
+    if (y < info.panelH) {
+      // 相对于视图的坐标，直接使用
+      relativeY = y;
+      relativeX = x;
+      console.log("使用相对于视图的坐标:", relativeX, relativeY);
+    } else if (y >= info.screenH - info.panelH) {
+      // 相对于屏幕的坐标，转换为相对于视图的坐标
+      relativeY = y - (info.screenH - info.panelH);
+      relativeX = x;
+      console.log(
+        "使用相对于屏幕的坐标，转换为相对视图:",
+        relativeX,
+        relativeY
+      );
+    } else {
+      // 可能是其他情况，尝试直接使用
+      console.log("坐标类型不确定，尝试直接使用");
+    }
+
+    // 取消区域（底部取消按钮）- 相对于视图
+    const cancelTop = info.panelH - info.cancelH;
+    console.log(
+      "取消区域判断: relativeY =",
+      relativeY,
+      ", cancelTop =",
+      cancelTop
+    );
+    if (relativeY >= cancelTop) {
+      console.log("点击了取消按钮");
+      closeNativePopup();
+      return;
+    }
+
+    // 分享项区域（图标+文字区域）- 相对于视图
+    const shareAreaTop = info.contentTop;
+    const shareAreaBottom =
+      shareAreaTop + info.iconSize + info.textSize + uni.upx2px(20);
+
+    console.log(
+      "分享区域: relativeY =",
+      relativeY,
+      ", 范围 =",
+      shareAreaTop,
+      "到",
+      shareAreaBottom
+    );
+
+    if (relativeY >= shareAreaTop && relativeY <= shareAreaBottom) {
+      // 计算点击的是第几个分享项（0:微信, 1:朋友圈, 2:微博）
+      const itemWidth = info.screenW / items.length;
+      const idx = Math.min(2, Math.max(0, Math.floor(relativeX / itemWidth)));
+
+      console.log(
+        "点击了分享项:",
+        idx,
+        ", x =",
+        relativeX,
+        ", itemWidth =",
+        itemWidth
+      );
+
+      if (idx === 0) {
+        console.log("执行微信分享");
+        shareToWechat();
+        closeNativePopup();
+      } else if (idx === 1) {
+        console.log("执行朋友圈分享");
+        shareToMoments();
+        closeNativePopup();
+      } else if (idx === 2) {
+        console.log("执行微博分享");
+        // shareToWeibo();
+        // closeNativePopup();
+      }
+    } else {
+      console.log(
+        "点击位置不在分享区域内, relativeY =",
+        relativeY,
+        ", 需要范围:",
+        shareAreaTop,
+        "到",
+        shareAreaBottom
+      );
+    }
+  };
+
+  // 同时监听 click 和 touchstart 事件
+  nativeMaskView.value.addEventListener("click", handleMaskClick, false);
+  nativeMaskView.value.addEventListener("touchstart", handleMaskClick, false);
+
+  nativePopupView.value.addEventListener("click", handlePanelClick, false);
+  nativePopupView.value.addEventListener("touchstart", handlePanelClick, false);
+  nativePopupView.value.addEventListener("touchend", handlePanelClick, false);
+  // #endif
+}
+
+function showNativePopup() {
+  // #ifdef APP-PLUS
+  if (popupShowing.value) return;
+  if (!nativeMaskView.value || !nativePopupView.value) {
+    createNativePopup();
+  }
+  nativeMaskView.value && nativeMaskView.value.show();
+  nativePopupView.value && nativePopupView.value.show();
+  popupShowing.value = true;
+  // #endif
+}
+
+function closeNativePopup() {
+  // #ifdef APP-PLUS
+  if (!popupShowing.value) return;
+  nativeMaskView.value && nativeMaskView.value.hide();
+  nativePopupView.value && nativePopupView.value.hide();
+  popupShowing.value = false;
+  // #endif
+}
+
+// 分享到微信
+const shareToWechat = () => {
+  // #ifdef APP-PLUS
+  // 使用系统分享
+  uni.downloadFile({
+    url: shareImg.value,
+    success: function (res) {
+      uni.compressImage({
+        src: res.tempFilePath,
+        quality: 60,
+        success: function (res2) {
+          uni.share({
+            provider: "weixin",
+            scene: "WXSceneSession",
+            type: 0,
+            title: shareTitle.value,
+            summary: summary.value,
+            href: safeUrl.value,
+            imageUrl: res2.tempFilePath,
+            success: function (res) {
+              console.log("success:" + JSON.stringify(res));
+            },
+            fail: function (err) {
+              console.log("fail:" + JSON.stringify(err));
+            },
+          });
+        },
+      });
+    },
+  });
+
+  // #endif
+
+  // #ifdef H5
+  // H5环境下的分享
+  if (navigator.share) {
+    navigator
+      .share({
+        title: "肝胆相照APP",
+        text: "专业的医疗健康平台，快来下载体验吧！",
+        url: shareLink.value,
+      })
+      .then(() => {
+        uni.showToast({
+          title: "分享成功",
+          icon: "success",
+        });
+      })
+      .catch(() => {
+        uni.showToast({
+          title: "分享失败",
+          icon: "none",
+        });
+      });
+  } else {
+    // 复制到剪贴板
+    uni.setClipboardData({
+      data:
+        "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：" +
+        shareLink.value,
+      success: () => {
+        uni.showToast({
+          title: "已复制到剪贴板",
+          icon: "success",
+        });
+      },
+    });
+  }
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  // 微信小程序分享
+  uni.showShareMenu({
+    withShareTicket: true,
+    menus: ["shareAppMessage", "shareTimeline"],
+  });
+  // #endif
+
+  closeShare();
+};
+
+// 页面隐藏/销毁时清理原生弹窗
+onHide(() => {
+  // #ifdef APP-PLUS
+  closeNativePopup();
+  // #endif
+});
+onUnload(() => {
+  // #ifdef APP-PLUS
+  try {
+    nativeMaskView.value &&
+      nativeMaskView.value.close &&
+      nativeMaskView.value.close();
+    nativePopupView.value &&
+      nativePopupView.value.close &&
+      nativePopupView.value.close();
+  } catch (e) {}
+  nativeMaskView.value = null;
+  nativePopupView.value = null;
+  popupShowing.value = false;
+  // #endif
+});
+// 分享到朋友圈
+const shareToMoments = () => {
+  // #ifdef APP-PLUS
+  uni.downloadFile({
+    url: shareImg.value,
+    success: function (res) {
+      uni.compressImage({
+        src: res.tempFilePath,
+        quality: 60,
+        success: function (res2) {
+          uni.share({
+            provider: "weixin",
+            scene: "WXSceneTimeline",
+            type: 0,
+            title: shareTitle.value,
+            summary: summary.value,
+            href: safeUrl.value,
+            imageUrl: res2.tempFilePath,
+            success: function (res) {
+              console.log("success:" + JSON.stringify(res));
+            },
+            fail: function (err) {
+              console.log("fail:" + JSON.stringify(err));
+            },
+          });
+        },
+        fail: function (err) {
+          console.log("fail:" + JSON.stringify(err));
+        },
+      });
+    },
+  });
+
+  // #endif
+
+  // #ifdef H5
+  // 复制到剪贴板
+  uni.setClipboardData({
+    data: "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com",
+    success: () => {
+      uni.showToast({
+        title: "已复制到剪贴板，可分享到朋友圈",
+        icon: "success",
+      });
+    },
+  });
+  // #endif
+
+  // #ifdef MP-WEIXIN
+  uni.showShareMenu({
+    withShareTicket: true,
+    menus: ["shareAppMessage", "shareTimeline"],
+  });
+  // #endif
+
+  closeShare();
+};
+
+// 分享到新浪微博
+const shareToWeibo = () => {
+  // #ifdef APP-PLUS
+  uni.share({
+    provider: "sinaweibo",
+    type: 0,
+    title: shareTitle.value,
+    summary: summary.value,
+    href: safeUrl.value,
+    imageUrl: logoImg,
+    success: function (res) {
+      console.log("分享成功");
+    },
+    fail: function (err) {
+      console.log("fail:" + JSON.stringify(err));
+    },
+  });
+  // plus.share.sendWithSystem({
+  // 	type: 'text',
+  // 	content: '肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com'
+  // }, () => {
+  // 	uni.showToast({
+  // 		title: '分享成功',
+  // 		icon: 'success'
+  // 	})
+  // }, (err) => {
+  // 	console.log('分享失败：', err)
+  // 	uni.showToast({
+  // 		title: '分享失败',
+  // 		icon: 'none'
+  // 	})
+  // })
+  // #endif
+
+  // #ifdef H5
+  // 复制到剪贴板
+  uni.setClipboardData({
+    data: "肝胆相照APP - 专业的医疗健康平台，快来下载体验吧！\n下载链接：https://www.igandan.com",
+    success: () => {
+      uni.showToast({
+        title: "已复制到剪贴板，可分享到微博",
+        icon: "success",
+      });
+    },
+  });
+  // #endif
+
+  closeShare();
+};
+</script>
+
+<style>
+.bottom-box {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  right: 0;
+  height: 60px;
+  display: flex;
+  align-items: center;
+  z-index:99;
+  background-color: #fff;
+  
+ 
+}
+.bottom-cell {
+  flex: 1;
+  height:55px;
+ border-right: 2rpx solid #ccc;
+ border-top: 2rpx solid #ccc;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+ 
+}
+.bottom-cell:last-child {
+  border-right: none;
+}
+.bottom-cell-img {
+  width: 40rpx;
+  height: 40rpx;
+}
+.bottom-cell-text {
+  margin-left: 8rpx;
+  font-size: 28rpx;
+  color: #666;
+}
+.mask {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: rgba(0, 0, 0, 0.5);
+  z-index: 10000000;
+}
+/* 分享弹窗样式 */
+.share-popup {
+  background-color: #fff;
+  border-radius: 20rpx 20rpx 0 0;
+  padding: 40rpx 0 0;
+}
+.share-img {
+  width: 100rpx;
+  height: 100rpx;
+}
+.share-title {
+  text-align: center;
+  font-size: 32rpx;
+  color: #333;
+  margin-bottom: 40rpx;
+  font-weight: 500;
+}
+
+.share-content {
+  display: flex;
+  justify-content: space-around;
+  padding: 0 40rpx 40rpx;
+}
+
+.share-item {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  flex: 1;
+}
+
+.share-icon {
+  width: 100rpx;
+  height: 100rpx;
+  border-radius: 50%;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  margin-bottom: 20rpx;
+}
+
+.wechat-icon {
+  background-color: #07c160;
+}
+
+.moments-icon {
+  background-color: #07c160;
+}
+
+.weibo-icon {
+  background-color: #e6162d;
+}
+
+.qq-icon {
+  background-color: #12b7f5;
+}
+
+.share-icon-text {
+  font-size: 50rpx;
+  color: #fff;
+  font-weight: bold;
+}
+
+.share-text {
+  font-size: 24rpx;
+  color: #666;
+}
+
+.share-cancel {
+  height: 100rpx;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  border-top: 1rpx solid #f0f0f0;
+  font-size: 32rpx;
+  color: #333;
+}
+
+.share-cancel:active {
+  background-color: #f5f5f5;
+}
+.nav-actions .share-img-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.nav-actions .collect-img-icon {
+  width: 40rpx;
+  height: 40rpx;
+}
+.nav-actions {
+  display: flex;
+  align-items: center;
+}
+
+.container {
+  height: 100vh;
+  position: relative;
+  z-index: 0;
+  overflow: scroll;
+}
+.tip {
+  padding: 24rpx;
+  color: #666;
+  font-size: 28rpx;
+}
+</style>
diff --git a/pages_app/webview/webviewClass.vue b/pages_app/webview/webviewClass.vue
index 36d68a3..6ec634b 100644
--- a/pages_app/webview/webviewClass.vue
+++ b/pages_app/webview/webviewClass.vue
@@ -26,23 +26,34 @@
       </uni-nav-bar>
     </view>
   </view>
-  <view class="bottom-box" >
-     <view class="bottom-cell">
-      <image class="bottom-cell-img" :src="readImg"  />
+  <web-view
+    v-if="safeUrl"
+    :src="safeUrl"
+    :webview-styles="webviewStyles"
+  ></web-view>
+  <view class="bottom-box">
+    <view class="bottom-cell">
+      <image class="bottom-cell-img" :src="readImg" />
       <text class="bottom-cell-text">{{ readnum }}</text>
-     </view>
-     <view class="bottom-cell" @click="toggleAgree">
-      <image class="bottom-cell-img" :src="isAgree==1?likeImg:dislikeImg"  />
+    </view>
+    <view class="bottom-cell" @click="toggleAgree">
+      <image
+        class="bottom-cell-img"
+        :src="isAgree == 1 ? likeImg : dislikeImg"
+      />
       <text class="bottom-cell-text">{{ agreenum }}</text>
-     </view>
-     <view class="bottom-cell" @click="toggleCollect">
-      <image class="bottom-cell-img" :src="isCollection==1?collectImg:discollectImg"  />
+    </view>
+    <view class="bottom-cell" @click="toggleCollect">
+      <image
+        class="bottom-cell-img"
+        :src="isCollection == 1 ? collectImg : discollectImg"
+      />
       <text class="bottom-cell-text">收藏</text>
-     </view>
-     <view class="bottom-cell" @click="shareToggle">
-      <image class="bottom-cell-img" :src="shareImgBottom"  />
+    </view>
+    <view class="bottom-cell" @click="shareToggle">
+      <image class="bottom-cell-img" :src="shareImgBottom" />
       <text class="bottom-cell-text">分享</text>
-     </view>
+    </view>
   </view>
   <uni-popup ref="shareRef" type="bottom" safeArea backgroundColor="#fff">
     <view class="share-popup">
@@ -92,6 +103,7 @@ import dislikeImg from "@/static/argee_no.png";
 import shareImgBottom from "@/static/icon_share.png";
 
 const title = ref("新闻详情");
+const type = ref("");
 const safeUrl = ref("");
 const backgroundColor = ref("");
 const hasBg = ref(false);
@@ -106,93 +118,168 @@ const readnum = ref(0);
 const agreenum = ref(0);
 const isAgree = ref(0);
 const user_uuid = ref("");
-const bottomHeight=ref(65);
+const bottomHeight = ref(65);
+const NAV_BAR_HEIGHT_PX = 44;
+const WEBVIEW_BOTTOM_PX = 65;
+const webviewTopPx = ref(88);
+const webviewHeightPx = ref(600);
+
+const webviewStyles = ref({
+  width: "100%",
+  top: `${webviewTopPx.value}px`,
+  height: `${webviewHeightPx.value}px`,
+  bottom: `65px`,
+});
+const applyWebviewLayout = () => {
+ 
+ 
+};
+const initWebviewLayout = () => {
+  const resInfo = uni.getSystemInfoSync();
+  const statusBarHeight = Number(resInfo.statusBarHeight || 0);
+  const windowHeight = Number(resInfo.windowHeight || 0);
+  webviewTopPx.value = Math.round(statusBarHeight + NAV_BAR_HEIGHT_PX);
+  webviewHeightPx.value = Math.max(
+    200,
+    Math.round(windowHeight - webviewTopPx.value - WEBVIEW_BOTTOM_PX)
+  );
+  webviewStyles.value = {
+    width: "100%",
+    top: `${webviewTopPx.value}px`,
+    height: `${webviewHeightPx.value}px`,
+    bottom: `${WEBVIEW_BOTTOM_PX}px`,
+  };
+};
 
 const getCollect = () => {
-  api.getCollect({
-    other_uuid: uuid.value,
-    user_uuid: user_uuid.value,
-    type: 2,
-  }).then(res => {
-     if(res.code == 200) {
+  api
+    .getCollect({
+      other_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      if (res.code == 200) {
         uni.showToast({
           title: "收藏成功",
           icon: "none",
         });
-        getKePuCollection();
-     }
-  });
+        if (type.value == "huanjiao_news") {
+          getNewsDetail();
+        } else {
+          getKePuCollection();
+        }
+      }
+    });
 };
 const getDiscollect = () => {
-  api.getDiscollect({
-    other_uuid: uuid.value,
-    user_uuid: user_uuid.value,
-    type: 2,
-  }).then(res => {
-    console.log(res);
-    if(res.code == 200) {
-      uni.showToast({
-        title: "取消收藏成功",
-        icon: "none",
-      });
-      getKePuCollection();
-    }
-  });
+  api
+    .getDiscollect({
+      other_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      console.log(res);
+      if (res.code == 200) {
+        uni.showToast({
+          title: "取消收藏成功",
+          icon: "none",
+        });
+        if(type.value=='huanjiao_news'){
+    getNewsDetail();
+  }else{
+    getKePuCollection();
+  }
+      }
+    });
 };
 const toggleCollect = () => {
-  if(isCollection.value == 0) {
+  console.log("收藏状态" + isCollection.value);
+  if (isCollection.value == 0) {
     getCollect();
   } else {
     getDiscollect();
   }
 };
 const toggleAgree = () => {
-  if(isAgree.value == 0) {
+  if (isAgree.value == 0) {
     getAgree();
   } else {
     getDisagree();
   }
 };
 const getAgree = () => {
-  api.getAgree({
-    news_article_uuid: uuid.value,
-    user_uuid: user_uuid.value,
-    type: 2,
-  }).then(res => {
+  api
+    .getAgree({
+      news_article_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      if(type.value=='huanjiao_news'){
+    getNewsDetail();
+  }else{
     getKePuCollection();
-  });
+  }
+    });
 };
 const getDisagree = () => {
-  api.getDisagree({
-    news_article_uuid: uuid.value,
-    user_uuid: user_uuid.value,
-    type: 2,
-  }).then(res => {
-    console.log(res);
+  api
+    .getDisagree({
+      news_article_uuid: uuid.value,
+      user_uuid: user_uuid.value,
+      type: type.value=='huanjiao_news'?1:2,
+    })
+    .then((res) => {
+      console.log(res);
+      if(type.value=='huanjiao_news'){
+    getNewsDetail();
+  }else{
     getKePuCollection();
-  });
+  }
+    });
 };
 const getOutRead = () => {
-  api.getOutRead({
-    uuid: uuid.value,
-   type: 2,
-  }).then(res => {
-    console.log(res);
-  });
+  api
+    .getOutRead({
+      uuid: uuid.value,
+      type: type.value == "huanjiao_news" ? 1 : 2,
+    })
+    .then((res) => {
+      console.log(res);
+    });
+};
+const getNewsDetail = () => {
+  api
+    .getNewsDetail({
+      uuid: uuid.value,
+    })
+    .then((res) => {
+      console.log(res);
+      if (res.code == 200) {
+        isCollection.value = res.data.isCollection;
+        readnum.value = res.data.readnum;
+        agreenum.value = res.data.agreenum;
+        isAgree.value = res.data.isAgree;
+      }
+    });
 };
 const getKePuCollection = () => {
-  api.getKePuCollection({
-    uuid: uuid.value,
-    user_uuid: user_uuid.value,
-  }).then(res => {
-    console.log(res.data);
-    if(res.code == 200) {
-      isCollection.value = res.data.isCollection;
-      readnum.value = res.data.readnum;
-      agreenum.value = res.data.agreenum;
-      isAgree.value = res.data.isAgree;
-    }
-  });
+  api
+    .getKePuCollection({
+      uuid: uuid.value,
+      user_uuid: user_uuid.value,
+    })
+    .then((res) => {
+      console.log(res.data);
+      if (res.code == 200) {
+        isCollection.value = res.data.isCollection;
+        readnum.value = res.data.readnum;
+        agreenum.value = res.data.agreenum;
+        isAgree.value = res.data.isAgree;
+      }
+    });
 };
 const goBack = () => {
   uni.navigateBack({
@@ -203,8 +290,12 @@ const goBack = () => {
     },
   });
 };
+const webviewRef = ref(null);
+
 onShow(() => {
+ setTimeout(() => {
   uni.hideLoading();
+ }, 2000);
   // console.log('show');
   // plus.screen.lockOrientation('portrait-primary');
 });
@@ -217,7 +308,15 @@ onHide(() => {
   // plus.screen.lockOrientation('landscape-primary');
 });
 onLoad((query) => {
+  uni.showLoading({
+    title: '加载中',
+    mask: true,
+  });
+  //initWebviewLayout();
   const userInfo = uni.getStorageSync("userInfo");
+  if (query.type) {
+      type.value = query.type;
+    }
   user_uuid.value = userInfo.uuid;
   if (query.title) {
     title.value = query.title;
@@ -233,21 +332,30 @@ onLoad((query) => {
 
     backgroundColor.value = "linear-gradient(to bottom,'#fff' , '#398775')";
   }
-  getKePuCollection();
+  if (type.value == "huanjiao_news") {
+    getNewsDetail();
+  } else {
+    getKePuCollection();
+  }
   getOutRead();
-  var height = 0; //定义动态的高度变量，如高度为定值，可以直接写
-  uni.getSystemInfo({
-    success: (sysinfo) => {
-      height = sysinfo.windowHeight; //自行修改
-	  //bottomHeight.value=height-140
-    },
-    complete: () => {},
-  });
-  const raw = query && (query.url || "");
+  
+  const raw =
+    query && (query.url || query.href || query.link || query.src || "");
+  if (!raw) {
+    uni.showToast({
+      title: "未获取到网页链接",
+      icon: "none",
+    });
+  }
   try {
     safeUrl.value = decodeURIComponent(raw);
-    shareImg.value = query.imgPath?decodeURIComponent(query.imgPath):'https://doc.igandan.com/app/html/img/2016/20160714132557.png';
+    console.log( safeUrl.value);
+    // query.imgPath
+    //   ? decodeURIComponent(query.imgPath)
+    //   : "https://doc.igandan.com/app/html/img/2016/20160714132557.png";
+    shareImg.value ="https://doc.igandan.com/app/html/img/2016/20160714132557.png";
     console.log(shareImg.value);
+   
     if (query.type == "live_yugao") {
       shareTitle.value = query.sharetitle;
       summary.value = "分享一篇来自“肝胆相照”的会议预告：" + shareTitle.value;
@@ -257,79 +365,57 @@ onLoad((query) => {
     } else if (query.type == "live") {
       shareTitle.value = "肝胆相照直播：" + query.sharetitle;
       summary.value = shareTitle.value;
-    }else if(query.type=='news'){
+    } else if (query.type == "news") {
       shareTitle.value = query.sharetitle;
-      summary.value ='';
-    }else if(query.type=='huanjiao'){
-       console.log(query.sharetitle);
-       console.log(query.summary);
+      summary.value = "";
+    } else if (query.type == "huanjiao" || query.type == "huanjiao_news") {
+      console.log(query.sharetitle);
+      console.log(query.summary);
       shareTitle.value = query.sharetitle;
       summary.value = query.summary;
     }
     // #ifdef APP-PLUS
-    const resInfo = uni.getSystemInfoSync(); // 或者使用 uni.getSystemInfo({...}).then(res => {...})
-    let statusBarHeight = resInfo.statusBarHeight;
-    let wv = plus.webview.create("", "custom-webview", {
-      top: statusBarHeight + 44 + "px",
-      bottom: "65px",
-    });
-    wv.loadURL(safeUrl.value);
+    // let wv = plus.webview.create("", "custom-webview", {
+    //   top: statusBarHeight + navHeight + "px",
+    //   height: calcWebviewHeight(baseWindowHeight) + "px",
+    //   bottom: fixedBottomHeight + "px",
+    // });
+    // webviewRef.value = wv;
+    // wv.loadURL(safeUrl.value);
 
-    let pages = getCurrentPages();
-    let page = pages[pages.length - 1];
+    // let pages = getCurrentPages();
+    // let page = pages[pages.length - 1];
 
-    var currentWebview = page.$getAppWebview(); //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
-    currentWebview.append(wv);
-    setTimeout(function () {
-      wv = currentWebview.children()[0];
-      wv.setStyle({
-        top: statusBarHeight + 44 + "px",
-        height: height - 140,
-        bottom: "65px",
-        scalable: true,
-        videoFullscreen: "landscape",
-        zIndex: -1,
-      });
-    }, 300); //如果是页面初始化调用时，需要延时一下
-    wv.onloaded = (e) => {
-      wv.show();
-    };
+    // var currentWebview = page.$getAppWebview(); //此对象相当于html5plus里的plus.webview.currentWebview()。在uni-app里vue页面直接使用plus.webview.currentWebview()无效
+    // currentWebview.append(wv);
+    // const applyWebviewStyle = (windowH) => {
+    //   wv.setStyle({
+    //     top: statusBarHeight + navHeight + "px",
+    //     height: calcWebviewHeight(windowH) + "px",
+    //     bottom: fixedBottomHeight + "px",
+    //     scalable: true,
+    //     videoFullscreen: "landscape",
+    //     zIndex: -1,
+    //   });
+    // };
+    // setTimeout(function () {
+    //   wv = currentWebview.children()[0];
+    //   webviewRef.value = wv;
+    //   applyWebviewStyle(baseWindowHeight);
+    // }, 300); //如果是页面初始化调用时，需要延时一下
+    // wv.onloaded = (e) => {
+    //   wv.show();
+    // };
 
-    uni.onWindowResize((res) => {
-      if (res.size.windowHeight < height) {
-        console.log(res.size.windowHeight);
-
-        console.log(height);
-        console.log("键盘高度", res.height);
-        setTimeout(function () {
-          wv.setStyle({
-            //设置web-view距离顶部的距离以及自己的高度，单位为px
-            top: statusBarHeight + 44 + "px",
-            videoFullscreen: "landscape",
-            height: height - res.size.windowHeight + 100,
-            scalable: true, //webview的页面是否可以缩放，双指放大缩小
-            bottom: "65px",
-          });
-        }, 0);
-
-        //高度缩小
-        //如页面初始化调用需要写延迟
-      } else {
-        setTimeout(function () {
-          wv.setStyle({
-            //设置web-view距离顶部的距离以及自己的高度，单位为px
-            top: statusBarHeight + 44 + "px",
-            height: height - 80,
-            bottom: "65px",
-            videoFullscreen: "landscape",
-            scalable: true, //webview的页面是否可以缩放，双指放大缩小
-          });
-        }, 0);
-      }
-    });
+    // uni.onWindowResize((res) => {
+    //   const resizeH = Number((res && res.size && res.size.windowHeight) || baseWindowHeight);
+    //   setTimeout(function () {
+    //     applyWebviewStyle(resizeH);
+    //   }, 0);
+    // });
     // 创建并展示原生弹窗
     createNativePopup();
-
+   
     // #endif
   } catch (e) {
     safeUrl.value = raw;
@@ -1012,6 +1098,8 @@ const shareToWeibo = () => {
 </script>
 
 <style>
+
+
 .bottom-box {
   position: fixed;
   bottom: 0;
@@ -1020,20 +1108,17 @@ const shareToWeibo = () => {
   height: 60px;
   display: flex;
   align-items: center;
-  z-index:99;
+  z-index: 99;
   background-color: #fff;
-  
- 
 }
 .bottom-cell {
   flex: 1;
-  height:55px;
- border-right: 2rpx solid #ccc;
- border-top: 2rpx solid #ccc;
+  height: 55px;
+  border-right: 2rpx solid #ccc;
+  border-top: 2rpx solid #ccc;
   display: flex;
   align-items: center;
   justify-content: center;
- 
 }
 .bottom-cell:last-child {
   border-right: none;
diff --git a/pages_chat/video/searchVideo.vue b/pages_chat/video/searchVideo.vue
index 3eb16df..aae8f05 100644
--- a/pages_chat/video/searchVideo.vue
+++ b/pages_chat/video/searchVideo.vue
@@ -140,7 +140,7 @@
 				<uni-icons type="article" size="80" color="#cccccc"></uni-icons>
 				<text class="empty-text">暂无文章</text>
 			</view> -->
-			<empty v-if="articleList.length === 0 && !loading" :emptyDesc="'暂无文章'"></empty>
+			<empty v-if="articleList.length === 0 && !loading" :emptyDesc="'暂无视频'"></empty>
 		</scroll-view>
 		
 		<!-- 底部导航栏 -->
diff --git a/static/new_patient.png b/static/new_patient.png
new file mode 100644
index 0000000000000000000000000000000000000000..ade0c70ad9b33a01fc609f85bdeb7690084afbef
GIT binary patch
literal 5968
zcmaJ_cQl;q*B!kRTto;%L^q?CF?xwk^xjK|DVSmOPLSv&2qMv=_ZBq>f<!0EM2!$N
zN(er=zkBcR`{TRcyVm<YW$nGsKIb`WJ!`!&dO8m%NbisW000VgHD&#q5pnavi3xAM
zJek^kHv=O|#S~?La7Ovqc{%|U91-?TKy{d%i<7>SoujYEpc51Tz+-bYG)0+eYe5_k
zFp%AE3<v{5-mn1xs2m1q=kVAG1+;f^afQpU@3nQZ16>_u*iFQ=1+|e%PLEvG{5+iu
z{B#T*{2n_<IkL;i0-+eljR4FEWe3E-+~Hmjj12pqx{#as?`<$U@J|Tpu?+ivOqpuy
z0hJJ*PCzk`n1F+zkSI_>3M3>ZBq}My4-^&@5&;W}fQ3W^goGi2QV=0A;9n2>O*BtO
zXNbPC>R+*LRx<35P$(n>4EFKy0r`l45S}hzAt@;-u%IwlSXkf&A>ic;N7-Qn;9mFs
zR#0~Ga`1FTqFfPh;BQ4cdjuLK!+zuRKPkYF|H#6<{wmW=!N3?hBv=R}_&cS)f!f;t
zKNJT02knK@clxj2|5Mn@&==_h)_3wkpgkRK4$k@B?@&mHlBbg$3gKypK)C;1MZHG|
z6vFEf0tr-70&<(U!W|JlUOa!owY4GYa4(b{+`&m*S%&>a0OacG2oV<*7gbOalTc7m
zR1gwU5mQhSRZ$WamlP3FQdSn1l=_>ijBr51oZzUxxsLzkO8zVNcPGG*H<6W{JYBt=
z992CLFyNmVLtOvei`c*F{l#_scQ4}q$_3w;0slVN|8>rPZ{0M{@995Xd$ahb@15W`
z&F*>A)lw%uUjYExK6PaUL(Ke+6$#4lxaHb;5Hk0^Bk>tNTa?ku*pP^*Me|9e#}6NG
zPs|kS+I%-yF4dKRE&92?`R+fJ>*mjYUO%R2<W@sk+Y<V|gFsPDk%mSM$PqCpJ6Ldy
zIBXNta!zi^Y}3X{Z%W%mNuMrVUoIjpgRl1xenQ|(axLfX{IFhv2c+?I%;4t;2tjZP
z{s2jQw@{Mg68kJivk5W-OW6$z8zYnDIxELczynl~aad#K&-Z3|nsrBTWG$Bjcb3g5
z@KZ^caRILg5^yC4;lZ>3!&F<Q=iQ{e2qhuVR)7xR>#YR}pfrviAE1E@jvqpCHjEX=
z`AGSzaz+i&I0XzbJJ`PmRN*&b46DQ6#Dar$BG)3ZJ{k|H<jWW=`OfgKrim+~9K~_g
z;LOYZE#WSqlY+pxup@jMg3-Ryq{Je<5ND&?l3TL&9u=R$s&LfG?fD2Y$Ye<?ah_Ks
zej6r*4#pq!Y7jm8iFKE-5GU=*5*r5?BO^Ya4q`%0&$;B;`S4kLmkHGzqgmwLNOB#=
zUfDL84snv?@;B=tIayMZxbeZXUO4Xe@l1I!Ram94Vf+~qcyvAF0Xrr?Q8XyLm?Rfx
z>iJsHooBm0qk6A6l^W9V-oe7ClnUKABaJBtnWMTlaO>4Eadp@i5fAqh8QqLL%iTY+
zm+zj2YUb;F?<UWs3wKBpG1}MamH@nyBn=W)7)j_EmSicijl*6dQ4nm}2>}yE{k9=>
z2%mBQz3RO<4wnahJV*Jea<uJCl-fRmAueH7@1tVdS%L=uACfdUXTJ+Jy$fCYx)Tj^
zH-d;8(m+KByL1LEyUBna>ihE`qFVWL&U@`@(b^ml^cBSW6a=|zG1}Bn-F?Nc*Z9K5
zq&k`doOf8z<h4qy#31T`AvJ8|3M?hWp_C~)yMsB@E4a}EL;vOM!{`VlV77t_!`W{4
z8tW<$E@2k3r;Umv2B`LkJPX@wNjs-qUi1rfi9*#Fc;4dxeJ4fAiik09k9LbVz>ev5
zUT$C`yK=3#FiF_C$-Ivgona}u0(68#QF*>x0Mr#ku5kCuVHCWgOGJsTx~yGgpFaXO
zDyi|I!y(Vn{5DUEEv|~o)1s0!!&+5kJ%kBELyqgqBXq+g<_GcA?yuxgW}Z)n(>*v?
zMd$;{6*)S9I4Qt?l2G@MSIWDMgjZydyNizBLWi~kE$w72F}x`hvq}p38Q``D;x((w
zqOA0bJNFaId{rlp9!26IsgB23hiF|Goo;d7ULZm0q_bz=%9nWL(9sd%EO*Xv-&!na
zc2m;EKTJ0Giy7p+d%3<9W}E|Ms<GaOND6JPtG#62@3EbM6Cp+R>9;icbT7j=mk$E_
zMhCDJ7ga>1GhaTgoV3)36+fRQ4tlUpO}R!8611*ZAzT1r$nU~cdts*gvE0tC{?~{P
z&t(>4Y_89O1iYvqOwqi-o)ImYGu1;j60!`Onncd2WOs^xU=5M#>l4AVVSv(8#sztg
zI=-UYt2AJij9EGAAJ5rC6nrdsBp@tAjVWSQwd9jDkQAivE|Tv~p{Wcw%)}_6bbSSa
zSF2J*uiT8PsB_YFmd!3hjg>SMqsmMLsXlBZ*ixY7C2{wD?hDc$6YkDmu)Zqa-hAXK
z;2p9dcd1zs<s6Rupm>{}g&4!>NWjT{n>C#FTM@|Yj<d{RbJ5HT)Ws=x3o_Z*>^Z7c
z(j$k%(B&(#D~0oR9nONXa904cf4bktp1jTyBl@WBmD&Mz=taqwkb$m3c`7d;%bO-2
z#++QXm6pg>%k2AL*pO%iD1*3dU_3*hV2qy#N(+5?kk}mXcIy7b<lfTjH<P;N9vQ|N
zq~X}={#BHosDIv77?%;1m#YQaWZ~|Sr=NO`@=vn##JMsv1pwI?iddKTXNmGYA<O3C
zVMqWyW5_H0am$*F+&}1PHF+Xw#fBB+1L@_TxG$~9)-j}I;^qwN4&S2t;6|`o8-7}|
zTHl&#xHqIIiZ>5-7u@HdN*NyIQnI{9&gNTM>PSxU@@Jr<VxY6%5p;y*6)#<)&I9MZ
zTLlVPL*Uq_x*yMz#oq;`B=R4S=KkUEG|DGaiO^iyR+!NtcgFEk0F4R__jH6=&#u`b
zEN|`})D~NS_J}I|<%vSwUXg7zH%C!p-hFOat63Y_p=Ws~51kmaE$E(nYBTBAs*o_O
z;aX>jxz5kU)^MeSbS)t766$0y3%(0{@kX|Cz^Rb;E&ro_LEZgVwzmcn59lSwGsk-;
zy*KK2Pd_1%d7vWt@r;;TpoP0o*IF^E{!fW<%)0K&W!uMZI?qxe7Nc9fWa^2~>{L)n
zS+_nLT3lG(Dpq3tdNZxnx^r!@={N{q=n3I$xk~K}PsNV9h&cwUj&AFCwNa*FRXIXq
z((3(eDFKK(o<Tsdg$t%z(t<Ds@Jw&y$rKHv<$QO!RBy{V&{D8DY>|m5{W0;S#PlgS
z%jcZcJom}z37LRI%Fd=C;@+mNawm<liKl05bR~E0K#Ll#J;3O>vB%zT#ZH&(Qu8&h
zNHRzd*A$*|_#QlACGTu4E`A+uTxD7`*s#>{SgK)*_W1=VqhctXF2nuj`ND;_y0sMK
znNKUMJw&AZ{U=lQiLN5u8Ux|=`I@xrFZ9&KdncaaVHD~r<4w-m(FQ_dCh2^B*6E^^
z>9UPitg6h7j3jjF?SJqb)1-bEyECk@_3XZv>vDD#k7q~kW8;bKxJ|vq(eJ8vYbRmh
zLYnpbu}v}&RE@Uy)m3Ba19FSXbWAgC8<#YPRWvw>(C;=it}-yp3ibTOIjhy<v!_tY
zZ+o2GndkJ@_YHLzq<`Yec*J05BQ<#f=V!QKhoUnsh_ZvpE1Aj$-*qP0R~xHz-NI07
z`S)=TB@Kd~bW7t5#^ooea?<t@@As^(4AR`u(24F%6R626H<+4xnAFU6w`zNp6aAq4
z$%23=O=;CwLqw);L3=!^hOe4Wt?6UhE=4zfE<sW#pUkw+dL};ClY5Oy4@(3zW?LmQ
zh}=j>?x*x=jpkZ=qUsHrE};z)Ia6h!A?DajReTKf>lGe{esrp6$44WxyBRr39%fRN
zye?J7odXKrU6@KsYr{rKbdTJ98K+ohw|SdBJ`!l9VGB=rJ3`nx>n!+)+Z#o{4sK2I
z+@v>{pLG3$h8mOUy4m79|D$f8eur3SK{DaOJj0AyS~8qK)EX(gCGFEP@58NrOmy-o
zH?2x<WP0o=$b-TAQOyb~wJOoGHc_q4%^;0TNtFXHgztv>{6#-&xQZ3z)^>vs=B}!7
z<_n(8%de}Ve*Ic~V=y^%^3_TB-gxG{XhInf$M}Z1{$0jAwdsAN9Yb5`>z2Xei^?Mb
z^YDSdq2{Rvadg*D#O%Ebz8(~BWwiyr9NLm99XSf?;O%iA<f#<%bzle#PbTBi$Lw_F
zZp5F6n^1|2K4ZB!Q|fb(B*aNDa2(mGMoJtqSF=6Ipa%OM_*8P#-FX+Og;+9Gma$I$
z$ZT(U(G@&C*|v*T&t&HH-Gt3w9afbVHmX)U=<V_t<`e($+1J>P<akp|N~*%Y>cbnv
z+h_30iO*#f@3*#g3a%|68LbvXaR07k@9iO@RIgsBu*Ld=hl3`%1%o~d+E$8LQa|)a
zpp~-DGB!O}k7cUdhuBu)H@Vo6UteB}?hU#az3p#Xz824s@kVu>E-X8Bdx1#@$v*tb
z7N8#z$O5}NMrr2oYL)X!J{-Qgs#$)P7=Hb+V$Ssw?O2KPG6!ToL*lKmwaxWw)(JF~
zZ28xQW;919G3zhA8X<Kdmc5BC|4XsjwL+zDx8>teVtIDWUuyEk>-~2Pj_>SPmbZTA
zoYCsN?{=P!F!+=*R^mAlQL}0_82+sykJked-`C<Ee=Kym3GGiFm`-bZR`)rrL=0)u
zw#SwgwAcA2C<k_Z!S~I}IxFspj&^Zhr{7@JGV5G@=#Y4M+rIB~AeFwo&Te97_Ei;C
zvzxYVK!Y~P{(L@<ugi$INQkuhWj2Fr)~o|jsDorf%-bOuKAXGymn#g`C(E<MM8zvP
zO(3L+MfP&1)wx_1uP}K8+6ZahdK)SYC}&GMX+Kb9{t<L^TJ`wm>ii;82tprDDtu<-
zQ*SJA<hATz|2To_nKtU(l`3QzXg4XV-%jQ99ksBYfKO>}&7ZcHi3r5Jos*|kyd~^>
z(YsCo+Hb{K5@LSo=RxG}9r`0Yo$fXX+N3jhtS}T~D7rpo!~A@EGxaonz-e>5WT9Oi
zI-*K!8aFv)Q<fx6rDRGlpdz*cSKY~atg^$68U5s8z(Qg1(5n7`EQ69klIvIUJ-s|o
zZR?i7i7h7gi3LGfBPj68QRk;0p}u7AiBit{%T}#(lG0mSH51<OpPIAY;k1{wvF3KM
z#r+|i;D=X5G(K<~5^38PgOGI@g=%*{hLy1HTe&+oj;%Iz9M%qJGslX{d3Mh19i=a;
z59gjP<%u|>Hjr<%=*w62vKd}z)MY<v#4{^xYhH;TUf{}|wlqRFic+0{gcXjE(<%qO
zb-p>b$~3U!+dRI3k|lSDrW6Bt(?P5AG)wHNj}MJImWmC!E%OXc(Ej<<Efgwgo4HEH
zR0oa;8-nBDL5;8h1Af26LCsLh3m{CP(!Bb4t;?vV|Li4I`}r`;@aIw<nAv9};VRo+
zL{-y-`lL!Ok5ybPuf8Z&cy3hKa6|U6*6P_*?;8*K^D|pG-Fu#skZf{OMa2^A#(HZA
z1C3O*;FhI!+Sn>t?Aw|CYOfW_rP){ZL(hR@IIg8KY^Nu4n)7kowq2gKbqr%s0s$oC
z1?*nGGDS9<Ii-$)7Ax`tnJ%4p#-V|SMu=Xv&g^})uy?n2@HumoLI)<FCfZ3PQa$en
zwI=;wN3bjnzHPG{e%(-Xm>`$xu)Wh|SDgCrfCx$iSRmM|i^N@EhxjZ7EOs4D-_Ho;
zyZE{nI;Wor<1m|d;>UcE*akMI2dupqkqzrH{*_q#8BfFX=v;CsKo7hU@*)MBTfg0~
zO!Spx5D#&o8MHUj)zcfZdG~#Z=mibS5ztyktbNpKZL?B;=?R16H|@E)xONR(aQS4|
ztOBn^)AVxhcjB22TkYZ4o|$y_X$5^@av+#--Aoy@y29u^_r}G5OZ(H^b{?N4?dYrX
zYrGDd>(yxPDom2i@XKQUwyD0}{06GCw_FjlA%TScGtgOUzYR8Mu0dkQqFx?latjAP
zr@{5^m8HhlmPKw_h7TRrh;MN3gP-6$#@dn@fl*m9uReXB@$Bd=Fa{qz_|5B{zNmN0
zXq<$J6&3H{!!+X-Cp=h?M$TNou3_^LRnXXUlagNJ7qcd+hVXSgtU8D<BMTP!d7ksZ
zd4NFOcvh|R=!u!|ScQBuQ$%w8YTEL6QQrCD*LWGfT;0VGm%ve0wu9nL6^R8S!d=?r
z8UaoNLr+r1$mZu6O$#Tg?G{Hi@V3G2Ka!bO(7~3wr+s8&gCzZP9DxLAvu-J^;FD*^
zO?EMkY7$+~r_cBTWvp_da1uf-&W@JPP<lGMO9}}7mQY#$E1ue!yi_ziw`Te0H_dv_
zD=prO{XnViGpPuIy<YW$Hon{!i&=9b>r?dYRa+9J!LPk3UlNW4dOj`e4Z`n$Ar)z+
zSQjK58Syq9j$#?woIAbZVguttapcawESK7^LS|O97&)}@s|AtFH8FBzF<vD&x%j|n
zvKMdPW>)vI6S!XR-Hlmh&K1Bi3y=MR)4d$b^-OHbdd2YRT6|VfXHNG%-fo{Q65D!<
z1{n`0Qxu+ix4!EcyxP%~;Duz<E2b9J&pzOOAOjcQy;m|stN0DlfSZ72YfyCYN=|SA
zI^@e%m<S%8_nfj5gCn1P=08hhW@0Fr|AAjkDZ$ov|Hb<ctzl^<Msu;i7n_k+I7W<m
zGErh(O))s-1KKr{HEn%j__5QS_);Dl1vnmu^q35C%Pyf*8s16@k32^_v#KM|j|IL@
zs)VMnH?Ql_z)}xDnJ3YTlhcYZ0fo@#&aneykH|60Z_5y^46$Ismpb^1?#8l3SM?@!
z$qag=P}eDE5pqv(7nA@nft|FZjE`9(L(;Jnw_#*|+*0I^rtbFgvCn$BJl4Zfo4=96
z&_W0$&F@n)e64?my0f~uUTuL>z{{jivOX<sM<iu2dJJ!eox1<h<_Jgli)gti_dANX
zTaffu&1XG$Gla0Go#ghne6h8@6=+SAL>0{meP398_f8Q_nFp1-1x0_Qo32^|o*Pe&
zbM#CfVE}|9al&n|I`T__7ZY{ns2PLdn)=f%&2Qj%0i)i=ErQ&O5VJkjP;G3}ksIJW
z<p{>{kzzOis-tFTM^1iwle-Xi-MgVsn`*z{haM5GF;9ar1zIHj+#*IToB96jchczA
z(rZG@SUGzFoAsN1pYd3GZIkM+Nzo|mcc;p}>}(uqNtO?f^T(4Kl1#rTRu#E@@4H0f
z)O$zB4djby;8==@su!mxJLB&|bF!S(*!>IJ?1)6zVp`6!BTa>3C$pt@!tuqh)@1;5
zI_p}$l78`!&zcYklNlx`Pjki#fONZrH-7W;2rfT^?!mJUDcwSPZ^Rvuifozri8{`8
z(L?D4WlRe=z#Ut{4RU$65SZ+<iy9@;yLyFDU!NcfwwQ`Phd117ZU8W+H%pd`lOwaT
z1E2PIh^rOhzuNSb2CjRn{c>%cRsM<}B8~SFa=_Hv7;;?<zyo-K*0p)5%Zh&g<5pME
KQLa?94f`JmSnU-6

literal 0
HcmV?d00001