Merge remote-tracking branch 'origin/04-27' into dev

# Conflicts:
#	pages/ServiceDetails/ServiceDetails.scss
#	pages/night/night.vue

api/ServiceDetails/ServiceDetails.js

@@ -15,3 +15,9 @@ export function addAppointmentEvaluate(data) {
 		data
 	})
 }
+export function handCloseOrder() {
+	return request({
+		url: `/monitor/payTask/handCloseOrder`,
+		method: 'GET'
+	})
+}

api/appointmenttime/appointmenttime.js

@@ -1,6 +1,5 @@
 import request from "../request.js"
 
-
 export function getAppPatientList(id) {
 	return request({
 		url: `/nurseApp/login/getAppPatientList?patientId=${id}`,
@@ -8,7 +7,6 @@ export function getAppPatientList(id) {
 	})
 }
 
-
 export function getAppStationItemInfo(stationId, stationItemId, stationItemPriceId) {
 	return request({
 		url: `/nurseApp/login/getAppStationItemInfo?stationId=${stationId}&stationItemId=${stationItemId}&stationItemPriceId=${stationItemPriceId}`,
@@ -23,7 +21,6 @@ export function submitAppointment(data) {
 	})
 }
 // 小程序预约服务支付接口
-
 export function appletAppointmentOrderPay(data) {
 	return request({
 		url: `/nurseApp/weChatPayment/appletAppointmentOrderPay`,
@@ -31,5 +28,3 @@ export function appletAppointmentOrderPay(data) {
 		data
 	})
 }
-
-

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 ==

manifest.json

@@ -1,5 +1,5 @@
 {
-    "name" : "nurseWeChatAppletUI",
+    "name" : "泉医到家",
     "appid" : "__UNI__1200110",
     "description" : "",
     "versionName" : "1.0.0",

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)

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)

pages/ServiceDetails/ServiceDetails.scss

@@ -279,7 +279,6 @@
 					float: right;
 					margin-right: 30rpx;
 				}
-
 			}
 		}
-}
+	}

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()
 		},
@@ -173,9 +179,16 @@
 				that.patientId = value
 				that.openid = value2
 			}
-			this.getlist()
 		},
 		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 +336,15 @@
 				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
+					if (this.timestamp >= 0) {
+						this.timecount = this.timestamp
+						this.Timers = setInterval(() => {
+							this.timecount--;
+						}, 1000)
+					}
 				})
 			},
 			cancelorderment() {

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
 			})

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: null,
+				Timers: null,
 			}
 		},
 		onShow() {
@@ -100,8 +103,8 @@
 		},
 		onLoad(options) {
 			var that = this
-			this.baseurl = baseurl
 			this.orderNo = JSON.parse(options.list).orderNo
+			this.baseurl = baseurl
 			const value = uni.getStorageSync('patientId');
 			if (value) {
 				that.patientId = value
@@ -111,6 +114,19 @@
 				that.openid = value2
 			}
 		},
+		onUnload() {
+			clearInterval(this.Timers); //清除该函数
+		},
+		watch: { //监听
+			timecount() {
+				if (this.timecount <= 0) {
+					clearInterval(this.Timers); //清除该函数
+					handCloseOrder().then(res => {
+						this.list.orderStatus = 'CANCEL'
+					})
+				}
+			},
+		},
 		methods: {
 			//支付
 			buy() {
@@ -187,9 +203,15 @@
 				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
+					if (this.timestamp >= 0) {
+						this.timecount = this.timestamp
+						this.Timers = setInterval(() => {
+							this.timecount--;
+						}, 1000)
+					}
 				})
 			},
 		}

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' //仅为示例

pages/orderDetails/orderDetails.scss

@@ -259,6 +259,5 @@
 					word-break:break-all;
 				}
 			}
-
 		}
 	}

pages/orderDetails/orderDetails.vue

@@ -136,11 +136,12 @@
 		appletGoodsOrderPay
 	} from '@/api/confirmOrder/index.js'
 	import {
-		confirmReceipt
+		confirmReceipt,
-	} from '@/api/CommodityOrder/index.js'
-	import {
 		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,15 @@
 				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
+					if (this.timestamp >= 0) {
+						this.timecount = this.timestamp
+						this.Timers = setInterval(() => {
+							this.timecount--;
+						}, 1000)
+					}
 				})
 			},
 			//跳转售后详情

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,15 @@
 				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
+					if (this.timestamp >= 0) {
+						this.timecount = this.timestamp
+						this.Timers = setInterval(() => {
+							this.timecount--;
+						}, 1000)
+					}
 				})
 			},
 			//跳转售后详情
@@ -184,7 +210,6 @@
 		onShow() {
 			this.goodsOrderinfo(this.goodsOrderId)
 		},
-		onUnload() {},
 	}
 </script>
 <style lang="scss">