From c6d743878908064059938457e7d36f0cd16710c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=97=AB=E6=99=93=E8=8C=B9?= <1935832701@qq.com>
Date: Thu, 2 Nov 2023 14:44:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesB/ExpertlookOrder/ExpertlookOrder.vue |   2 +-
 pagesB/consulted/consulted.scss            |   2 +-
 pagesB/consulted/consulted.vue             | 101 ++++++++++++---------
 3 files changed, 58 insertions(+), 47 deletions(-)

diff --git a/pagesB/ExpertlookOrder/ExpertlookOrder.vue b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
index b178d4a..00c5fec 100644
--- a/pagesB/ExpertlookOrder/ExpertlookOrder.vue
+++ b/pagesB/ExpertlookOrder/ExpertlookOrder.vue
@@ -34,7 +34,7 @@
 					<view class="detailslist">
 						<image :src="baseurl+item.personPictureUrl" mode=""
 							v-if="item.orderType =='HEALTH_CONSULTATION'&&item.personPictureUrl"></image>
-						<image src="@/static/pagesB/yis.png" mode=""
+						<image src="../../static/headsculpture.png" mode=""
 							v-if="item.orderType =='HEALTH_CONSULTATION'&&!item.personPictureUrl"></image>
 						<image :src="baseurl+item.attributePitureUrl" mode=""
 							v-if="item.orderType !='HEALTH_CONSULTATION'"></image>
diff --git a/pagesB/consulted/consulted.scss b/pagesB/consulted/consulted.scss
index bc53aa2..b0eee72 100644
--- a/pagesB/consulted/consulted.scss
+++ b/pagesB/consulted/consulted.scss
@@ -11,7 +11,7 @@
 			width: 95%;
 			text-align: center;
 			line-height: 80rpx;
-			background-color: #26A888;
+			background-color: #fff;
 			margin: 30rpx auto 30rpx;
 			border-radius: 20rpx;
 			
diff --git a/pagesB/consulted/consulted.vue b/pagesB/consulted/consulted.vue
index 6dac5a2..7842ec1 100644
--- a/pagesB/consulted/consulted.vue
+++ b/pagesB/consulted/consulted.vue
@@ -98,7 +98,6 @@
 		<view class="bottom">
 			<span>更多</span>
 			<span @tap="cancle"
-			
 				v-if="list.orderStatus!='WAIT_PAY'&&list.orderStatus!='EVALUATED'&&list.orderStatus!='WAIT_REFUND'&&list.orderStatus!='COMPLETED'&&list.orderStatus!='RECEIVED_GOODS'&&list.orderStatus!='REFUNDED'">取消订单</span>
 			<!-- <span@tap="evaluate" v-if="list.orderStatus=='COMPLETED'">服务评价</span> -->
 		</view>
@@ -151,59 +150,71 @@
 					pageNum: 1,
 					goodsName: '',
 				},
+				order:[],
 
 			}
 		},
 		onLoad(options) {
+			// if(options.item){
 			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
-			// }
+			console.log(this.list.goodsOrderId, '555')
+			this.orderTypeList.goodsOrderId = this.list.goodsOrderId
+		
+		// else if(options.goodsOrderId){
+		// 	this.orderTypeList.goodsOrderId = options.goodsOrderId
+		// 	let that = this
+
+
+		// }
+		this.orderTypeList.patientId = uni.getStorageSync('patientId');
+		this.orderTypeList.openid = uni.getStorageSync('openid');
+		// if (value && value2) {
+		// 	that.orderTypeList.patientId = value
+		// 	that.orderTypeList.openid = value2
+		// }
+		this.goodsOrderinfo()
+		// console.log(this.list, '99')
+		// console.log(options,'88')
+		this.baseurl = baseurl
+
+	},
+	methods: {
+		goprevious() {
+			uni.navigateBack({
+				delta: 1
+			})
 		},
-		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
+					console.log(this.timestamp, '8585')
+					if (this.timestamp >= 0) {
+						this.timecount = this.timestamp
+						this.Timers = setInterval(() => {
+							this.timecount--;
+						}, 1000)
+					}
 				})
-			},
-			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() {
-				var list = this.list
-				uni.navigateTo({
-					url: `/pagesB/refundType/refundType?list=${JSON.stringify(this.list)}`
-				})
-			},
-			// 服务评价
-			evaluate() {
-				this.evaluateshow = true;
+		},
+		// 取消订单
+		cancle() {
+			var list = this.list
+			uni.navigateTo({
+				url: `/pagesB/refundType/refundType?list=${JSON.stringify(this.list)}`
+			})
+		},
+		// 服务评价
+		evaluate() {
+			this.evaluateshow = true;
 
-			},
+		},
 
-		}
+	}
 	}
 </script>
 <style lang="scss">