Skip to content

H
hls-xcmg-vue-app
Commit 968ada85 authored by linxin's avatar linxin
Browse files
Options

Merge branch 'liuxin' into develop

parents cbc5009c e835e028
Pipeline #3868 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 10 additions and 2 deletions
      src/pages/pay/firstPay/pay-entry.vue
      View file @ 968ada85
      ...@@ -336,7 +336,11 @@ export default { ...@@ -336,7 +336,11 @@ export default {
      vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
      if (res.result === 'S') { if (res.result === 'S') {
      window.open(res.paymentURL) if (res.return_code !== '0000') {
      hlsPopup.showLongCenter(res.error_message)
      } else {
      window.open(res.paymentURL)
      }
      } else { } else {
      hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
      } }
      ......
      src/pages/pay/payment/pay-entry.vue
      View file @ 968ada85
      ...@@ -276,7 +276,11 @@ export default { ...@@ -276,7 +276,11 @@ export default {
      vm.$post(url, param).then(function (res) { vm.$post(url, param).then(function (res) {
      vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading()
      if (res.result === 'S') { if (res.result === 'S') {
      window.open(res.paymentURL) if (res.return_code !== '0000') {
      hlsPopup.showLongCenter(res.error_message)
      } else {
      window.open(res.paymentURL)
      }
      } else { } else {
      hlsPopup.showLongCenter(res.message) hlsPopup.showLongCenter(res.message)
      } }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment