From c8f8a9812cf1a62d4d466f3ce210aea75938ef23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Wed, 1 Nov 2023 10:00:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=E5=92=A8=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                 |   8 +-
 pagesB/ExpertlookOrder/ExpertlookOrder.vue |  20 ++--
 pagesB/cancel/cancel.scss                  |   8 +-
 pagesB/cancel/cancel.vue                   |  27 ++++-
 pagesB/confirmation/confirmation.scss      |  70 ++++++++++--
 pagesB/confirmation/confirmation.vue       |   4 +-
 pagesB/consulted/consulted.scss            |  57 +++++++++-
 pagesB/consulted/consulted.vue             | 125 +++++++++++++++++----
 8 files changed, 261 insertions(+), 58 deletions(-)

diff --git a/pages.json b/pages.json
index 596af9b..7d33c59 100644
--- a/pages.json
+++ b/pages.json
@@ -357,8 +357,10 @@
 			}, {
 				"path": "consulted/consulted",
 				"style": {
-					"navigationBarTitleText": "待咨询",
-					"enablePullDownRefresh": false
+					// "navigationBarTitleText": "待咨询",
+					"navigationStyle": "custom", // 隐藏系统导航栏
+					"onReachBottomDistance": 20, //距离底部多远时触发 单位为px
+					"enablePullDownRefresh": true //设置参数为true
 				}
 			}, {
 				"path": "cancel/cancel",
@@ -725,4 +727,4 @@
 			}
 		]
 	}
-}
\ No newline at end of file
+}
diff --git a/pagesB/ExpertlookOrder/ExpertlookOrder.vue b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
index c0ef3df..e670fe7 100644
--- a/pagesB/ExpertlookOrder/ExpertlookOrder.vue
+++ b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
@@ -15,7 +15,7 @@
 			active-color='#26A888'></u-tabs>
 		<view class="" v-if="total>0" style="margin-top: 80rpx;padding: 3%;">
 			<view class="Apayment" v-for='(item,index) in orderlist' :key="index">
-				<view class="names">店铺名称
+				<view class="names">{{item.orderTime}}
 					<image class="picture" src="../../static/huijiantou.png" mode=""></image>
 					<span v-if="item.orderStatus=='WAIT_PAY'">待付款</span>
 					<span v-if="item.orderStatus=='WAIT_REFUND'">退款中</span>
@@ -24,7 +24,7 @@
 						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType !='HEALTH_CONSULTATION'">待收货</span>
 					<span
 						v-if="item.orderStatus=='WAIT_RECEIVED_GOODS'&&item.orderType =='HEALTH_CONSULTATION'">待咨询</span>
-					<span v-if="item.orderStatus=='RECEIVED_GOODS'">待评价</span>
+					<span v-if="item.orderStatus=='RECEIVED_GOODS'">待服务</span>
 					<span v-if="item.orderStatus=='EVALUATED'">已完成</span>
 					<span v-if="item.orderStatus=='PAY'">待发货</span>
 					<span v-if="item.orderStatus=='REFUNDED'">已退款</span>
@@ -41,7 +41,7 @@
 							v-if="item.orderType !='HEALTH_CONSULTATION'"></image>
 						<view class="model">
 							<view class="top">
-								<span v-if="item.orderType =='HEALTH_CONSULTATION'">健康咨询</span>
+								<span v-if="item.orderType =='HEALTH_CONSULTATION'">{{item.hospitalPersonName}}</span>
 								<span v-else>{{item.goodsName}}</span>
 								<!-- <span v-if="item.orderType =='HEALTH_CONSULTATION'">￥{{item.totalPrice}}</span> -->
 								<span
@@ -137,7 +137,7 @@
 					{
 						name: '待付款',
 						orderStatus: 'WAIT_PAY',
-					}, 
+					},
 					{
 						name: '待接单',
 						orderStatus: 'WAIT_RECEIVED_GOODS',
@@ -145,15 +145,17 @@
 					{
 						name: '待服务',
 						orderStatus: 'RECEIVED_GOODS',
-					},{
-						name: '待评价',
-						orderStatus: 'RECEIVED_GOODS',
 					},
+					// {
+					// 	name: '待评价',
+					// 	orderStatus: 'RECEIVED_GOODS',
+					// },
+				
 					{
 						name: '已完成',
 						orderStatus: 'EVALUATED',
 					},
-					
+
 				],
 				tabscurrent: 0,
 				background: {
@@ -292,7 +294,7 @@
 			//订单详情页面
 			goorderdetails(item) {
 				uni.navigateTo({
-					url: `/pagesB/orderDetails/orderDetails?goodsOrderId=${item.goodsOrderId}`
+					url: `/pagesB/consulted/consulted?item=${JSON.stringify(item)}`
 				})
 			},
 			//商品订单请求
diff --git a/pagesB/cancel/cancel.scss b/pagesB/cancel/cancel.scss
index 06fa0ea..b9fec60 100644
--- a/pagesB/cancel/cancel.scss
+++ b/pagesB/cancel/cancel.scss
@@ -44,7 +44,7 @@
 					display: inline-block;
 					top: 50%;
 					transform: translateY(-50%);
-					right: 10%;
+					right: 5%;
 				}
 
 				span:nth-child(4) {
@@ -53,7 +53,7 @@
 					display: inline-block;
 					top: 53%;
 					transform: translateY(-50%);
-					right: 5%;
+					right: 0%;
 					font-size: 20rpx;
 				}
 			}
@@ -82,7 +82,7 @@
 					letter-spacing: 0.2em;
 					::v-deep .uni-textarea-textarea{
 						font-size: 28rpx;
-						
+
 					}
 					::v-deep .uni-textarea-compute, .uni-textarea-line, .uni-textarea-placeholder, .uni-textarea-textarea{
 						font-size: 28rpx;
@@ -106,4 +106,4 @@
 			}
 
 		}
-	}
\ No newline at end of file
+	}
diff --git a/pagesB/cancel/cancel.vue b/pagesB/cancel/cancel.vue
index a56fef3..3659a07 100644
--- a/pagesB/cancel/cancel.vue
+++ b/pagesB/cancel/cancel.vue
@@ -4,8 +4,8 @@
 			<view class="refund">
 				<span>退款金额</span>
 				<span>￥</span>
-				<span>39</span>
-				<span>.90</span>
+				<!-- <span></span> -->
+				<span>{{list.totalPrice}}</span>
 			</view>
 			<view class="reason">
 				<view class="reasondata">原因</view>
@@ -13,10 +13,10 @@
 					<textarea v-model="value" :type="type" :border="border" placeholder="请输入您的退款原因" />
 				</view>
 
-			</view>	
+			</view>
 			<view class="bottom">
 				确认取消
-				
+
 			</view>
 
 		</view>
@@ -28,9 +28,24 @@
 	export default {
 		data() {
 			return {
-
+list:[],
 			}
 		},
+		onLoad(options) {
+			console.log(options,'999')
+			this.list = JSON.parse(options.list)
+			console.log(this.list, '99')
+			// console.log(options,'88')
+			this.baseurl = baseurl
+			this.orderTypeList.goodsOrderId = options.goodsOrderId
+			let that = this
+			// const value = uni.getStorageSync('patientId');
+			// const value2 = uni.getStorageSync('openid');
+			// if (value && value2) {
+			// 	that.orderTypeList.patientId = value
+			// 	that.orderTypeList.openid = value2
+			// }
+		},
 		methods: {
 
 		}
@@ -39,4 +54,4 @@
 
 <style lang="scss">
 	@import './cancel.scss'
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesB/confirmation/confirmation.scss b/pagesB/confirmation/confirmation.scss
index ef75725..dfb517a 100644
--- a/pagesB/confirmation/confirmation.scss
+++ b/pagesB/confirmation/confirmation.scss
@@ -1,6 +1,58 @@
 	.app {
 		padding: 0 0 124rpx;
 		width: 100%;
+		.u-navbar {
+			display: block;
+			image {
+				margin: 0 4% 0 4%;
+				width: 20rpx;
+				height: 30rpx;
+			}
+
+			.title {
+				width: 31%;
+				font-size: 34rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.inputs {
+				position: relative;
+				// margin-left: 4%;
+				box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				width: 60%;
+				height: 65rpx;
+				border-radius: 31rpx;
+				z-index: 999;
+				background: #65c0a9;
+				color: #FFFFFF;
+
+				.placeholder {
+					color: #FFFFFF;
+				}
+
+				.input {
+					margin: 0 auto;
+					position: absolute;
+					height: 65rpx;
+					// top: 8%;
+					left: 18%;
+					width: 80%;
+					font-size: 26rpx;
+					color: #FFFFFF;
+				}
+
+				.icon {
+					background: url(@/static/pagesB/sousuo.png) no-repeat;
+					width: 30rpx;
+					height: 28rpx;
+					background-size: cover;
+					position: absolute;
+					top: 28%;
+					left: 4%;
+				}
+			}
+		}
 		// 弹框支付
 		.payment {
 			width: 100%;
@@ -11,11 +63,11 @@
 			text-align: center;
 			border-bottom: 1rpx solid #D8D4D4;
 		}
-		
+
 		.chat {
 			position: relative;
 			height: 200rpx;
-		
+
 			span {
 				position: absolute;
 				top: 50rpx;
@@ -24,7 +76,7 @@
 				font-size: 42rpx;
 				color: #000000;
 			}
-		
+
 			image {
 				position: absolute;
 				top: 50rpx;
@@ -33,7 +85,7 @@
 				height: 70rpx;
 			}
 		}
-		
+
 		.submits {
 			background: #26A888;
 			width: 501rpx;
@@ -108,7 +160,7 @@
 						flex-wrap: wrap;
 						text-align: center;
 						color: #000000;
-						
+
 						.timeitem {
 							width: 29%;
 							margin: 0 2% 20rpx;
@@ -116,19 +168,19 @@
 							border-radius: 5rpx;
 							border: 2rpx solid #26A888;
 						}
-						
+
 						.itemstext{
 							line-height: 38rpx;
 							padding-top: 10rpx;
 							font-size: 23rpx;
 						}
-						
+
 						.itemstexttwo{
 							line-height: 42rpx;
 							font-size: 16rpx;
 							font-weight: 500;
 						}
-						
+
 						.timeitemtap {
 							width: 29%;
 							margin: 0 2% 20rpx;
@@ -303,4 +355,4 @@
 				}
 			}
 		}
-	}
\ No newline at end of file
+	}
diff --git a/pagesB/confirmation/confirmation.vue b/pagesB/confirmation/confirmation.vue
index 55e27d1..c5ee043 100644
--- a/pagesB/confirmation/confirmation.vue
+++ b/pagesB/confirmation/confirmation.vue
@@ -148,7 +148,7 @@
 				请选择支付方式
 			</view>
 			<view class="chat">
-				<image src="/static/chat.png" mode=""></image>
+				<image src="/static/pagesB/chat.png" mode=""></image>
 				<span>微信支付</span>
 			</view>
 			<view class="submits" @tap='buy'>
@@ -434,4 +434,4 @@
 
 <style lang="scss">
 	@import './confirmation.scss';
-</style>
\ No newline at end of file
+</style>
diff --git a/pagesB/consulted/consulted.scss b/pagesB/consulted/consulted.scss
index 73f6a31..9c20b53 100644
--- a/pagesB/consulted/consulted.scss
+++ b/pagesB/consulted/consulted.scss
@@ -5,7 +5,58 @@
 		color: #000000;
 		padding-top: 20rpx;
 		overflow: scroll;
+	.u-navbar {
+			display: block;
+			image {
+				margin: 0 4% 0 4%;
+				width: 20rpx;
+				height: 30rpx;
+			}
 
+			.title {
+				width: 31%;
+				font-size: 34rpx;
+				font-weight: 500;
+				color: #FFFFFF;
+			}
+
+			.inputs {
+				position: relative;
+				// margin-left: 4%;
+				box-shadow: 0rpx 9rpx 31rpx 9rpx rgba(0, 0, 0, 0.03);
+				width: 60%;
+				height: 65rpx;
+				border-radius: 31rpx;
+				z-index: 999;
+				background: #65c0a9;
+				color: #FFFFFF;
+
+				.placeholder {
+					color: #FFFFFF;
+				}
+
+				.input {
+					margin: 0 auto;
+					position: absolute;
+					height: 65rpx;
+					// top: 8%;
+					left: 18%;
+					width: 80%;
+					font-size: 26rpx;
+					color: #FFFFFF;
+				}
+
+				.icon {
+					background: url(@/static/pagesB/sousuo.png) no-repeat;
+					width: 30rpx;
+					height: 28rpx;
+					background-size: cover;
+					position: absolute;
+					top: 28%;
+					left: 4%;
+				}
+			}
+		}
 		.content {
 			width: 95%;
 			height: 100%;
@@ -277,7 +328,7 @@
 					letter-spacing: 0.2em;
 
 				}
-			
+
 		}
 		.submits{
 			position: relative;
@@ -294,6 +345,6 @@
 			top: 35%;
 			left: 50%;
 			transform: translateX(-50%);
-			
+
 		}
-	}
\ No newline at end of file
+	}
diff --git a/pagesB/consulted/consulted.vue b/pagesB/consulted/consulted.vue
index ea93c5c..2452846 100644
--- a/pagesB/consulted/consulted.vue
+++ b/pagesB/consulted/consulted.vue
@@ -1,5 +1,22 @@
 <template>
 	<view class="app">
+		<u-navbar :is-back="false" :background="background" class="u-navbar">
+			<image src="@/static/pagesB/fanhui.png" mode="" @tap="goprevious"></image>
+			<view class="title" v-if="list.orderStatus=='WAIT_PAY'">待付款</view>
+			<view class="title" v-if="list.orderStatus=='WAIT_REFUND'">退款中</view>
+			<view class="title" v-if="list.orderStatus=='CANCEL'">已取消</view>
+			<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType !='HEALTH_CONSULTATION'">
+				待收货</view>
+			<view class="title" v-if="list.orderStatus=='WAIT_RECEIVED_GOODS'&&list.orderType =='HEALTH_CONSULTATION'">
+				待咨询</view>
+			<view class="title" v-if="list.orderStatus=='RECEIVED_GOODS'">待评价</view>
+			<view class="title" v-if="list.orderStatus=='EVALUATED'">已完成</view>
+			<view class="title" v-if="list.orderStatus=='PAY'">待发货</view>
+			<view class="title" v-if="list.orderStatus=='REFUNDED'">已退款</view>
+			<view class="title" v-if="list.orderStatus=='WAIT_RETURNED_GOODS'">待退货</view>
+			<view class="title" v-if="list.orderStatus=='RETURNED_GOODS'">退款成功</view>
+
+		</u-navbar>
 		<view class="content">
 			<view class="service">
 				<image src="/static/pagesB/persone.png" mode=""></image>
@@ -10,15 +27,20 @@
 					<image src="../../static/headsculpture.png" mode=""></image>
 					<view class="ppointment">
 						<view class="doctorname">
-							<span>张医生</span>
+							<span>{{list.hospitalPersonName}}</span>
 						</view>
 						<view class="reservation">
 							<span>齐鲁医院</span>
-							<span>副主任医师</span>
+							<span v-if="list.academicTitle=='DEPUTY_CHIEF_PHYSICIAN'">副主任医师</span>
+							<span v-if="list.academicTitle=='CHIEF_PHYSICIAN'">主任医师</span>
+							<span v-if="list.academicTitle=='ATTENDING_DOCTOR'">主治医师</span>
+							<span v-if="list.academicTitle=='PHYSICIAN'">医师</span>
+							<span v-if="list.academicTitle=='HEALER'">医士</span>
+							<span v-if="list.academicTitle=='RESIDENT_PHYSICIAN'">住院医师</span>
 						</view>
-						<view class="hospital">
+						<!-- <view class="hospital">
 							三甲医院
-						</view>
+						</view> -->
 					</view>
 				</view>
 
@@ -27,44 +49,44 @@
 				<view class="doctorphone">
 					医生电话
 				</view>
-				<view class="phone">
-					·15864658751
+				<view class="phone" v-if="list.personPhone">
+					·{{list.personPhone}}
 				</view>
 			</view>
 			<view class="doctordetails">
 				<view class="doctorphone">
 					预约时间
 				</view>
-				<view class="phone">
-					·2023-10-10
+				<view class="phone" v-if="list.healthAppointDate">
+					{{list.healthAppointDate}}
 				</view>
 			</view>
 			<view class="doctordetailstwo">
 				<view class="doctorphonetwo">
 					咨询内容
 				</view>
-				<view class="phonetwo advicetwo">
-					·咨询内内容咨询内容咨询内容咨询内容咨询内容咨咨询内容咨询内容咨询内容咨询内容
+				<view class="phonetwo advicetwo" v-if="list.healthConsultationContent">
+					·{{list.healthConsultationContent}}
 					<!-- <textarea  v-model="value" :type="type" :border="border" /> -->
 				</view>
 			</view>
 			<view class="amount">
-				<span>预约金额</span><span>￥39.90</span>
+				<span>预约金额</span><span>￥{{list.totalPrice}}</span>
 
 			</view>
 			<view class="doctordetailstwo">
 				<view class="doctorphonetwo">
 					备注
 				</view>
-				<view class="phonetwo advicetwo">
-					·备注内容
+				<view class="phonetwo advicetwo" v-if="list.remark">
+					·{{list.remark}}
 				</view>
 			</view>
 
 		</view>
 		<view class="bottom">
 			<span>更多</span>
-			<span @tap="cancle">取消订单</span>
+			<span @tap="cancle" v-if="list.orderStatus!='RECEIVED_GOODS'||list.orderStatus!='EVALUATED'">取消订单</span>
 			<span @tap="evaluate">服务评价</span>
 		</view>
 		<u-popup v-model="evaluateshow" mode="bottom" length="45%" border-radius="30" :closeable='true'>
@@ -76,7 +98,7 @@
 				<span>非常差/差/满意/非常满意</span>
 			</view>
 			<view class="submits">
-			提交
+				提交
 			</view>
 		</u-popup>
 
@@ -85,25 +107,85 @@
 </template>
 
 <script>
+	import {
+		confirmReceipt,
+		ssgoodsOrder,
+	} from '@/api/pagesB/CommodityOrder/index.js'
+	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
 			return {
+				list: [],
 				// 评价弹框
-				evaluateshow:false,
+				background: {
+					backgroundColor: '#26A888',
+				},
+				evaluateshow: false,
+				orderTypeList: {
+					goodsOrderId: null,
+					patientId: '',
+					openid: null,
+					orderType: 'HEALTH_CONSULTATION',
+					orderStatus: 'WAIT_PAY',
+					// orderTypeList: [
+					// 	'INTEGRAL_EXCHANGE',
+					// 	'DIRECT_BUY',
+					// ],
+					// orderStatus: '',
+					pageSize: 15,
+					pageNum: 1,
+					goodsName: '',
+				},
 
 			}
 		},
+		onLoad(options) {
+			this.list = JSON.parse(options.item)
+			console.log(this.list, '99')
+			// console.log(options,'88')
+			this.baseurl = baseurl
+			this.orderTypeList.goodsOrderId = options.goodsOrderId
+			let that = this
+			// const value = uni.getStorageSync('patientId');
+			// const value2 = uni.getStorageSync('openid');
+			// if (value && value2) {
+			// 	that.orderTypeList.patientId = value
+			// 	that.orderTypeList.openid = value2
+			// }
+		},
 		methods: {
+			goprevious() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			goodsOrderinfo() {
+				ssgoodsOrder(this.orderTypeList).then(
+					res => {
+						this.order = res.rows[0]
+						var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
+						var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
+						var times = new Date().getTime() / 1000
+						this.timestamp = time - times
+						if (this.timestamp >= 0) {
+							this.timecount = this.timestamp
+							this.Timers = setInterval(() => {
+								this.timecount--;
+							}, 1000)
+						}
+					})
+			},
 			// 取消订单
-			cancle(){
+			cancle() {
+				var list=this.list
 				uni.navigateTo({
-					url:'/pagesB/cancel/cancel'
+					url: `/pagesB/cancel/cancel?list=${JSON.stringify(this.list)}`
 				})
 			},
 			// 服务评价
-			evaluate(){
-				this.evaluateshow=true;
-				
+			evaluate() {
+				this.evaluateshow = true;
+
 			},
 
 		}
@@ -112,4 +194,3 @@
 <style lang="scss">
 	@import './consulted.scss'
 </style>
-