|
@@ -111,7 +111,7 @@
|
|
listLookUp
|
|
listLookUp
|
|
} from '@/api/data'
|
|
} from '@/api/data'
|
|
import {
|
|
import {
|
|
- getOrderList, signPay
|
|
|
|
|
|
+ getOrderList, signPay, existPayPwd
|
|
} from '@/api/order.js'
|
|
} from '@/api/order.js'
|
|
export default {
|
|
export default {
|
|
components: {},
|
|
components: {},
|
|
@@ -278,11 +278,11 @@
|
|
},
|
|
},
|
|
// 支付剩余时间
|
|
// 支付剩余时间
|
|
filterTime (time) {
|
|
filterTime (time) {
|
|
- // console.log(time,'tttttt')
|
|
|
|
|
|
+ console.log(time,'tttttt')
|
|
let nowT = new Date().valueOf() // 现在时间戳
|
|
let nowT = new Date().valueOf() // 现在时间戳
|
|
let orderT = new Date(time).valueOf() // 下单时间戳
|
|
let orderT = new Date(time).valueOf() // 下单时间戳
|
|
let tt = (1800 * 1000) - (nowT - orderT) // 距离30分钟支付 相差时间戳
|
|
let tt = (1800 * 1000) - (nowT - orderT) // 距离30分钟支付 相差时间戳
|
|
- // console.log(tt,'tttttt')
|
|
|
|
|
|
+ console.log(tt,'tttttt')
|
|
return tt
|
|
return tt
|
|
},
|
|
},
|
|
|
|
|
|
@@ -339,6 +339,7 @@
|
|
signPay(params).then(res=>{
|
|
signPay(params).then(res=>{
|
|
this.btnLoading = false
|
|
this.btnLoading = false
|
|
if(res.status == 200) {
|
|
if(res.status == 200) {
|
|
|
|
+ this.showLeavePsw = false
|
|
// 跳转到支付完成界面
|
|
// 跳转到支付完成界面
|
|
uni.navigateTo({
|
|
uni.navigateTo({
|
|
url:"/pages/toOrder/payFinish?id=" + this.orderId
|
|
url:"/pages/toOrder/payFinish?id=" + this.orderId
|