bug fixes

src/pages/my/application/components/h5Pay.vue

@@ -10,8 +10,7 @@ export default {
   data() {
     return {
       order: { id: '', wx_prepay_id: '' },
-      openId: window.localStorage.getItem('open_id'),
-      errorMessage: ''
+      openId: window.localStorage.getItem('open_id')
     }
   },
   computed: {
@@ -21,15 +20,15 @@ export default {
   },
   methods: {
     // 获取订单
-    getOrder() {
+    getOrder(callback) {
       api.getOrder({ wx_open_id: this.openId, payment_method: 'WX_PAY' }).then(response => {
         const { data, error, message } = response
         if (error.toString() === '0') {
           this.order = data
           this.$emit('update', this.order)
+          callback && callback(this.order)
         } else {
-          this.errorMessage = message
-          this.$message.error(this.errorMessage)
+          this.$message.error(message)
         }
       })
     },
@@ -52,23 +51,19 @@ export default {
     },
     // 去支付
     handlePay() {
-      if (this.order.wx_prepay_id) {
+      this.getOrder(() => {
         window.location.href = `https://web-pay.ezijing.com/wxpay/h5?prepay_id=${this.order.wx_prepay_id}&open_id=${
           this.openId
         }&redirect_uri=${encodeURIComponent(this.pageUrl)}`
-      } else {
-        this.$message.error(this.errorMessage)
-      }
+      })
     }
   },
   beforeMount() {
-    if (this.openId) {
-      this.getOrder()
-      return
-    }
+    if (!this.openId) {
       const { code } = this.$route.query
       code ? this.getOpenId(code) : this.getCode()
     }
+  }
 }
 </script>