no message

src/common/http/index.js

@@ -51,6 +51,9 @@ export const $http = (url, method, data, json, loadingBool = false, isExecute =
       return res
     }
     if (whiteCodes.indexOf(res.code) < 0) {
+      if (res.message == 'USERPAYING') {
+        return Promise.reject(new Error(res.message || 'Error'))
+      }
       if (res.code === 1001) {
         webLogin(true)
         return {}
@@ -93,11 +96,6 @@ export const $http = (url, method, data, json, loadingBool = false, isExecute =
               }
             }
           })
-          // uni.showToast({
-          //   title: res.message || 'Error',
-          //   icon: 'none',
-          //   duration: 1500
-          // })
         }
       }
       return Promise.reject(new Error(res.message || 'Error'))

src/packageMaterial/pages/newSale/pay.vue

@@ -89,17 +89,13 @@ export default {
   },
 
   methods: {
-    offTiming() {
-      if (this.timeout) {
-        clearTimeout(this.timeout)
-      }
-    },
     scan() {
       if (this.timeout) {
         clearTimeout(this.timeout)
       }
       this.scanCode()
     },
+
     back() {
       if (this.timeout) {
         clearTimeout(this.timeout)
@@ -111,6 +107,7 @@ export default {
         'reLaunch'
       )
     },
+
     getDetail(cb) {
       let url = '/pay/getOrder'
       let params = {}
@@ -171,26 +168,55 @@ export default {
           payType: 'WECHAT'
         })
         .then(res => {
-          if (this.state == 0) {
-            this.state = 1
-          }
-          if (res.data == 0) {
+          if (res.data) {
+            // 支付成功
             this.getDetail(() => {
-              this.state = 4
+              this.state = 2
             })
-          } else if (res.data == 1) {
+          } else {
+            // 支付失败
             this.getDetail(() => {
-              this.state = 2
+              this.state = 4
             })
+          }
+        })
+        .catch(res => {
+          // 等待支付
+          if (res.message === 'USERPAYING') {
+            if (this.state == 0) {
+              this.state = 1
+            }
+            this.getDetail__()
+          } else {
+            this.$tips(res.message)
+          }
+        })
+    },
+
+    offTiming() {
+      if (this.timeout) {
+        clearTimeout(this.timeout)
+      }
+    },
+
+    getDetail__(cb) {
+      this.$api
+        .post('/pay/getOrder', {
+          orderId: this.orderId
+        })
+        .then(res => {
+          this.detail = res.data
+          if (res.data.payStatus == 'PAID') {
+            this.state = 2
           } else {
             this.timeout = setTimeout(() => {
-              this.submitData(code)
+              this.getDetail__(cb)
             }, 1000)
           }
+          cb?.()
         })
-        .catch(res => {
-          this.$tips(res.message)
-        })
+        .catch(res => {})
+        .finally(res => {})
     },
 
     confirmPay() {

src/packageMaterial/pages/sale/pay.vue

@@ -90,17 +90,13 @@ export default {
   },
 
   methods: {
-    offTiming() {
-      if (this.timeout) {
-        clearTimeout(this.timeout)
-      }
-    },
     scan() {
       if (this.timeout) {
         clearTimeout(this.timeout)
       }
       this.scanCode()
     },
+
     back() {
       if (this.timeout) {
         clearTimeout(this.timeout)
@@ -112,15 +108,11 @@ export default {
         'reLaunch'
       )
     },
+
     getDetail(cb) {
-      let url = '',
-        params = {}
-      if (this.wbId) {
-        url = '/engin/material/detail'
-        params.id = this.orderId
-      } else {
-        url = '/pay/getOrder'
-        params.orderId = this.orderId
+      let url = '/pay/getOrder'
+      let params = {
+        orderId: this.orderId
       }
       this.$api
         .post(url, params)
@@ -183,26 +175,55 @@ export default {
           payType: 'WECHAT'
         })
         .then(res => {
-          if (this.state == 0) {
-            this.state = 1
-          }
-          if (res.data == 0) {
+          if (res.data) {
+            // 支付成功
             this.getDetail(() => {
-              this.state = 4
+              this.state = 2
             })
-          } else if (res.data == 1) {
+          } else {
+            // 支付失败
             this.getDetail(() => {
-              this.state = 2
+              this.state = 4
             })
+          }
+        })
+        .catch(res => {
+          // 等待支付
+          if (res.message === 'USERPAYING') {
+            if (this.state == 0) {
+              this.state = 1
+            }
+            this.getDetail__()
+          } else {
+            this.$tips(res.message)
+          }
+        })
+    },
+
+    offTiming() {
+      if (this.timeout) {
+        clearTimeout(this.timeout)
+      }
+    },
+
+    getDetail__(cb) {
+      this.$api
+        .post('/pay/getOrder', {
+          orderId: this.orderId
+        })
+        .then(res => {
+          this.detail = res.data
+          if (res.data.payStatus == 'PAID') {
+            this.state = 2
           } else {
             this.timeout = setTimeout(() => {
-              this.submitData(code)
+              this.getDetail__(cb)
             }, 1000)
           }
+          cb?.()
         })
-        .catch(res => {
-          this.$tips(res.message)
-        })
+        .catch(res => {})
+        .finally(res => {})
     },
 
     confirmPay() {