xinyilu/nurseWeChatAppletUI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
曹辉 2023-04-27 14:19:41 +08:00
parent a72c26afe0
commit e48f9de4bb
11 changed files with 114 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
api/ServiceDetails/ServiceDetails.js
View File

@ -14,4 +14,10 @@ export function addAppointmentEvaluate(data) {
method: 'POST',
data
})
}
}
export function handCloseOrder() {
return request({
url: `/monitor/payTask/handCloseOrder`,
method: 'GET'
})
}

1
api/request.js
View File

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

4
pages/CommodityOrder/CommodityOrder.vue
View File

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

4
pages/Nursingstationserviceorder/Nursingstationserviceorder.vue
View File

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

23
pages/ServiceDetails/ServiceDetails.vue
View File

@ -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() {

1
pages/lookrate/lookrate.vue
View File

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

26
pages/menttimeorder/menttimeorder.vue
View File

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

5
pages/night/night.vue
View File

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

1
pages/orderDetails/orderDetails.scss
View File

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

29
pages/orderDetails/orderDetails.vue
View File

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

40
pages/payorderDetails/payorderDetails.vue
View File

@ -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">