|
@@ -261,6 +261,7 @@
|
|
|
},
|
|
|
// 立即支付
|
|
|
payOrder(item){
|
|
|
+ const _this = this
|
|
|
this.$store.state.vuex_tempOrderData = item
|
|
|
uni.showLoading({
|
|
|
title: '加载中...'
|
|
@@ -271,9 +272,24 @@
|
|
|
bizType:'PURCHASE',
|
|
|
payUserOpenId: this.$store.state.vuex_openid || uni.getStorageSync('openid')
|
|
|
}).then(res=>{
|
|
|
- this.showPopu = true
|
|
|
- this.payData = res.data?res.data.payRequestRest:null
|
|
|
uni.hideLoading()
|
|
|
+ if(res.status == 200){
|
|
|
+ this.showPopu = true
|
|
|
+ this.payData = res.data?res.data.payRequestRest:null
|
|
|
+ }else{
|
|
|
+ if(res.data.errorCode == 'VALIDATE_F_00001'){
|
|
|
+ uni.showModal({
|
|
|
+ showCancel:false,
|
|
|
+ title: '提示',
|
|
|
+ content: '下单人员与支付人员不一致,请在订单详情核实后再支付',
|
|
|
+ success: function (res) {
|
|
|
+ if (res.confirm) {
|
|
|
+ _this.viewRow(item)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
+ }
|
|
|
})
|
|
|
},
|
|
|
// 付款成功,isOk: false 取消支付或支付失败,true 支付完成
|
|
@@ -387,9 +403,6 @@
|
|
|
},
|
|
|
// 详细页
|
|
|
viewRow(item){
|
|
|
- if(item.billStatus== 'WAIT_PAY'){
|
|
|
- item.timestamp = (new Date(item.createDate.replace(/-/g,'/')).getTime() + 1800000 - new Date().getTime())/1000
|
|
|
- }
|
|
|
this.$store.state.vuex_tempOrderData = item
|
|
|
uni.navigateTo({
|
|
|
url: "/pagesB/procureOrder/orderDetail"
|