|
@@ -238,6 +238,11 @@
|
|
},
|
|
},
|
|
methods: {
|
|
methods: {
|
|
pageInit(data){
|
|
pageInit(data){
|
|
|
|
+ // 计算待付款剩余倒计时
|
|
|
|
+ if(data.billStatus== 'WAIT_PAY'){
|
|
|
|
+ data.timestamp = (new Date(data.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
|
|
|
|
+ }
|
|
|
|
+ data.payOk = data.payOnlineFlag==1&&data.payInfo&&data.payInfo.payState=='FINISH'
|
|
this.info = data
|
|
this.info = data
|
|
if(this.info.payInfo){
|
|
if(this.info.payInfo){
|
|
this.info.payInfo.payDate = moment(this.info.payInfo.payDate).format('YYYY-MM-DD hh:mm:ss')
|
|
this.info.payInfo.payDate = moment(this.info.payInfo.payDate).format('YYYY-MM-DD hh:mm:ss')
|
|
@@ -262,10 +267,6 @@
|
|
const data = res.data ? res.data.list[0] : null
|
|
const data = res.data ? res.data.list[0] : null
|
|
if(data){
|
|
if(data){
|
|
data.billStatus = data.billStatus == 'WAIT_AUDIT'&&data.payOnlineFlag==1&&data.payInfo&&data.payInfo.payState=='WAIT'?'WAIT_PAY':data.billStatus
|
|
data.billStatus = data.billStatus == 'WAIT_AUDIT'&&data.payOnlineFlag==1&&data.payInfo&&data.payInfo.payState=='WAIT'?'WAIT_PAY':data.billStatus
|
|
- // 计算待付款剩余倒计时
|
|
|
|
- if(data.billStatus== 'WAIT_PAY'){
|
|
|
|
- data.timestamp = (new Date(data.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
|
|
|
|
- }
|
|
|
|
this.pageInit(data)
|
|
this.pageInit(data)
|
|
}
|
|
}
|
|
})
|
|
})
|
|
@@ -313,7 +314,7 @@
|
|
let _this = this
|
|
let _this = this
|
|
uni.showModal({
|
|
uni.showModal({
|
|
title: '提示',
|
|
title: '提示',
|
|
- content: '确定取消订单吗?',
|
|
|
|
|
|
+ content: !item.payOk ? '确定取消订单吗?':'取消后订单金额将于1-3个工作日到账(原路返回)?',
|
|
success: function (res) {
|
|
success: function (res) {
|
|
if (res.confirm) {
|
|
if (res.confirm) {
|
|
purchaseCancel({purchaseSn:_this.purchaseSn}).then(res => {
|
|
purchaseCancel({purchaseSn:_this.purchaseSn}).then(res => {
|