查询

ghsApp/src/admin/billing/toPay.vue

@@ -336,10 +336,10 @@ export default {
     checkResult(){
       let that = this
       uni.showLoading({mask:true})
-      getDetail({ id:this.orderId}).then(res=>{
+      codePayVerify({ id:this.orderId}).then(res=>{
         uni.hideLoading()
         if(res.code == 1){
-          if(res.data.payStatus == 1){
+          if(res.data && res.data.returnStatus == 'SUCCESS'){
             that.clearPolling()
             that.isPaymentProcessing = false
             this.$msg('付款成功')
@@ -347,9 +347,14 @@ export default {
                 that.payFinish()
             },1000)
           }else{
-            this.$msg('没有付款成功')
+            this.$msg(res.msg || '还没有付款成功')
           }
+        } else {
+            this.$msg(res.msg || '查询失败')
         }
+      }).catch(err => {
+          uni.hideLoading()
+          this.$msg('网络异常')
       })
     },
     goBack(){

ghsPad/src/pages/home/components/toPay.vue

@@ -128,10 +128,10 @@ export default {
         checkOrder(){
             let that = this
             uni.showLoading({mask:true})
-            getDetail({id:this.orderId}).then(res=>{
+            codePayVerify({id:this.orderId}).then(res=>{
                 uni.hideLoading()
                 if(res.code == 1){
-                    if(res.data.payStatus == 1){
+                    if(res.data && res.data.returnStatus == 'SUCCESS'){
                         // 手动查询付款成功，清除复查轮询并回调
                         that.clearPolling()
                         that.isPaymentProcessing = false
@@ -140,9 +140,14 @@ export default {
                             that.payFinish()
                         },900)
                     }else{
-                        this.$msg('还没有付款成功')
+                        this.$msg(res.msg || '还没有付款成功')
                     }
+                } else {
+                    this.$msg(res.msg || '查询失败')
                 }
+            }).catch(err => {
+                uni.hideLoading()
+                this.$msg('网络异常')
             })
         },
         requestCodePay(authCode){

hdApp/src/admin/billing/toPay.vue

@@ -261,10 +261,10 @@ export default {
     checkResult(){
       let that = this
       uni.showLoading({mask:true})
-      getDetail({ id:this.orderId}).then(res=>{
+      codePayVerify({ id:this.orderId}).then(res=>{
         uni.hideLoading()
         if(res.code == 1){
-          if(res.data.payStatus == 1){
+          if(res.data && res.data.returnStatus == 'SUCCESS'){
             that.clearPolling()
             that.isPaymentProcessing = false
             this.$msg('付款成功')
@@ -272,9 +272,14 @@ export default {
                 that.payFinish()
             },1000)
           }else{
-            this.$msg('没有付款成功')
+            this.$msg(res.msg || '还没有付款成功')
           }
+        } else {
+            this.$msg(res.msg || '查询失败')
         }
+      }).catch(err => {
+          uni.hideLoading()
+          this.$msg('网络异常')
       })
     },
     goBack(){

hdPad/src/pages/home/components/toPay.vue

@@ -109,10 +109,10 @@ export default {
         checkOrder(){
             let that = this
             uni.showLoading({mask:true})
-            getDetail({id:this.orderId}).then(res=>{
+            codePayVerify({id:this.orderId}).then(res=>{
                 uni.hideLoading()
                 if(res.code == 1){
-                    if(res.data.payStatus == 1){
+                    if(res.data && res.data.returnStatus == 'SUCCESS'){
                         // 手动查询付款成功，清除复查轮询并回调
                         that.clearPolling()
                         that.isPaymentProcessing = false
@@ -121,9 +121,14 @@ export default {
                             that.payFinish()
                         },900)
                     }else{
-                        this.$msg('还没有付款成功')
+                        this.$msg(res.msg || '还没有付款成功')
                     }
+                } else {
+                    this.$msg(res.msg || '查询失败')
                 }
+            }).catch(err => {
+                uni.hideLoading()
+                this.$msg('网络异常')
             })
         },
         requestCodePay(authCode){