From 162a2866c6c05df59c8e1fa8f957911b3edc95d0 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Mon, 16 Oct 2023 16:03:32 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E8=AF=84=E4=BB=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/myinformation/myinformation.scss        |  19 +-
 pages/myinformation/myinformation.vue         |  11 +-
 pagesB/SelectItem/SelectItem.vue              |   4 +-
 .../Serviceevaluation/Serviceevaluation.vue   | 260 ++++++++++++++++++
 static/pagesB/updata.png                      | Bin 0 -> 4308 bytes
 5 files changed, 280 insertions(+), 14 deletions(-)
 create mode 100644 pagesB/Serviceevaluation/Serviceevaluation.vue
 create mode 100644 static/pagesB/updata.png

diff --git a/pages/myinformation/myinformation.scss b/pages/myinformation/myinformation.scss
index c4d88a0..8cf9bdd 100644
--- a/pages/myinformation/myinformation.scss
+++ b/pages/myinformation/myinformation.scss
@@ -1,10 +1,9 @@
 .app {
 	background: #ffffff;
-	
 		.titles {
 			height: 80rpx;
 		}
-		
+
 		.mask {
 		  position: fixed;
 		  bottom: 0;
@@ -14,27 +13,27 @@
 		  background-color: #6A6A6A;
 		  text-align: center;
 		  line-height: 68rpx;
-		
+
 		  .masktext {}
-		
+
 		  .maskcontent {
 		    position: absolute;
 		    width: 100%;
 		    bottom: 120rpx;
 		  }
-		
+
 		  .add {
 		    width: 80%;
 		    height: 68rpx;
 		    background-color: #ffffff;
 		    border-radius: 10rpx;
-		    border: solid 1rpx #60cee3;
+		    border: solid 1rpx #26A888;
 		    position: absolute;
-		    color: #60cee3;
+		    color: #26A888;
 		    bottom: 50rpx;
 		    left: 10%;
 		  }
-		
+
 		  .p2 {
 		    left: 10%;
 		    width: 80%;
@@ -46,7 +45,7 @@
 		    margin: 0 auto;
 		    margin-bottom: 30rpx;
 		  }
-		
+
 		  .p1 {
 		    opacity: 1;
 		    color: #ffffff;
@@ -220,4 +219,4 @@
 				height: 100%;
 			}
 		}
-	}
\ No newline at end of file
+	}
diff --git a/pages/myinformation/myinformation.vue b/pages/myinformation/myinformation.vue
index 5836f51..ed7e0ed 100644
--- a/pages/myinformation/myinformation.vue
+++ b/pages/myinformation/myinformation.vue
@@ -109,7 +109,7 @@
 						我的预约
 					</view>
 				</view>
-				<view class="item">
+				<view class="item" @tap="evaluation">
 					<image src="../../static/pages/fuwupingjia.png" mode=""></image>
 					<view class="text">
 						服务评价
@@ -304,6 +304,13 @@
 					this.gologin();
 				}
 			},
+			// 服务评价
+			evaluation(){
+				uni.navigateTo({
+					url: '/pagesB/Serviceevaluation/Serviceevaluation'
+				})
+				
+			},
 			//去登陆
 			gologin() {
 				this.$refs.uToast.show({
@@ -472,4 +479,4 @@
 
 <style lang="scss">
 	@import './myinformation.scss'
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesB/SelectItem/SelectItem.vue b/pagesB/SelectItem/SelectItem.vue
index 4bbebb5..9a0a309 100644
--- a/pagesB/SelectItem/SelectItem.vue
+++ b/pagesB/SelectItem/SelectItem.vue
@@ -1,9 +1,9 @@
 <template>
 	<view class="app">
-		<view class="content" v-for="(item,index) in prejectlist">
+		<view class="content" v-for="(item,index) in prejectlist" @tap="result(item)">
 			<view class="big">{{item.projectName}}
 			</view>
-			<view class="servename" @tap="result(item)">
+			<view class="servename">
 				查看筛查结果
 			</view>
 		</view>
diff --git a/pagesB/Serviceevaluation/Serviceevaluation.vue b/pagesB/Serviceevaluation/Serviceevaluation.vue
new file mode 100644
index 0000000..561cd0a
--- /dev/null
+++ b/pagesB/Serviceevaluation/Serviceevaluation.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="app">
+		<view class="myorder titles" @tap="expertOrder">
+			<view class="title">
+				<image src="../../static/pagesB/updata.png" mode=""></image>
+				我的评价
+			</view>
+			<view class="righttitle">
+				<image src="../../static/huijiantou.png" mode=""></image>
+			</view>
+		</view>
+		<view class="orderitem">
+			<view class="tiemitem">
+				<span>孤注一掷</span>
+			</view>
+			<view class="details">
+				<image src="../../static/headsculpture.png" mode=""></image>
+				<view class="ppointment">
+					<view class="doctorname">
+						<span>齐鲁医院张先生</span><span>￥30</span>
+					</view>
+					<view class="reservation">
+						评价时间：2023-09-08
+					</view>
+			
+				</view>
+			</view>
+			<view class="bottom">
+			<span @tap="rate()">评价</span>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			//评价
+			rate(item) {
+				uni.navigateTo({
+					url: `/pagesB/goodsorderRate/goodsorderRate?item=${JSON.stringify(item)}&delta=${1}`
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.app{
+		height: 100vh;
+		background-color: #F7F5F5;
+		padding: 30rpx 0 0 0;
+		overflow: scroll;
+		.myorder {
+			position: relative;
+			background: #fff;
+			    height: 73rpx;
+				    width: 96%;
+				    left: 50%;
+				    transform: translateX(-50%);
+		
+			.orderStatus {
+				text-align: center;
+				margin: 60rpx auto 30rpx;
+				width: 90%;
+				display: flex;
+				justify-content: space-around;
+				padding-bottom: 30rpx;
+		
+				.item {
+					width: 25%;
+		
+					.text {
+						font-size: 26rpx;
+						color: #333333;
+						margin-top: 10rpx;
+					}
+		
+					image {
+						width: 70rpx;
+						height: 60rpx;
+					}
+				}
+			}
+		
+			.righttitle {
+				font-size: 26rpx;
+				color: #969494;
+				position: absolute;
+				    position: absolute;
+				    top: 50%;
+				    transform: translateY(-50%);
+					    right: 30rpx;
+		
+				image {
+					vertical-align: middle;
+					padding-left: 20rpx;
+					width: 13rpx;
+					height: 23rpx;
+					display: inline-block;
+				}
+			}
+		
+			.title {
+				margin-left: 30rpx;
+				font-size: 32rpx;
+				color: #4B4B4B;
+				    position: absolute;
+				    top: 50%;
+				    transform: translateY(-50%);
+					image{
+						    /* vertical-align: middle; */
+						    /* padding-left: 20rpx; */
+						    width: 32rpx;
+						    height: 32rpx;
+						    /* display: inline-block; */
+						    /* margin-top: 11rpx; */
+						    margin-right: 20rpx;
+						    position: relative;
+						    top: 7rpx;
+						
+					}
+			}
+		}
+		.orderitem {
+			width: 96%;
+			height: 383rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+			border-radius: 5rpx;
+			margin: 20rpx auto;
+			position: relative;
+			margin-bottom: 20rpx;
+		
+			.tiemitem {
+				width: 92%;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+				font-weight: 400;
+				color: #000000;
+				position: absolute;
+				// background: red;
+				left: 35rpx;
+				top: 30rpx;
+		
+				span:nth-child(2) {
+					margin-left: 20rpx;
+				}
+		
+				span:nth-child(3) {
+					display: inline-block;
+					position: absolute;
+					right: 0;
+					font-weight: 500;
+					color: #26A888;
+				}
+			}
+		
+			.details {
+				width: 96%;
+				height: 200rpx;
+				// background-color: #26A888;
+				position: absolute;
+				top: 97rpx;
+				left: 50%;
+				transform: translateX(-50%);
+		
+				image {
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: 5rpx;
+					position: absolute;
+				}
+		
+				.ppointment {
+					// background: red;
+					position: absolute;
+					width: 71%;
+					height: 100%;
+					right: 0;
+		
+					.doctorname {
+						font-family: Source Han Sans CN;
+						font-weight: 600;
+						color: #333333;
+		
+						span:nth-child(1) {
+							font-size: 28rpx;
+						}
+		
+						span:nth-child(2) {
+							display: inline-block;
+							position: absolute;
+							font-size: 28rpx;
+							right: 0;
+							font-family: Source Han Sans CN;
+							font-weight: 500;
+							color: #333333;
+						}
+					}
+		
+					.reservation {
+						font-size: 28rpx;
+						font-family: Source Han Sans CN;
+						font-weight: 400;
+						color: #959595;
+						position: absolute;
+						top: 24%;
+		
+		
+					}
+				}
+			}
+		
+			.bottom {
+				position: absolute;
+				width: 96%;
+				height: 20%;
+				bottom: 4%;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN;
+		
+		// 		span:nth-child(1) {
+		// 			position: absolute;
+		// 			font-weight: 400;
+		// 			color: #959595;
+		// 			top: 50%;
+		// 			transform: translateY(-50%);
+		// 			left: 5%;
+		
+		// 		}
+		
+				span:nth-child(1) {
+					line-height: 30px;
+					width: 169rpx;
+					height: 61rpx;
+					background: #26A888;
+					border-radius: 5rpx;
+					display: inline-block;
+					font-size: 28rpx;
+					font-weight: 400;
+					color: #FFFFFF;
+					position: absolute;
+					right: 0;
+					top: 50%;
+					transform: translateY(-50%);
+					text-align: center;
+				}
+			}
+		
+		}
+	}
+
+</style>
diff --git a/static/pagesB/updata.png b/static/pagesB/updata.png
new file mode 100644
index 0000000000000000000000000000000000000000..00512dbc1e450dbbdf5dc0798db5e4ca692d5e2c
GIT binary patch
literal 4308
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
ZNY$8{!RA>7;BN}R%EBJ|*xV=SzW|-@#i#%P

literal 0
HcmV?d00001


From 2eb4ced61f26f8aeae07f2db58e5aa5bdc458d64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 17 Oct 2023 09:41:12 +0800
Subject: [PATCH 2/4] =?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 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pages/homepage/homepage.vue b/pages/homepage/homepage.vue
index 057d90c..601e122 100644
--- a/pages/homepage/homepage.vue
+++ b/pages/homepage/homepage.vue
@@ -89,7 +89,7 @@
 			this.patientName = this.userinfo.patientName
 			if (this.userinfo) {
 				checkSignApply(this.userinfo.cardNo).then(res => {
-					if (res.code != 0) {
+					if (res.data.code != 0) {
 						this.checkSign = true
 					} else {
 						this.checkSign = false
@@ -114,7 +114,6 @@
 			},
 			// 家医签约
 			goonline() {
-				console.log(!this.userinfo)
 				if (!this.userinfo) {
 					this.gologin();
 				} else {

From 8019af3ce3a4cffdfd251da865045b46bc1e1b0f Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 17 Oct 2023 10:59:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E7=AD=BE=E7=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesC/Onlinesigning/Onlinesigning.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue
index 8e766bc..cdb48ca 100644
--- a/pagesC/Onlinesigning/Onlinesigning.vue
+++ b/pagesC/Onlinesigning/Onlinesigning.vue
@@ -277,7 +277,11 @@
 						this.query.gender = 99
 					}
 				}
-				this.protocolshow = true
+				if (this.query.residentAutographPath) {
+					this.updata();
+				} else {
+					this.protocolshow = true
+				}
 			},
 			updata() {
 				if (this.radio == 2) {
@@ -511,7 +515,8 @@
 			},
 			//接收拍照或签名
 			residentAutographPath(data) {
-				this.query.residentAutographPath = data
+				this.query.residentAutographPath = data.residentAutographPath
+				this.protocolshow = false
 			},
 		},
 		onLoad(options) {

From bb428bdcf5da82984042a85c1255f777ec279f5e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=BE=89?= <814457906@qq.com>
Date: Tue, 17 Oct 2023 11:02:14 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/pagesB/confirmation/index.js           |  11 ++
 pagesB/appointmenttime/appointmenttime.vue |   4 +-
 pagesB/confirmation/confirmation.scss      |  44 +++----
 pagesB/confirmation/confirmation.vue       | 133 ++++++++++-----------
 pagesB/medicine/medicine.vue               |   2 +-
 pagesC/Onlinesigning/Onlinesigning.vue     |   4 +
 6 files changed, 96 insertions(+), 102 deletions(-)
 create mode 100644 api/pagesB/confirmation/index.js

diff --git a/api/pagesB/confirmation/index.js b/api/pagesB/confirmation/index.js
new file mode 100644
index 0000000..0ac681b
--- /dev/null
+++ b/api/pagesB/confirmation/index.js
@@ -0,0 +1,11 @@
+import request from "../../request.js"
+
+export function getListByDoctor(doctorId) {
+	return request({
+		url: `/nurseApplet/schedule/plan/getListByDoctor?doctorId=${doctorId}`,
+		method: 'get',
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
+	})
+}
\ No newline at end of file
diff --git a/pagesB/appointmenttime/appointmenttime.vue b/pagesB/appointmenttime/appointmenttime.vue
index f4f636b..3e925fa 100644
--- a/pagesB/appointmenttime/appointmenttime.vue
+++ b/pagesB/appointmenttime/appointmenttime.vue
@@ -192,7 +192,6 @@
 		onShow() {
 			let that = this
 			uni.$on('updata', function(data) {
-				console.log(data.updata,'9')
 				if (data.updata) {
 					that.orderlist = JSON.parse(data.updata)
 				}
@@ -207,7 +206,6 @@
 			})
 		},
 		onLoad(options) {
-			console.log(options,'89')
 			var that = this
 			const value = uni.getStorageSync('openid');
 			if (value) {
@@ -487,4 +485,4 @@
 </script>
 <style lang="scss">
 	@import './appointmenttime.scss'
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesB/confirmation/confirmation.scss b/pagesB/confirmation/confirmation.scss
index f2409c2..eebed28 100644
--- a/pagesB/confirmation/confirmation.scss
+++ b/pagesB/confirmation/confirmation.scss
@@ -79,11 +79,21 @@
 			}
 
 			.textarea {
-				font-size: 18rpx;
+				font-size: 22rpx;
 				font-weight: 400;
 				color: #8E8E8E;
 				line-height: 42rpx;
-				padding: 30rpx 0 0 40rpx;
+				margin: 30rpx 40rpx 0 40rpx;
+				padding: 30rpx;
+				height: 250rpx;
+				background: #FFFFFF;
+				border: 2rpx solid #26A888;
+				border-radius: 5rpx;
+				.title{
+					font-weight: 500;
+					color: #EE8F15;
+					margin-bottom: 20rpx;
+				}
 			}
 
 			.text {
@@ -91,6 +101,12 @@
 				font-weight: 400;
 				color: #333333;
 				padding: 30rpx 0 0 40rpx;
+				text{
+					padding-left: 20rpx;
+					font-size: 20rpx;
+					font-weight: 400;
+					color: #8E8E8E;
+				}
 			}
 
 			::v-deep .u-upload {
@@ -151,28 +167,4 @@
 				}
 			}
 		}
-
-		.title {
-			width: 100%;
-			padding: 10rpx 0 10rpx 35rpx;
-
-			.left {
-				vertical-align: middle;
-				display: inline-block;
-				width: 10rpx;
-				height: 30rpx;
-				background: #26A888;
-				border-radius: 1rpx;
-			}
-
-			.right {
-				vertical-align: middle;
-				display: inline-block;
-				font-size: 30rpx;
-				font-weight: 500;
-				color: #26A888;
-				line-height: 30rpx;
-				margin-left: 20rpx;
-			}
-		}
 	}
diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue
index 3c64851..5b2a0e5 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -1,12 +1,5 @@
 <template>
 	<view class="app">
-		<view class="title">
-			<view class="left">
-			</view>
-			<view class="right">
-				第一步：填写个人信息
-			</view>
-		</view>
 		<view class="item">
 			<view class="text">
 				现住址所在区
@@ -40,22 +33,11 @@
 					placeholder-class="phsy" />
 			</view>
 			<view class="text">
-				选择医生
+				预约时间
+				<text>请选择时间</text>
 			</view>
-			<view class="select" @tap='gochoosedoctor'>
-				<text v-if="formdata.doctorName" style="font-size: 26rpx;color: #303133;">{{formdata.doctorName}}</text>
-				<text v-else>请选择医生</text>
-				<image src="../../static/huijiantou.png" mode=""></image>
-			</view>
-		</view>
-		<view class="title">
-			<view class="left">
-			</view>
-			<view class="right">
-				第二步：填写问诊信息
-			</view>
-		</view>
-		<view class="item">
+			<tabs :list="appointmentTimeList" :current="timecurrent" @change="timechange" active-color="#26A888">
+			</tabs>
 			<view class="text">
 				问题简述
 			</view>
@@ -84,29 +66,24 @@
 				<u-input v-model="formdata.medicalRecord" class="uinput noimageuinput" placeholder=" " type="textarea"
 					:maxlength="100" />
 			</view>
-		</view>
-		<view class="title">
-			<view class="left">
-			</view>
-			<view class="right">
-				第三步：上传附件文件
-			</view>
-		</view>
-		<view class="item">
 			<view class="text">
-				附件材料上传
+				上传检查单/患处照片
+				<text>（最多8张）</text>
 			</view>
 			<u-upload ref="uUpload" :max-count='9' :action="uoloadaction" :auto-upload="false" upload-text=' '
 				@on-choose-complete='onchoosecomplete' @on-success='onsuccess' @on-uploaded='onuploaded'></u-upload>
 			<view class="textarea">
-				<view class="">
-					最多支持9个文件；
+				<view class="title">
+					温馨提示：
 				</view>
 				<view class="">
-					单个文件大小不允许超过10MB；
+					1.下单后24h内我们会和您确认具体时间点
 				</view>
 				<view class="">
-					只支持上传照片图片、视频文件，后缀类型为：JPG.PNG.MP4
+					2.请提前准备好健康资料，以备专家参考
+				</view>
+				<view class="">
+					3.请提前下载“腾讯会议”APP
 				</view>
 			</view>
 		</view>
@@ -136,50 +113,57 @@
 	import {
 		consultationInfo
 	} from '@/api/pagesB/createnewconsultation/createnewconsultation.js'
+	import {
+		getListByDoctor
+	} from '@/api/pagesB/confirmation/index.js'
+	import tabs from '@/components/utabs/u-tabs.vue'
 	export default {
 		components: {
-			"m-city": gkcity
+			"m-city": gkcity,
+			tabs
 		},
 		data() {
 			return {
-				// 非真实地址
-				uoloadaction: '',
+				uoloadaction: '', // 非真实地址
 				list: [],
 				addresslength: null,
 				imglistlength: null,
 				address: '请选择所属地区', //页面所属区域
+				timecurrent: 0, //时间下标
+				appointmentTimeList: [],
 				formdata: {
-					address: '请选择所属地区', //页面所属区域
+					address: null, //页面所属区域
 					patientId: 1,
 					patientName: '李广君',
 					cardNo: '370882199909092123',
 					phone: '17615455437',
-					address: '',
-					doctorId: 1,
-					doctorName: '李医生',
-					consultationType: 'IMAGE_TEXT_CONSULTATION',
-					problemDescription: '',
-					situationDescription: '',
-					problemStatement: '',
-					medicalRecord: '',
-					fileUrls: []
+					address: null,
+					doctorId: null,
+					doctorName: null,
+					consultationType: 'VIDEO_CONSULTATION',
+					problemDescription: null,
+					situationDescription: null,
+					problemStatement: null,
+					medicalRecord: null,
+					fileUrls: [],
+					appointmentDate: null,
+					appointmentStartTime: null,
+					appointmentEndTime: null,
 				}
 			};
 		},
 		onLoad(options) {
+			this.formdata.doctorName = options.doctorName
+			this.formdata.doctorId = options.doctorId
 			this.uoloadaction = baseurl + '/nurseApplet/consultationInfo/uploadConsultationFile'
-		},
-		onShow() {
 			this.areaInfo();
-			let that = this
-			uni.$on('doctordata', function(data) {
-				let item = JSON.parse(data.data)
-				that.formdata.doctorName = item.realname
-				that.formdata.doctorId = item.userNo
-				uni.$off('doctordata')
-			})
+			this.getListByDoctorinfo();
 		},
+		onShow() {},
 		methods: {
+			timechange(index) {
+				this.timecurrent = index
+			},
 			updata() {
 				if (this.imglistlength > 0) {
 					this.$refs.uUpload.upload()
@@ -199,15 +183,25 @@
 				this.info();
 			},
 			info() {
-				consultationInfo(this.formdata).then(res => {
-					if (res.code == 200) {
-						this.$refs.uToast.show({
-							title: '新建图文问诊成功',
-							type: 'success',
-							duration: '1500',
-							back: 1
-						})
-					}
+				console.log(this.formdata)
+				// consultationInfo(this.formdata).then(res => {
+				// 	if (res.code == 200) {
+				// 		this.$refs.uToast.show({
+				// 			title: '新建图文问诊成功',
+				// 			type: 'success',
+				// 			duration: '1500',
+				// 			back: 1
+				// 		})
+				// 	}
+				// })
+			},
+			getListByDoctorinfo() {
+				getListByDoctor(this.formdata.doctorId).then(res => {
+					res.data.forEach(e => {
+						e.dates = e.scheduleDate.slice(5, 10)
+						e.name = e.week
+					})
+					this.appointmentTimeList = res.data
 				})
 			},
 			// 显示三级地址联动
@@ -237,11 +231,6 @@
 					this.address = '请选择所属地区'
 				}
 			},
-			gochoosedoctor() {
-				uni.navigateTo({
-					url: '/pagesC/choosedoctor/choosedoctor'
-				})
-			},
 		}
 	}
 </script>
diff --git a/pagesB/medicine/medicine.vue b/pagesB/medicine/medicine.vue
index fc3ff42..ad95797 100644
--- a/pagesB/medicine/medicine.vue
+++ b/pagesB/medicine/medicine.vue
@@ -230,7 +230,7 @@
 				// 			if (res.data.loginFlag) {
 				// 				that.usershow = false
 				uni.navigateTo({
-					url: `/pagesB/confirmation/confirmation?price=${item.consultingFee}&hospitalPersonId=${item.id}&&personName=${item.personName}`
+					url: `/pagesB/confirmation/confirmation?price=${item.consultingFee}&doctorId=${item.id}&doctorName=${item.personName}`
 				})
 				// 			} else {
 				// 				that.usershow = true
diff --git a/pagesC/Onlinesigning/Onlinesigning.vue b/pagesC/Onlinesigning/Onlinesigning.vue
index cdb48ca..a91494c 100644
--- a/pagesC/Onlinesigning/Onlinesigning.vue
+++ b/pagesC/Onlinesigning/Onlinesigning.vue
@@ -532,6 +532,10 @@
 			if (day < 10) {
 				day = '0' + day;
 			}
+			let userinfo = uni.getStorageSync('userinfo');
+			this.query.residentName = userinfo.patientName
+			this.query.identity = userinfo.cardNo
+			this.query.phone = userinfo.patientName
 			this.query.signTime = year + '-' + month + '-' + day;
 		},
 		onShow() {