From e39df72c1e9a41a0778326245f82867a7450a68f Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Tue, 14 Nov 2023 15:14:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=92=A8=E8=AF=A2=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesB/ExpertlookOrder/ExpertlookOrder.vue           | 12 ++++++------
 pagesB/confirmation/confirmation.vue                 |  2 ++
 pagesB/consultationplatform/consultationplatform.vue |  1 +
 pagesB/consulted/consulted.vue                       |  9 +++++----
 pagesB/refundType/refundType.vue                     |  5 +++++
 5 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/pagesB/ExpertlookOrder/ExpertlookOrder.vue b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
index 3baad5c..1cae1b3 100644
--- a/pagesB/ExpertlookOrder/ExpertlookOrder.vue
+++ b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
@@ -32,12 +32,12 @@
 				</view>
 				<view class="details" @tap='goorderdetails(item)'>
 					<view class="detailslist">
-						<image :src="baseurl+item.attributePitureUrl" mode=""
-							v-if="item.orderType =='HEALTH_CONSULTATION'&&item.attributePitureUrl"></image>
-						<image :src="baseurl+item.attributePitureUrl" mode=""
+						<image :src="baseurl+item.personPictureUrl" mode=""
+							v-if="item.orderType =='HEALTH_CONSULTATION'"></image>
+						<!-- <image :src="baseurl+item.attributePitureUrl" mode=""
 							v-if="item.orderType =='HEALTH_CONSULTATION'&&!item.attributePitureUrl"></image>
 						<image :src="baseurl+item.attributePitureUrl" mode=""
-							v-if="item.orderType !='HEALTH_CONSULTATION'"></image>
+							v-if="item.orderType !='HEALTH_CONSULTATION'"></image> -->
 						<view class="model">
 							<view class="top">
 								<span v-if="item.orderType =='HEALTH_CONSULTATION'">{{item.hospitalPersonName}}</span>
@@ -82,9 +82,9 @@
 						去评价
 						<!-- </view> -->
 					</view>
-					<view class="logistics harvest" @tap='Receipt(item)'
+				<!-- 	<view class="logistics harvest" @tap='Receipt(item)'
 						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'">
-						确认收货</view>
+						确认收货</view> -->
 					<!-- 	<view class="logistics harvest" @tap='Receipt(item)'
 						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType =='HEALTH_CONSULTATION'">
 						咨询完成</view> -->
diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue
index f6de4cf..a50f96d 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -201,6 +201,7 @@
 					address: null,
 					doctorId: null,
 					doctorName: null,
+					schedulePlanDetailId:null,
 					consultationType: 'VIDEO_CONSULTATION',
 					problemDescription: null,
 					situationDescription: null,
@@ -264,6 +265,7 @@
 				console.log(item, '8')
 				this.formdata.appointmentStartTime = item.starttime
 				this.formdata.appointmentEndTime = item.endtime
+				this.formdata.schedulePlanDetailId = item.schedulePlanDetailId
 				this.timeindex = index
 			},
 			timechange(index) {
diff --git a/pagesB/consultationplatform/consultationplatform.vue b/pagesB/consultationplatform/consultationplatform.vue
index 4639d13..13c15a9 100644
--- a/pagesB/consultationplatform/consultationplatform.vue
+++ b/pagesB/consultationplatform/consultationplatform.vue
@@ -34,6 +34,7 @@
 						{{ item.academicTitle=='ATTENDING_DOCTOR'?'主治医师':''}}
 						{{ item.academicTitle=='PHYSICIAN'?'医师':''}}
 						{{ item.academicTitle=='HEALER'?'医士':''}}
+						{{ item.academicTitle=='RESIDENT_PHYSICIAN'?'住院医师':''}}
 					</view>
 					<view class="text">
 						{{item.personIntroduce}}
diff --git a/pagesB/consulted/consulted.vue b/pagesB/consulted/consulted.vue
index 6512a3f..a2feaa3 100644
--- a/pagesB/consulted/consulted.vue
+++ b/pagesB/consulted/consulted.vue
@@ -6,7 +6,7 @@
 			<view class="title" v-if="list.orderStatus=='WAIT_REFUND'"  @tap="goprevious">退款中</view>
 			<view class="title" v-if="list.orderStatus=='CANCEL'"  @tap="goprevious">已取消</view>
 			<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'"  @tap="goprevious">待接单</view>
-		
+
 			<view class="title" v-if="list.orderStatus=='COMPLETED'"  @tap="goprevious">待评价</view>
 			<view class="title" v-if="list.orderStatus=='RECEIVED_GOODS'"  @tap="goprevious">待服务</view>
 			<view class="title" v-if="list.orderStatus=='EVALUATED'"  @tap="goprevious">已评价</view>
@@ -35,7 +35,7 @@
 			</view>
 			<view class="orderitem">
 				<view class="details">
-					<image src="../../static/headsculpture.png" mode=""></image>
+					<image :src="baseurl+list.personPictureUrl" mode=""></image>
 					<view class="ppointment">
 						<view class="doctorname">
 							<span>{{list.hospitalPersonName}}</span>
@@ -133,6 +133,7 @@
 	export default {
 		data() {
 			return {
+				baseurl:'',
 				timestamp: 0,
 				countvalue: 0,
 				list: [],
@@ -163,7 +164,7 @@
 		onLoad(options) {
 			// if(options.item){
 			this.list = JSON.parse(options.item)
-			// console.log(this.list, '555')
+			console.log(this.list, '555')
 			this.orderTypeList.orderStatus = this.list.orderStatus
 			this.orderTypeList.goodsOrderId = this.list.goodsOrderId
 			// console.log(this.orderTypeList.orderStatus, '25256')
@@ -270,4 +271,4 @@
 </script>
 <style lang="scss">
 	@import './consulted.scss'
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesB/refundType/refundType.vue b/pagesB/refundType/refundType.vue
index 6306647..dc839c1 100644
--- a/pagesB/refundType/refundType.vue
+++ b/pagesB/refundType/refundType.vue
@@ -125,7 +125,12 @@
 				this.order = JSON.parse(options.order)
 				this.order.id = this.order.goodsOrderId
 			}else if(options.list){
+
 				this.order = JSON.parse(options.list)
+				this.order.attributePitureUrl=this.order.personPictureUrl
+
+				// console.log(this.order,'78787')
+
 				this.order.id = this.order.goodsOrderId
 
 			}