From 4b2ec5736ba92fe9a01fae120451576dbd257d11 Mon Sep 17 00:00:00 2001
From: yanzai <boy_yan@163.com>
Date: Wed, 3 Apr 2024 10:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=20=E9=9A=90=E7=A7=81=E5=8D=8F=E8=AE=AE=EF=BC=8C=E6=9C=AA?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E4=B8=8D=E8=8E=B7=E5=8F=96=E4=BD=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改人员不能删除的问题
---
 admin/src/pages/order/order.vue             |  6 ++--
 思信体检小程序/lu/hospital.js               | 10 +++++--
 思信体检小程序/pages/main/home/home.vue     |  8 ++---
 思信体检小程序/pages/user/edit/edit.vue     | 33 +++++++++++++++++++--
 思信体检小程序/pages/user/person/person.vue |  4 +++
 5 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/admin/src/pages/order/order.vue b/admin/src/pages/order/order.vue
index 3c10158..b0fc826 100644
--- a/admin/src/pages/order/order.vue
+++ b/admin/src/pages/order/order.vue
@@ -344,9 +344,11 @@ const user_order_columns = [{
       ]),
       h('div', null, [
         h('b', '各方应收: '),
-        //h('span', !!row.appointment_number ? row.appointment_number : '-'),
 		h('div',  !!s_info ? s_info.map((item) => {
-		  return item.account + ' ￥'+(item.amount/100)
+			if(item.account!='代理'){
+				 return item.account + ' ￥'+(item.amount/100)  
+			}
+		 
 		}).join('\r\n') : ''),
       ]),
       h('div', null, [
diff --git a/思信体检小程序/lu/hospital.js b/思信体检小程序/lu/hospital.js
index 6e5bd8f..89f7fd1 100644
--- a/思信体检小程序/lu/hospital.js
+++ b/思信体检小程序/lu/hospital.js
@@ -25,7 +25,13 @@ const HospitalInfo = async (latitude, longitude, cb) => {
 		cb(response.data.info)
 	})
 }
-const hospital = (cb = () => {}) => {
-	getFuzzyLocation(cb)
+const hospital = (cb = () => {},status=false) => {
+	if(status){
+		getFuzzyLocation(cb)
+	}else{
+		HospitalInfo(26.536252, 101.715271, cb)
+	}
+		
+	 
 }
 export default hospital
\ No newline at end of file
diff --git a/思信体检小程序/pages/main/home/home.vue b/思信体检小程序/pages/main/home/home.vue
index 219ef24..04f55cc 100644
--- a/思信体检小程序/pages/main/home/home.vue
+++ b/思信体检小程序/pages/main/home/home.vue
@@ -51,9 +51,9 @@
 			}
 		})
 	}
-
+	
 	const hospital_info = ref(false)
-	const getHospitalInfo = () => {
+	const getHospitalInfo = (status=false) => {
 		uni.$lu.hospital((info) => {
 			hospital_info.value = info
 			uni.setNavigationBarTitle({
@@ -63,7 +63,7 @@
 			CarouselList(2)
 			CarouselList(3)
 			CarouselList(4)
-		})
+		},status)
 	}
 	const choose_type_show = ref(false)
 	const setOrderChooseTypeFunc = () => {
@@ -154,7 +154,7 @@
 	}
 
 	const loginCallback = () => {
-		getHospitalInfo()
+		getHospitalInfo(true)
 		getUserInfo()
 	}
 
diff --git a/思信体检小程序/pages/user/edit/edit.vue b/思信体检小程序/pages/user/edit/edit.vue
index 5757418..5a74de5 100644
--- a/思信体检小程序/pages/user/edit/edit.vue
+++ b/思信体检小程序/pages/user/edit/edit.vue
@@ -198,6 +198,13 @@
 	}
 
 	const saveClick = async () => {
+		if(tongyi.value!='tongyi'){
+							uni.showToast({
+							         title: "请阅读并同意用户协议",
+							         icon:'none'
+							       })
+								   return false;
+						}
 		const response = !user_person_info.value.id ?
 			await UserPersonCreateAction(user_person_info.value) :
 			await UserPersonUpdateAction(user_person_info.value)
@@ -207,6 +214,10 @@
 			})
 		})
 	}
+	let tongyi=ref(false)
+			const tongyiclick=(e)=>{
+				tongyi.value=e.detail.value 
+			}
 </script>
 <template>
 	<view>
@@ -284,13 +295,29 @@
 			</view>
 		</view>
 		<view class="break_block_wrapper"></view>
-		<view @click="readmeClick()" class="readme_wrapper">添加或修改体检人信息</view>
+		<!-- <view @click="readmeClick()" class="readme_wrapper">添加或修改体检人信息</view>
 		<view @click="readmeClick()" class="readme_wrapper">
 			即代表您已同意
 			<text class="blue_text_wrapper">《用户服务协议》</text>
 			和
 			<text class="blue_text_wrapper">《隐私协议》</text>
-		</view>
+		</view> -->
+		<view style="display: flex; padding-left: 30rpx; align-items: center;">
+							<view>
+								<checkbox-group @change="tongyiclick">
+									<label>
+										<checkbox value="tongyi" />已阅读并同意
+									</label>
+									 
+								</checkbox-group>
+							</view>
+							<view @click="readmeClick()" class="readme_wrapper">
+				
+								<text class="blue_text_wrapper">《用户服务协议》</text>
+								和
+								<text class="blue_text_wrapper">《隐私协议》</text>
+							</view>
+						</view>
 		<view @click="saveClick()" class="add_button_wrapper">保存</view>
 		<view class="blank_wrapper"></view>
 	</view>
@@ -311,7 +338,7 @@
 	.readme_wrapper {
 		font-size: 26rpx;
 		line-height: 50rpx;
-		margin-left: 30rpx;
+		margin-left: -10rpx;
 	}
 
 	.blue_text_wrapper {
diff --git a/思信体检小程序/pages/user/person/person.vue b/思信体检小程序/pages/user/person/person.vue
index 3e43377..fccc48e 100644
--- a/思信体检小程序/pages/user/person/person.vue
+++ b/思信体检小程序/pages/user/person/person.vue
@@ -94,6 +94,10 @@
 	  	UserPersonList()
 	  })
 	}
+	const delPersonClick = (id) => {
+		delete_active.value = id
+		del_show.value = true
+	}
 </script>
 <template>
 	<view>