From e48f9de4bbed9c226769e85897ba645f4f71642b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E8=BE=89?= <814457906@qq.com>
Date: Thu, 27 Apr 2023 14:19:41 +0800
Subject: [PATCH] =?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/ServiceDetails/ServiceDetails.js          |  8 +++-
 api/request.js                                |  1 -
 pages/CommodityOrder/CommodityOrder.vue       |  4 +-
 .../Nursingstationserviceorder.vue            |  4 +-
 pages/ServiceDetails/ServiceDetails.vue       | 23 ++++++++++-
 pages/lookrate/lookrate.vue                   |  1 -
 pages/menttimeorder/menttimeorder.vue         | 26 +++++++++++-
 pages/night/night.vue                         |  5 +--
 pages/orderDetails/orderDetails.scss          |  1 -
 pages/orderDetails/orderDetails.vue           | 29 ++++++++++++--
 pages/payorderDetails/payorderDetails.vue     | 40 +++++++++++++++----
 11 files changed, 114 insertions(+), 28 deletions(-)

diff --git a/api/ServiceDetails/ServiceDetails.js b/api/ServiceDetails/ServiceDetails.js
index efeb4ec..a704c3d 100644
--- a/api/ServiceDetails/ServiceDetails.js
+++ b/api/ServiceDetails/ServiceDetails.js
@@ -14,4 +14,10 @@ export function addAppointmentEvaluate(data) {
 		method: 'POST',
 		data
 	})
-}
\ No newline at end of file
+}
+export function handCloseOrder() {
+	return request({
+		url: `/monitor/payTask/handCloseOrder`,
+		method: 'GET'
+	})
+}
diff --git a/api/request.js b/api/request.js
index 063a05c..a387b4c 100644
--- a/api/request.js
+++ b/api/request.js
@@ -22,7 +22,6 @@ var request = function(config) {
 					let pages = getCurrentPages();
 					let path = pages[pages.length - 1].$page.fullPath
 					let paths = path.split('?')
-					console.log(paths)
 					if (paths == '/pages/integral/integral' || paths ==
 						'/pages/shopping/shopping' || paths ==
 						'/pages/coupon/coupon' || paths ==
diff --git a/pages/CommodityOrder/CommodityOrder.vue b/pages/CommodityOrder/CommodityOrder.vue
index f61ec28..624d18b 100644
--- a/pages/CommodityOrder/CommodityOrder.vue
+++ b/pages/CommodityOrder/CommodityOrder.vue
@@ -238,7 +238,7 @@
 							this.orderlist = res.rows
 							// this.orderlist.forEach(e => {
 							// 	e.timestamp = null
-							// 	var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24)
+							// 	var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 2)
 							// 	var times = new Date().getTime() / 1000
 							// 	e.timestamp = time - times
 							// })
@@ -318,7 +318,7 @@
 					.goodsName).then(res => {
 					res.rows.forEach(e => {
 						// e.timestamp = null
-						// var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 24)
+						// var time = new Date(e.orderTime).getTime() / 1000 + (60 * 60 * 2)
 						// var times = new Date().getTime() / 1000
 						// e.timestamp = time - times
 						this.orderlist.push(e)
diff --git a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
index daad5b0..0804fe1 100644
--- a/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
+++ b/pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
@@ -259,7 +259,7 @@
 						this.list = res.rows;
 						// this.list.forEach(e => {
 						// 	e.timestamp = null
-						// 	var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24)
+						// 	var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 2)
 						// 	var times = new Date().getTime() / 1000
 						// 	e.timestamp = time - times
 						// })
@@ -284,7 +284,7 @@
 				appServiceOrder(this.patientId, this.pageSize, this.pageNum).then(res => {
 					res.rows.forEach(e => {
 						// e.timestamp = null
-						// var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 24)
+						// var time = new Date(e.createTime).getTime() / 1000 + (60 * 60 * 2)
 						// var times = new Date().getTime() / 1000
 						// e.timestamp = time - times
 						this.list.push(e)
diff --git a/pages/ServiceDetails/ServiceDetails.vue b/pages/ServiceDetails/ServiceDetails.vue
index f687b71..510e164 100644
--- a/pages/ServiceDetails/ServiceDetails.vue
+++ b/pages/ServiceDetails/ServiceDetails.vue
@@ -134,7 +134,8 @@
 	import baseurl from '@/api/baseurl.js'
 	import {
 		getAppointmentDetailsInfo,
-		addAppointmentEvaluate
+		addAppointmentEvaluate,
+		handCloseOrder
 	} from '@/api/ServiceDetails/ServiceDetails.js'
 	import {
 		lookrate
@@ -152,14 +153,19 @@
 				orderNo: '',
 				timer: null,
 				timestamp: 0,
+				timecount: 0,
 				lookrateshow: false, //查看评价
 				ratelist: null,
 				rateimgtitle: {
 					img: null,
 					title: null,
 				},
+				Timers: null,
 			}
 		},
+		onUnload() {
+			clearInterval(this.Timers); //清除该函数
+		},
 		onShow() {
 			this.getlist()
 		},
@@ -174,8 +180,19 @@
 				that.openid = value2
 			}
 			this.getlist()
+			this.Timers = setInterval(() => {
+				this.timecount--;
+			}, 1000)
 		},
 		watch: { //监听
+			timecount() {
+				if (this.timecount <= 0) {
+					clearInterval(this.Timers); //清除该函数
+					handCloseOrder().then(res => {
+						this.list.orderStatus = 'CANCEL'
+					})
+				}
+			},
 			rateval() {
 				if (this.rateval == 5) {
 					this.evaluateSatisfaction = 'VERYSATISFIED'
@@ -323,9 +340,11 @@
 				getAppointmentDetailsInfo(this.orderNo).then(res => {
 					this.list = res.data
 					var ordertimes = this.list.createTime.replaceAll(/\-/gi, "/")
-					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 24)
+					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
 					var times = new Date().getTime() / 1000
 					this.timestamp = time - times
+					this.timecount = this.timestamp
+					this.timecount = 10
 				})
 			},
 			cancelorderment() {
diff --git a/pages/lookrate/lookrate.vue b/pages/lookrate/lookrate.vue
index 23fdb15..f98a5b2 100644
--- a/pages/lookrate/lookrate.vue
+++ b/pages/lookrate/lookrate.vue
@@ -55,7 +55,6 @@
 		onLoad(options) {
 			this.baseurl = baseurl
 			this.order = JSON.parse(options.item)
-			console.log(this.order)
 			lookrate(this.order.goOrderNo).then(res => {
 				this.ratelist = res.data
 			})
diff --git a/pages/menttimeorder/menttimeorder.vue b/pages/menttimeorder/menttimeorder.vue
index e499724..8bc486e 100644
--- a/pages/menttimeorder/menttimeorder.vue
+++ b/pages/menttimeorder/menttimeorder.vue
@@ -82,7 +82,8 @@
 	} from '@/api/appointmenttime/appointmenttime.js'
 	import baseurl from '@/api/baseurl.js'
 	import {
-		getAppointmentDetailsInfo
+		getAppointmentDetailsInfo,
+		handCloseOrder
 	} from '@/api/ServiceDetails/ServiceDetails.js'
 	export default {
 		data() {
@@ -93,6 +94,8 @@
 				list: null,
 				orderNo: '',
 				timestamp: 0,
+				timecount: undefined,
+				Timers: null,
 			}
 		},
 		onShow() {
@@ -110,6 +113,23 @@
 			if (value2) {
 				that.openid = value2
 			}
+			this.getlist()
+			this.Timers = setInterval(() => {
+				this.timecount--;
+			}, 1000)
+		},
+		onUnload() {
+			clearInterval(this.Timers); //清除该函数
+		},
+		watch: { //监听
+			timecount() {
+				if (this.timecount <= 0) {
+					clearInterval(this.Timers); //清除该函数
+					handCloseOrder().then(res => {
+						this.list.orderStatus = 'CANCEL'
+					})
+				}
+			},
 		},
 		methods: {
 			//支付
@@ -187,9 +207,11 @@
 				getAppointmentDetailsInfo(this.orderNo).then(res => {
 					this.list = res.data
 					var ordertimes = this.list.createTime.replaceAll(/\-/gi, "/")
-					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 24)
+					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
 					var times = new Date().getTime() / 1000
 					this.timestamp = time - times
+					this.timecount = this.timestamp
+					this.timecount = 10
 				})
 			},
 		}
diff --git a/pages/night/night.vue b/pages/night/night.vue
index ce36b0b..37a38ae 100644
--- a/pages/night/night.vue
+++ b/pages/night/night.vue
@@ -28,16 +28,13 @@
 <script>
 	export default {
 		data() {
-			return {
-
-			};
+			return {};
 		},
 		methods: {
 			phone() {
 				var that = this
 				uni.getSystemInfo({
 					success: function(res) {
-						console.log(res)
 						if (res.platform == 'ios') {
 							uni.makePhoneCall({
 								phoneNumber: '053196558' //仅为示例
diff --git a/pages/orderDetails/orderDetails.scss b/pages/orderDetails/orderDetails.scss
index 2efea1e..df33d2c 100644
--- a/pages/orderDetails/orderDetails.scss
+++ b/pages/orderDetails/orderDetails.scss
@@ -259,6 +259,5 @@
 					word-break:break-all;
 				}
 			}
-
 		}
 	}
diff --git a/pages/orderDetails/orderDetails.vue b/pages/orderDetails/orderDetails.vue
index 14abd7b..d47a215 100644
--- a/pages/orderDetails/orderDetails.vue
+++ b/pages/orderDetails/orderDetails.vue
@@ -136,11 +136,12 @@
 		appletGoodsOrderPay
 	} from '@/api/confirmOrder/index.js'
 	import {
-		confirmReceipt
-	} from '@/api/CommodityOrder/index.js'
-	import {
+		confirmReceipt,
 		goodsOrder
 	} from '@/api/CommodityOrder/index.js'
+	import {
+		handCloseOrder
+	} from '@/api/ServiceDetails/ServiceDetails.js'
 	import baseurl from '@/api/baseurl.js'
 	export default {
 		data() {
@@ -155,8 +156,23 @@
 				pageNum: 1,
 				timestamp: 0,
 				goodsOrderId: null,
+				timecount: undefined,
+				Timers: null,
 			}
 		},
+		onUnload() {
+			clearInterval(this.Timers); //清除该函数
+		},
+		watch: { //监听
+			timecount() {
+				if (this.timecount <= 0) {
+					clearInterval(this.Timers); //清除该函数
+					handCloseOrder().then(res => {
+						this.order.orderStatus = 'CANCEL'
+					})
+				}
+			},
+		},
 		methods: {
 			//查看评价
 			golookrate() {
@@ -261,9 +277,11 @@
 				goodsOrder(this.patientId, this.orderStatus, this.goodsOrderId, this.pageSize, this.pageNum).then(res => {
 					this.order = res.rows[0]
 					var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
-					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 24)
+					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
 					var times = new Date().getTime() / 1000
 					this.timestamp = time - times
+					this.timecount = this.timeStamp
+					this.timecount = 10
 				})
 			},
 			//跳转售后详情
@@ -275,6 +293,9 @@
 		},
 		onShow() {
 			this.goodsOrderinfo()
+			this.Timers = setInterval(() => {
+				this.timecount--;
+			}, 1000)
 		},
 		onLoad(options) {
 			this.baseurl = baseurl
diff --git a/pages/payorderDetails/payorderDetails.vue b/pages/payorderDetails/payorderDetails.vue
index 82bb028..133796f 100644
--- a/pages/payorderDetails/payorderDetails.vue
+++ b/pages/payorderDetails/payorderDetails.vue
@@ -37,19 +37,21 @@
 							<text @tap='gorefundType'
 								v-if="order.orderType=='DIRECT_BUY'||order.orderType=='HEALTH_CONSULTATION'">申请退款</text>
 						</view>
-						<view class="refund" v-if="order.orderStatus=='WAIT_REFUND'" @tap='goAftersalesdetails(order)'>
+						<view class="refund" style="border: 1rpx solid #969394;" v-if="order.orderStatus=='WAIT_REFUND'"
+							@tap='goAftersalesdetails(order)'>
 							退款中
 						</view>
-						<view class="refund" v-if="order.orderStatus=='REFUNDED'">
+						<view class="refund" style="border: 1rpx solid #969394;" v-if="order.orderStatus=='REFUNDED'">
 							退款成功
 						</view>
 						<!-- <view class="refund" v-if="order.orderStatus=='RETURNED_GOODS'">
-							退货中
+							退货中 
 						</view> -->
-						<view class="refund" v-if="order.orderStatus=='WAIT_RETURNED_GOODS'">
+						<view class="refund" style="border: 1rpx solid #969394;"
+							v-if="order.orderStatus=='WAIT_RETURNED_GOODS'">
 							待退货
 						</view>
-						<view class="refund" v-if="order.orderStatus=='CANCEL'">
+						<view class="refund" style="border: 1rpx solid #969394;" v-if="order.orderStatus=='CANCEL'">
 							已取消
 						</view>
 					</view>
@@ -60,7 +62,7 @@
 				</view>
 			</view>
 		</view>
-		<view class="info" v-if="order.orderStatus != ' WAIT_PAY'&& order.orderStatus!='CANCEL'">
+		<view class="info">
 			<span>收货人：<text>{{order.receiver}}</text></span>
 			<span>联系电话：<text>{{order.phone}}</text></span>
 			<span v-if="order.orderType =='HEALTH_CONSULTATION'">咨询医生：<text>{{order.hospitalPersonName}}</text></span>
@@ -85,6 +87,9 @@
 	import {
 		appletGoodsOrderPay
 	} from '@/api/confirmOrder/index.js'
+	import {
+		handCloseOrder
+	} from '@/api/ServiceDetails/ServiceDetails.js'
 	import {
 		goodsOrder
 	} from '@/api/CommodityOrder/index.js'
@@ -101,8 +106,23 @@
 				pageNum: 1,
 				timestamp: 0,
 				goodsOrderId: null,
+				timecount: undefined,
+				Timers: null,
 			}
 		},
+		onUnload() {
+			clearInterval(this.Timers); //清除该函数
+		},
+		watch: { //监听
+			timecount() {
+				if (this.timecount <= 0) {
+					clearInterval(this.Timers); //清除该函数
+					handCloseOrder().then(res => {
+						this.order.orderStatus = 'CANCEL'
+					})
+				}
+			},
+		},
 		methods: {
 			//支付
 			pay() {
@@ -156,9 +176,11 @@
 				goodsOrder(this.patientId, this.orderStatus, goodsOrderId, this.pageSize, this.pageNum).then(res => {
 					this.order = res.rows[0]
 					var ordertimes = this.order.orderTime.replaceAll(/\-/gi, "/")
-					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 24)
+					var time = new Date(ordertimes).getTime() / 1000 + (60 * 60 * 2)
 					var times = new Date().getTime() / 1000
 					this.timestamp = time - times
+					this.timecount = this.timeStamp
+					this.timecount = 10
 				})
 			},
 			//跳转售后详情
@@ -183,8 +205,10 @@
 		},
 		onShow() {
 			this.goodsOrderinfo(this.goodsOrderId)
+			this.Timers = setInterval(() => {
+				this.timecount--;
+			}, 1000)
 		},
-		onUnload() {},
 	}
 </script>
 <style lang="scss">