|
@@ -314,7 +314,6 @@
|
|
|
uni.showToast({
|
|
uni.showToast({
|
|
|
title: '支付成功!'
|
|
title: '支付成功!'
|
|
|
});
|
|
});
|
|
|
- that.$refs.popup.close()
|
|
|
|
|
that.getOrderDetailByOrderId(that.orderId)
|
|
that.getOrderDetailByOrderId(that.orderId)
|
|
|
}).catch((err)=>{
|
|
}).catch((err)=>{
|
|
|
this.requestStatus=false
|
|
this.requestStatus=false
|
|
@@ -354,6 +353,7 @@
|
|
|
uni.showLoading({
|
|
uni.showLoading({
|
|
|
title: '支付中'
|
|
title: '支付中'
|
|
|
});
|
|
});
|
|
|
|
|
+ this.$refs.popup.close()
|
|
|
let that =this
|
|
let that =this
|
|
|
if (this.curServiceTab===1){
|
|
if (this.curServiceTab===1){
|
|
|
// that.password = '';
|
|
// that.password = '';
|
|
@@ -379,7 +379,6 @@
|
|
|
title: '支付成功!'
|
|
title: '支付成功!'
|
|
|
});
|
|
});
|
|
|
that.getOrderDetailByOrderId(that.orderId)
|
|
that.getOrderDetailByOrderId(that.orderId)
|
|
|
- that.$refs.popup.close()
|
|
|
|
|
},
|
|
},
|
|
|
fail: res => {
|
|
fail: res => {
|
|
|
this.requestStatus=false
|
|
this.requestStatus=false
|
|
@@ -388,7 +387,6 @@
|
|
|
content: '支付失败',
|
|
content: '支付失败',
|
|
|
showCancel: false
|
|
showCancel: false
|
|
|
});
|
|
});
|
|
|
- that.$refs.popup.close()
|
|
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
})
|
|
})
|
|
@@ -498,9 +496,9 @@
|
|
|
},
|
|
},
|
|
|
payItem(num){
|
|
payItem(num){
|
|
|
console.log('this.userInfo.balance',this.userInfo.balance*1)
|
|
console.log('this.userInfo.balance',this.userInfo.balance*1)
|
|
|
- console.log('this.price',this.allPrice*1)
|
|
|
|
|
|
|
+ console.log('this.price',this.order.totalAmount*1)
|
|
|
|
|
|
|
|
- if (this.userInfo.balance*1 < this.allPrice*1 && num == 1){
|
|
|
|
|
|
|
+ if (this.userInfo.balance*1 < this.order.totalAmount*1 && num == 1){
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
this.curServiceTab = num
|
|
this.curServiceTab = num
|