Merge pull request #345 from tron/lock/release-2.20.0/SCRM-4941

feat(KIP-10569): ETCP调试

src/pages/parkingFee/mixins/parkingFeeDetail.js

@@ -109,6 +109,7 @@ export default {
       source: state => state.source,
       parkMallCode: (state) => state.order.parkMallCode,
       isLogin: (state) => state.isLogin,
+      mallId: (state) => state.mallId,
     }),
     isNoLogin() {
       return JSON.stringify(this.member) === '{}' || !this.member
@@ -314,6 +315,29 @@ export default {
           unlicensed,
           buildingId: parkInfo.buildingId
         });
+        // 如果是北京的ETCP 微信支付宝通用版
+        if (this.isBKC()) {
+          my.navigateTo({
+            url: `/pages/package-parkingFee/etcpPayment?token=${encodeURIComponent(
+              res.token + '$'
+            )}&syncId=${encodeURIComponent(
+              res.syncId + '$'
+            )}&CarNumber=${encodeURIComponent(
+              res.vehicleNo + '$'
+            )}`,
+            complete: function (res) {
+              console.log('回调::', res)
+            },
+            success: function (res) {
+              console.log('跳转成功::', res)
+            },
+            fail: function (err) {
+              console.log('跳转失败::', res)
+            }
+          });
+          // this.$router.back()
+          return
+        }
         // console.log('orderDetail', res);
         if (res?.paymentType === 'NO_FEE_PAY') {
           this.btnLoading = false;
@@ -329,6 +353,7 @@ export default {
           this.kerryPayment(res.sessionId);
           return
         }
+        console.log('aaaa')
         // 如果接口返回异常，重置当前页面数据
         this.reCreateParkOrder()
       } catch (err) {
@@ -345,6 +370,7 @@ export default {
           // 如果接口返回异常，重置当前页面数据
           console.log('err::::', err)
           if (err.code !=='NO_FEE_NEED_TO_PAY') {
+            console.log('bbbb')
             this.reCreateParkOrder()
           } else {
             Dialog.alert({
@@ -365,6 +391,10 @@ export default {
         console.log(err);
       }
     },
+    isBKC() {
+      const lbsList = ['8a8884e77cc9e70a017cca4003590008','8a8485067ce4da2d017ce555e9b20000','8aaa80b47c784020017c78b205ba0023']
+      return lbsList.indexOf(this.mallId) > -1
+    },
     kerryPayment(session = '011cad54-735f-4e92-8f1b-f22bdfe073cd', payParams) {
       const platform = getPlatform();
       // console.log('platform:::', platform)
@@ -422,6 +452,7 @@ export default {
                   path: this.getPagePath(),
                 });
               } else {
+                console.log('cccc')
                 this.reCreateParkOrder();
               }
             } else {
@@ -460,6 +491,7 @@ export default {
                 // T-ODO: 在 qa 新发版前，只提示支付成功的信息(已处理成功信息)
                 if (options?.wxPayOver === 'fail') {
                   console.log('支付失败');
+                  console.log('dddd')
                   this.reCreateParkOrder();
                 } else {
                   this.btnLoading = false;
@@ -473,6 +505,7 @@ export default {
               });
             }
           } else {
+            console.log('eeee')
             this.reCreateParkOrder();
           }
         })
@@ -489,6 +522,7 @@ export default {
             }, 2900)
             return
           }
+          console.log('ffff')
           this.reCreateParkOrder();
         });
     },
@@ -507,9 +541,11 @@ export default {
           header: JSON.parse(uni.getStorageSync('handleUser')),
         })
         .then((res) => {
+          console.log('gggg')
           this.reCreateParkOrder();
         })
         .catch((err) => {
+          console.log('hhhh')
           this.reCreateParkOrder();
         });
     },