From 8676f3af3ed4b732a33aa0b523bae30acc35adc9 Mon Sep 17 00:00:00 2001
From: liuqimichale <123456lq>
Date: Wed, 31 Mar 2021 13:38:52 +0800
Subject: [PATCH] payType  34

---
 src/components/orderPay.vue   |  5 ++---
 src/components/parkRecord.vue |  7 ++-----
 src/utils/utils.js            | 21 +++++++++++++++++++++
 3 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue
index 009a22e..f11543c 100644
--- a/src/components/orderPay.vue
+++ b/src/components/orderPay.vue
@@ -40,8 +40,8 @@
 </template>
 
 <script>
-import CryptoJS from '../utils/AES.js'
-let Base64 = require('js-base64').Base64
+// import CryptoJS from '../utils/AES.js'
+// let Base64 = require('js-base64').Base64
 
 import { aliPay, getOpenId, vxPayQuery, bankH5Pay } from '@/api/orderPay/orderPay'
 
@@ -80,7 +80,6 @@ export default {
   methods: {
     getCode() {
       var appID = this.$utils.myVxAppId;
-      alert(appID)
       var code = this.getUrlParam('code');
       var local = window.location.href;
       if (code == null || code === '') {
diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue
index 43dd2f8..529f71d 100644
--- a/src/components/parkRecord.vue
+++ b/src/components/parkRecord.vue
@@ -258,9 +258,7 @@ export default {
       }
     },
     toPayCurrent(i, num) { // 缴纳本次在停费用
-
       var salt = this.$utils.myCommonSalt(32);
-
       var params = {
         app_id: this.$utils.myVarAppid,
         deviceInfo: this.$utils.myDeviceInfo,
@@ -269,7 +267,6 @@ export default {
         orderId: i.orderId,
         payOrderType: '101',
         terminalSource: '3',
-
       }
       params.sign = this.$utils.signObject(params)
       appApplyParkOut(params).then(response => {
@@ -282,7 +279,7 @@ export default {
             deviceInfo: this.$utils.myDeviceInfo,
             salt: salt,
             sign_type: "md5",
-            payType: 4,
+            payType: this.$utils.clientBrowsePayType(),
             appId: this.$utils.myVxAppId,
             orderId: i.orderId,
             terminalSource: '7',
@@ -339,7 +336,7 @@ export default {
         appId: this.$utils.myVxAppId,
         orderIds: list,
         terminalSource: '7',
-        payType: 4,
+        payType: this.$utils.clientBrowsePayType(),
         orgId: this.$utils.myOrgId,
       }
       jsondata.sign = this.$utils.signObject(jsondata)
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 6650c22..ae759a5 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -91,6 +91,27 @@ export default {
       return '支付宝'
     }
   },
+
+  // 1:支付宝 2：微信 3：银联 10:H5   4微信公众号   34 农行
+  clientBrowsePayType: function () { // 判断客户端
+    if (/MicroMessenger/.test(window.navigator.userAgent)) {
+      console.log("微信客户端");
+      return '4'
+    } else if (/AlipayClient/.test(window.navigator.userAgent)) {
+      console.log("支付宝客户端");
+      return '1'
+    } else if (/BankabciPhone/.test(window.navigator.userAgent)) {
+      console.log("农行客户端");
+      return '34'
+    }else if (/BankabcAndroid/.test(window.navigator.userAgent)) {
+      console.log("农行客户端");
+      return '34'
+    }else {
+      console.log("其他浏览器");
+      return '1'
+    }
+  },
+
   // 0eca8f5373ca4866aec2f8e9d9367104  老的id
   // 14318527b13840c2a4af63fef52c2d6e 老的签名
 
--
libgit2 0.21.4