Merge branch 'liuxin' into develop

968ada85 · linxin · cbc5009c · e835e028 · 968ada85 · 968ada85
Commit 968ada85 authored Nov 25, 2019 by linxin
Show whitespace changes
Inline Side-by-side

Showing with 10 additions and 2 deletions

pay-entry.vue src/pages/pay/firstPay/pay-entry.vue +5 -1

pay-entry.vue src/pages/pay/payment/pay-entry.vue +5 -1

No files found.
--- a/src/pages/pay/firstPay/pay-entry.vue
+++ b/src/pages/pay/firstPay/pay-entry.vue
@@ -336,7 +336,11 @@ export default {
      vm.$post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
+          if (res.return_code !== '0000') {
+            hlsPopup.showLongCenter(res.error_message)
+          } else {
            window.open(res.paymentURL)
+          }
        } else {
          hlsPopup.showLongCenter(res.message)
        }

--- a/src/pages/pay/payment/pay-entry.vue
+++ b/src/pages/pay/payment/pay-entry.vue
@@ -276,7 +276,11 @@ export default {
      vm.$post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
+          if (res.return_code !== '0000') {
+            hlsPopup.showLongCenter(res.error_message)
+          } else {
            window.open(res.paymentURL)
+          }
        } else {
          hlsPopup.showLongCenter(res.message)
        }