瀏覽代碼

Merge pull request #364 from tron/lock/release-2.21.0/SCRM-5147

feat(SCRM-5147): 跳转支付宝ETCP 小程序调用顺序捋顺
John-Hong 1 年之前
父節點
當前提交
67260f8e60
共有 1 個文件被更改,包括 11 次插入11 次删除
  1. 11 11
      src/pages/parkingFee/mixins/parkingFeeDetail.js

+ 11 - 11
src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -316,6 +316,17 @@ export default {
           unlicensed,
           buildingId: parkInfo.buildingId
         });
+        // console.log('orderDetail', res);
+        if (res?.paymentType === 'NO_FEE_PAY') {
+          this.btnLoading = false;
+          this.isPay = false
+          this.clearOrderTimeEvent()
+          this.$router.replace({
+            path: this.getPagePath(),
+          });
+          // 支付成功
+          return
+        }
         // 如果是北京的ETCP 微信支付宝通用版
         if (this.isBKC()) {
           my.navigateTo({
@@ -339,17 +350,6 @@ export default {
           // this.$router.back()
           return
         }
-        // console.log('orderDetail', res);
-        if (res?.paymentType === 'NO_FEE_PAY') {
-          this.btnLoading = false;
-          this.isPay = false
-          this.clearOrderTimeEvent()
-          this.$router.replace({
-            path: this.getPagePath(),
-          });
-          // 支付成功
-          return
-        }
         if(res?.sessionId) {
           this.kerryPayment(res.sessionId);
           return