diff --git a/subPackages/my/my-drug/drug-list.vue b/subPackages/my/my-drug/drug-list.vue index a661cd8..4041834 100644 --- a/subPackages/my/my-drug/drug-list.vue +++ b/subPackages/my/my-drug/drug-list.vue @@ -134,7 +134,7 @@ {{item.status==5&&'退款中' || item.status==4&&'已退款' }} - + 查看物流 diff --git a/subPackages/my/record-pay.vue b/subPackages/my/record-pay.vue index df729d8..c386459 100644 --- a/subPackages/my/record-pay.vue +++ b/subPackages/my/record-pay.vue @@ -422,49 +422,59 @@ if (res.data.errcode === 0) { - uni.requestPayment({ - provider: res.data.data.appId, - timeStamp: res.data.data.timestamp, - nonceStr: res.data.data.nonceStr, - package: res.data.data.package, - signType: res.data.data.signType, - paySign: res.data.data.paySign, - success: (res) => { - console.log('success:' + JSON.stringify(res)); - setTimeout(() => { - that.flag = false - uni.navigateTo({ - url: '/subPackages/my/my-drug/drug-list' - }) - - uni.hideLoading(); - }, 300) - }, - fail: function(err) { - that.flag = false - console.log('fail:' + JSON.stringify(err)); - uni.showToast({ - title: '支付失败', - duration: 1500, - mask: false, - icon: 'error' - }) - setTimeout(() => { - if (res.data.msg) { - uni.showToast({ - title: res.data.msg, - duration: 1500, - mask: false, - icon: 'error' - }) + if (res.data.data.is_pay !== 1) { + uni.requestPayment({ + provider: res.data.data.appId, + timeStamp: res.data.data.timestamp, + nonceStr: res.data.data.nonceStr, + package: res.data.data.package, + signType: res.data.data.signType, + paySign: res.data.data.paySign, + success: (res) => { + console.log('success:' + JSON.stringify(res)); + setTimeout(() => { that.flag = false - return - } - uni.hideLoading(); - that.flag = true - }, 500) - } - }) + uni.navigateTo({ + url: '/subPackages/my/my-drug/drug-list' + }) + + uni.hideLoading(); + }, 300) + }, + fail: function(err) { + that.flag = false + console.log('fail:' + JSON.stringify(err)); + uni.showToast({ + title: '支付失败', + duration: 1500, + mask: false, + icon: 'error' + }) + setTimeout(() => { + if (res.data.msg) { + uni.showToast({ + title: res.data.msg, + duration: 1500, + mask: false, + icon: 'error' + }) + that.flag = false + return + } + uni.hideLoading(); + that.flag = true + }, 500) + } + }) + } + setTimeout(() => { + that.flag = false + uni.navigateTo({ + url: '/subPackages/my/my-drug/drug-list' + }) + + uni.hideLoading(); + }, 300) }else{ uni.hideLoading(); that.$refs.uToast.show({