From 0b056ee6bbab3aeb4e79a14b296580aaf95c8431 Mon Sep 17 00:00:00 2001
From: shidongli <shidongli>
Date: Thu, 16 Nov 2023 16:43:34 +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

---
 api/pagesB/CommodityOrder/index.js |  11 ++++
 pagesB/consulted/consulted.scss    |   9 ++-
 pagesB/consulted/consulted.vue     | 100 +++++++++++++++++++++--------
 3 files changed, 92 insertions(+), 28 deletions(-)

diff --git a/api/pagesB/CommodityOrder/index.js b/api/pagesB/CommodityOrder/index.js
index 47859df..b0c1c7f 100644
--- a/api/pagesB/CommodityOrder/index.js
+++ b/api/pagesB/CommodityOrder/index.js
@@ -23,3 +23,14 @@ export function ssgoodsOrder(data) {
 		},
 	})
 }
+
+export function ssgoodsOrderdata(data) {
+	return request({
+		url: '/nurseApplet/nursingOrder/getConsultationOrder',
+		method: 'get',
+		data,
+		header: {
+			Authorization: 'Bearer' + ' ' + uni.getStorageSync('token')
+		},
+	})
+}
diff --git a/pagesB/consulted/consulted.scss b/pagesB/consulted/consulted.scss
index 0c79581..fd489f4 100644
--- a/pagesB/consulted/consulted.scss
+++ b/pagesB/consulted/consulted.scss
@@ -4,6 +4,8 @@
 		width: 100%;
 		color: #000000;
 		padding-top: 20rpx;
+		    height: calc(100vh - 78px);
+    overflow: auto;
 		// overflow: scroll;
 		.buy {
 			background: #FFFFFF;
@@ -121,7 +123,7 @@
 		}
 		.content {
 			width: 95%;
-			height: 100%;
+			// height: 100%;
 			background: #FFFFFF;
 			box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
 			border-radius: 5rpx;
@@ -130,7 +132,7 @@
 			.service {
 				width: 50%;
 				// top: 4%;
-				position: absolute;
+				position: relative;
 				height: 35px;
 				left: 6%;
 
@@ -302,7 +304,8 @@
 				top: 2%;
 				width: 90%;
 				font-size: 28rpx;
-				margin-bottom: 8%;
+				height: 75rpx;
+				// margin-bottom: 8%;
 				span:nth-child(2) {
 					display: inline-block;
 					position: absolute;
diff --git a/pagesB/consulted/consulted.vue b/pagesB/consulted/consulted.vue
index 319f423..1ecbaa4 100644
--- a/pagesB/consulted/consulted.vue
+++ b/pagesB/consulted/consulted.vue
@@ -70,6 +70,62 @@
 					{{list.healthAppointDate}}
 				</view>
 			</view>
+			<view class="doctordetails">
+				<view class="doctorphone">
+					预约日期
+				</view>
+				<view class="phone" v-if="order.appointmentDate">
+					{{order.appointmentDate}}
+				</view>
+			</view>
+			<view class="doctordetails">
+				<view class="doctorphone">
+					预约开始时间点
+				</view>
+				<view class="phone" v-if="order.appointmentStartTime">
+					{{order.appointmentStartTime}}
+				</view>
+			</view>
+			<view class="doctordetails">
+				<view class="doctorphone">
+					预约结束时间点
+				</view>
+				<view class="phone" v-if="order.appointmentEndTime">
+					{{order.appointmentEndTime}}
+				</view>
+			</view>
+			<view class="doctordetailstwo">
+				<view class="doctorphonetwo">
+					问题简述
+				</view>
+				<view class="phonetwo advicetwo" v-if="order.problemDescription">
+					{{order.problemDescription}}
+				</view>
+			</view>
+			<view class="doctordetailstwo">
+				<view class="doctorphonetwo">
+					患者个体情况说明
+				</view>
+				<view class="phonetwo advicetwo" v-if="order.situationDescription">
+					{{order.situationDescription}}
+				</view>
+			</view>
+			<view class="doctordetailstwo">
+				<view class="doctorphonetwo">
+					问题描述
+				</view>
+				<view class="phonetwo advicetwo" v-if="order.problemStatement">
+					{{order.problemStatement}}
+				</view>
+			</view>
+			<view class="doctordetailstwo">
+				<view class="doctorphonetwo">
+					病例
+				</view>
+				<view class="phonetwo advicetwo" v-if="order.medicalRecord">
+					{{order.medicalRecord}}
+				</view>
+			</view>
 			<view class="doctordetailstwo">
 				<view class="doctorphonetwo">
 					咨询内容
@@ -82,6 +138,10 @@
 				<span>订单金额</span><span>￥{{list.totalPrice}}</span>
 
 			</view>
+		<!-- 	<view class="amount">
+				<span>预约日期</span><span>￥{{list.appointmentDate}}</span>
+			
+			</view> -->
 			<!-- <view class="doctordetailstwo">
 				<view class="doctorphonetwo">
 					备注
@@ -125,6 +185,7 @@
 	import {
 		confirmReceipt,
 		ssgoodsOrder,
+		ssgoodsOrderdata,
 	} from '@/api/pagesB/CommodityOrder/index.js'
 	import baseurl from '@/api/baseurl.js'
 	import {
@@ -143,19 +204,8 @@
 				},
 				evaluateshow: false,
 				orderTypeList: {
-					goodsOrderId: null,
-					patientId: '',
-					openid: null,
-					orderType: 'HEALTH_CONSULTATION',
-					orderStatus: '',
-					// orderTypeList: [
-					// 	'INTEGRAL_EXCHANGE',
-					// 	'DIRECT_BUY',
-					// ],
-					// orderStatus: '',
-					pageSize: 15,
-					pageNum: 1,
-					goodsName: '',
+					orderNo:'',
+			
 				},
 				order: [],
 
@@ -164,18 +214,17 @@
 		onLoad(options) {
 			// if(options.item){
 			this.list = JSON.parse(options.item)
-			console.log(this.list, '555')
-			this.orderTypeList.orderStatus = this.list.orderStatus
-			this.orderTypeList.goodsOrderId = this.list.goodsOrderId
-			// console.log(this.orderTypeList.orderStatus, '25256')
-			// else if(options.goodsOrderId){
-			// 	this.orderTypeList.goodsOrderId = options.goodsOrderId
-			// 	let that = this
+			// console.log(this.list, '555')
+			// this.orderTypeList.orderStatus = this.list.orderStatus
+			// this.orderTypeList.goodsOrderId = this.list.goodsOrderId
+			this.orderTypeList.orderNo = this.list.goOrderNo
+			// goOrderNo
+	
 
 
 			// }
-			this.orderTypeList.patientId = uni.getStorageSync('patientId');
-			this.orderTypeList.openid = uni.getStorageSync('openid');
+			// this.orderTypeList.patientId = uni.getStorageSync('patientId');
+			// this.orderTypeList.openid = uni.getStorageSync('openid');
 			// if (value && value2) {
 			// 	that.orderTypeList.patientId = value
 			// 	that.orderTypeList.openid = value2
@@ -196,7 +245,7 @@
 			pay() {
 				var that = this
 				let paydata = this.list
-				paydata.openid = this.orderTypeList.openid
+				paydata.openid = uni.getStorageSync('openid')
 				paydata.payType = "WECHAT_PAY"
 				paydata.paymentPrice = this.list.totalPrice
 				paydata.orderChannel = 'WECHAT_APPLET'
@@ -237,9 +286,10 @@
 				})
 			},
 			goodsOrderinfo() {
-				ssgoodsOrder(this.orderTypeList).then(
+				ssgoodsOrderdata(this.orderTypeList).then(
 					res => {
-						this.order = res.rows[0]
+						console.log(res)
+						this.order = res.data
 						var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
 						var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
 						var times = new Date().getTime() / 1000