From 725511c4f9bbc5a4839a1e60d7f9c345da65722c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Fri, 17 May 2024 09:30:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/homepage/homepage.vue                   |   9 +-
 pages/medicalservice/medicalservice.vue       |  29 +++--
 .../Prescriptionrecords.vue                   | 115 ++++++++++++++----
 3 files changed, 110 insertions(+), 43 deletions(-)

diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 3e63c65..ed34f57 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -231,17 +231,12 @@
 				})
 			},
 			// 登录
-			login() {
-				uni.navigateTo({
-					url: "/pagesB/login/login"
-				})
-			},
 			gologin() {
 				this.$refs.uToast.show({
-					title: '您未登录,请先登录',
+					title: '您未登录,请前往我的页面进行登录',
 					type: 'error',
 					duration: '1000',
-					url: '/pagesB/login/login'
+					// url: '/pagesB/login/login'
 				})
 			},
 			// 家医功能提示
diff --git a/pages/medicalservice/medicalservice.vue b/pages/medicalservice/medicalservice.vue
index 3112e2a..c383ade 100644
--- a/pages/medicalservice/medicalservice.vue
+++ b/pages/medicalservice/medicalservice.vue
@@ -129,10 +129,10 @@
 					})
 				} else {
 					this.$refs.uToast.show({
-						title: '您未登录,请先登录',
+						title: '您未登录,请前往我的页面进行登录',
 						type: 'error',
 						duration: '1000',
-						url: '/pagesB/login/login'
+						// url: '/pagesB/login/login'
 					})
 				}
 			},
@@ -161,13 +161,12 @@
 						})
 					} else {
 						this.$refs.uToast.show({
-							title: '您未登录,请先登录',
+							title: '您未登录,请前往我的页面进行登录',
 							type: 'error',
 							duration: '1000',
-							url: '/pagesB/login/login'
+							// url: '/pagesB/login/login'
 						})
 					}
-
 				}, 0)
 			},
 			//跳转护理站页面
@@ -182,10 +181,10 @@
 						})
 					} else {
 						this.$refs.uToast.show({
-							title: '您未登录,请先登录',
+							title: '您未登录,请前往我的页面进行登录',
 							type: 'error',
 							duration: '1000',
-							url: '/pagesB/login/login'
+							// url: '/pagesB/login/login'
 						})
 					}
 				}, 0)
@@ -200,10 +199,10 @@
 					})
 				} else {
 					this.$refs.uToast.show({
-						title: '您未登录,请先登录',
+						title: '您未登录,请前往我的页面进行登录',
 						type: 'error',
 						duration: '1000',
-						url: '/pagesB/login/login'
+						// url: '/pagesB/login/login'
 					})
 				}
 			},
@@ -219,10 +218,10 @@
 						})
 					} else {
 						this.$refs.uToast.show({
-							title: '您未登录,请先登录',
+							title: '您未登录,请前往我的页面进行登录',
 							type: 'error',
 							duration: '1000',
-							url: '/pagesB/login/login'
+							// url: '/pagesB/login/login'
 						})
 					}
 				}, 50)
@@ -238,10 +237,10 @@
 						})
 					} else {
 						this.$refs.uToast.show({
-							title: '您未登录,请先登录',
+							title: '您未登录,请前往我的页面进行登录',
 							type: 'error',
 							duration: '1000',
-							url: '/pagesB/login/login'
+							// url: '/pagesB/login/login'
 						})
 					}
 				}, 0)
@@ -258,10 +257,10 @@
 						})
 					} else {
 						this.$refs.uToast.show({
-							title: '您未登录,请先登录',
+							title: '您未登录,请前往我的页面进行登录',
 							type: 'error',
 							duration: '1000',
-							url: '/pagesB/login/login'
+							// url: '/pagesB/login/login'
 						})
 					}
 				}, 0)
diff --git a/pagesB/Prescriptionrecords/Prescriptionrecords.vue b/pagesB/Prescriptionrecords/Prescriptionrecords.vue
index c32e40d..87e182e 100644
--- a/pagesB/Prescriptionrecords/Prescriptionrecords.vue
+++ b/pagesB/Prescriptionrecords/Prescriptionrecords.vue
@@ -15,23 +15,70 @@
 			</view>
 			<view class="right">
 				<u-collapse :item-style="itemStyle" :arrow="false" :accordion='false'>
-					<u-collapse-item :title="item.tempName" v-for="(item, index) in itemList.ptList" :open="item.open"
+					<u-collapse-item :title="item.tempName" v-for="(item, index) in itemList" :open="item.open"
 						:key="index" @change='tapcollapse(item)' :class="item.check?'headcollapse':''">
-						<view class="itemtext">
-							<view class="collapse_top" v-for="uitem in item.ptValList">
-								<u-icon name="star-fill" color="#000" size="28"
-									v-if="uitem.itemType=='1' || uitem.itemType=='2' ||uitem.itemType=='3'"></u-icon>
-								<span style="margin-left: 10rpx;" v-if="uitem.itemType=='1'">健康生活方式 </span>
-								<span style="margin-left: 10rpx;" v-if="uitem.itemType=='2'">治疗与康复</span>
-								<span style="margin-left: 10rpx;" v-if="uitem.itemType=='3'">急症处理</span>
-								<view class="itemsdata">
-									<view class="itemword" v-if="uitem.val=='true'">
-										<u-checkbox active-color="#26A888" v-model="checked" disabled>
-											{{uitem.content}}</u-checkbox>
+						<view class="" v-if="item.onelist">
+							<view class="uitemtitle">健康生活方式</view>
+							<view class="itemtext" v-for="(uitem,uindex) in item.onelist" :key="uindex">
+								<view class="collapse_top">
+									<view class="itemsdata">
+										<view class="itemword">
+											<u-checkbox active-color="#26A888" v-model="uitem.val" disabled>
+												<view class="checkboxtitle">
+													{{ uitem.content }}
+												</view>
+												<view v-if="uitem.ptValList">
+													<view class="checkboxtext" v-for="bitem in uitem.ptValList"
+														:key="bitem.id">
+														{{ bitem.content }}
+													</view>
+												</view>
+											</u-checkbox>
+										</view>
 									</view>
-									<view class="itemword" v-if="uitem.val==null || uitem.val=='false'">
-										<u-checkbox active-color="#26A888" disabled
-											v-model="checkedfalse">{{uitem.content}}</u-checkbox>
+								</view>
+							</view>
+						</view>
+						<view class="" v-if="item.twolist">
+							<view class="uitemtitle">治疗与康复</view>
+							<view class="itemtext" v-for="(uitem,uindex) in item.twolist" :key="uindex">
+								<view class="collapse_top">
+									<view class="itemsdata">
+										<view class="itemword">
+											<u-checkbox active-color="#26A888" v-model="uitem.val" disabled>
+												<view class="checkboxtitle">
+													{{ uitem.content }}
+												</view>
+												<view v-if="uitem.ptValList">
+													<view class="checkboxtext" v-for="bitem in uitem.ptValList"
+														:key="bitem.id">
+														{{ bitem.content }}
+													</view>
+												</view>
+											</u-checkbox>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="" v-if="item.threelist">
+							<view class="uitemtitle">急症处理</view>
+							<view class="itemtext" v-for="(uitem,uindex) in item.threelist" :key="uindex">
+								<view class="collapse_top">
+									<view class="itemsdata">
+										<view class="itemword">
+											<u-checkbox active-color="#26A888" v-model="uitem.val" disabled>
+												<view class="checkboxtitle">
+													{{ uitem.content }}
+												</view>
+												<view v-if="uitem.ptValList">
+													<view class="checkboxtext" v-for="bitem in uitem.ptValList"
+														:key="bitem.id">
+														{{ bitem.content }}
+													</view>
+												</view>
+											</u-checkbox>
+										</view>
 									</view>
 								</view>
 							</view>
@@ -53,8 +100,6 @@
 		data() {
 			return {
 				show: true,
-				checked: true,
-				checkedfalse: false,
 				lastrecodedata: null,
 				cardNo: '',
 				itemlistleft: [],
@@ -85,9 +130,17 @@
 						res.data && res.data[0].list.length > 0 ? this.recordCode = res.data[0].list[0]
 							.recordCode : ''
 						detail(this.recordCode).then(res => {
-							this.itemList = res.data
-							this.itemList && this.itemList.ptList.length > 0 ? this.itemList.ptList[0]
+							res.data && res.data.ptList && res.data.ptList.length > 0 ? res.data.ptList[0]
 								.open = true : ''
+							res.data.ptList.forEach(e => {
+								e.ptValList.forEach(el => {
+									el.val == "true" ? el.val = true : el.val = false
+								})
+								e.onelist = e.ptValList.filter(el => el.itemType == '1')
+								e.twolist = e.ptValList.filter(el => el.itemType == '2')
+								e.threelist = e.ptValList.filter(el => el.itemType == '3')
+							})
+							this.itemList = res.data.ptList
 							this.show = false
 						})
 					})
@@ -119,6 +172,18 @@
 		background-color: #fff;
 	}
 
+	.checkboxtitle {
+		font-size: 24rpx;
+		margin-bottom: 10rpx;
+		font-weight: 600;
+	}
+
+	.checkboxtext {
+		font-weight: 550;
+		font-size: 20rpx;
+		padding-left: 20rpx;
+	}
+
 	.app {
 		// height: 100vh;
 		padding: 32rpx 10rpx;
@@ -221,16 +286,24 @@
 					color: #fff;
 				}
 
+				.uitemtitle {
+					font-weight: 600;
+					font-size: 28rpx;
+					color: #000;
+					margin-top: 15rpx;
+					padding-left: 30rpx;
+				}
+
 				// background-color: red;
 				.itemtext {
 					.collapse_top {
-						font-size: 30rpx;
+						font-size: 22rpx;
 						font-weight: 500;
 						color: #000;
 						width: 94%;
 						line-height: 40rpx;
 						margin: 0 auto;
-						padding: 20rpx 20rpx;
+						padding: 10rpx;
 
 						.itemsdata {
 							width: 100%;