From d42b99adce3456ef4b2533c94310770205255b80 Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Thu, 13 Jul 2023 10:10:27 +0800
Subject: [PATCH] 宣化聚合 通道码支付

---
 config/index.js               |  8 ++++----
 src/api/orderPay/orderPay.js  |  8 ++++++++
 src/components/dynCodePay.vue | 36 +++++++++++++++++++++++++++++++-----
 src/components/pay.vue        | 36 +++++++++++++++++++++++++++++++-----
 src/utils/request.js          |  2 +-
 src/utils/utils.js            |  9 ++++++---
 6 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/config/index.js b/config/index.js
index a9addb1..5e0ea22 100644
--- a/config/index.js
+++ b/config/index.js
@@ -8,7 +8,7 @@ module.exports = {
   dev: {
 
     // Paths
-    assetsSubDirectory: 'static',
+    assetsSubDirectory: 'td',
     assetsPublicPath: '/',
     proxyTable: {},
     // proxyTable: {
@@ -48,11 +48,11 @@ module.exports = {
 
   build: {
     // Template for index.html
-    index: path.resolve(__dirname, '../dist/index.html'),
+    index: path.resolve(__dirname, '../td/td.html'),
 
     // Paths
-    assetsRoot: path.resolve(__dirname, '../dist'),
-    assetsSubDirectory: 'static',
+    assetsRoot: path.resolve(__dirname, '../td'),
+    assetsSubDirectory: 'td',
     assetsPublicPath: './',
 
     /**
diff --git a/src/api/orderPay/orderPay.js b/src/api/orderPay/orderPay.js
index c24de4b..d86187e 100644
--- a/src/api/orderPay/orderPay.js
+++ b/src/api/orderPay/orderPay.js
@@ -35,6 +35,14 @@ export function bankH5Pay(params) {  // 农行
 }
 
 
+export function doPay(params) {  // 支付信息获取
+  return request({
+    url: 'allInPay/doPay',
+    method: 'post',
+    data: params
+  })
+}
+
 
 
 
diff --git a/src/components/dynCodePay.vue b/src/components/dynCodePay.vue
index 40f89f2..d754617 100644
--- a/src/components/dynCodePay.vue
+++ b/src/components/dynCodePay.vue
@@ -34,7 +34,7 @@
 
     </ul>
     <div style="padding: 20px 18px">
-      <div class="toPay" @click="toPay">{{clientBrowser}}支付</div>
+      <div class="toPay" @click="doPay">{{clientBrowser}}支付</div>
     </div>
 
     <div v-if="appOrderTimeout.length>0">
@@ -53,7 +53,7 @@
 <script>
 
 // let Base64 = require('js-base64').Base64
-import { aliPay, getOpenId, vxPayQuery, bankH5Pay } from "@/api/orderPay/orderPay";
+import { aliPay, getOpenId, vxPayQuery, bankH5Pay, doPay } from "@/api/orderPay/orderPay";
 export default {
   name: "dynCodePay",
   data() {
@@ -93,9 +93,9 @@ export default {
     // console.log(this.orderId)
     // this.appOrderTimeout = this.$route.query.appOrderTimeout
     this.urlAppid = this.$route.query.appId;
-    if (this.clientBrowser == "微信") {
-      this.webAppCode = this.getCode();
-    }
+    // if (this.clientBrowser == "微信") {
+    //   this.webAppCode = this.getCode();
+    // }
   },
   methods: {
     getCode() {
@@ -114,6 +114,32 @@ export default {
       if (r != null) return unescape(r[2]);
       return null;
     },
+    doPay(){
+      console.log(this.$utils.clientBrowser())
+      let me = this
+      var jsondata = {
+        appId:me.$utils.xuanhuaAppid,
+        carNumber: me.carNumber,
+        orderActFee: me.arrearageActFee, // 应收
+        orderBigType: '100',  // 订单大类型  100：停车订单     200：充值订单    300：会员卡订单
+        orderTotalFee: me.orderFee,  // 实收
+        payOrderType: this.paySrcType, // 支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        paySource: '3',
+        //支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        paySrcType: this.paySrcType,
+        payType: this.$utils.clientBrowser()=='支付宝'?'37':'36',  // 36微信    37支付宝
+        rltOrderId:  this.orderId,
+        sourceType: '3',
+        orgId: this.$utils.myOrgId,
+        terminalSource: this.$utils.commonTerminalSource,
+      };
+      jsondata.sign = this.$utils.signObject(jsondata)
+
+      doPay(jsondata).then(response => {
+        console.log(response.data.payinfo)
+        window.location.href = response.data.payinfo
+      })
+    },
     toPay() {
       let me = this;
       let _order = [];
diff --git a/src/components/pay.vue b/src/components/pay.vue
index 5626204..e2ea1d3 100644
--- a/src/components/pay.vue
+++ b/src/components/pay.vue
@@ -44,7 +44,7 @@
 
     </ul>
     <div style="padding: 20px 18px">
-      <div class="toPay" @click="toPay">{{clientBrowser}}支付</div>
+      <div class="toPay" @click="doPay">{{clientBrowser}}支付</div>
     </div>
 
     <div v-if="appOrderTimeout.length>0">
@@ -63,7 +63,7 @@
 <script>
 
 let Base64 = require("js-base64").Base64;
-import { aliPay, getOpenId, vxPayQuery, bankH5Pay } from "@/api/orderPay/orderPay";
+import { aliPay, getOpenId, vxPayQuery, bankH5Pay, doPay } from "@/api/orderPay/orderPay";
 export default {
   name: "dynCodePay",
   data() {
@@ -105,11 +105,37 @@ export default {
     this.orderId = this.$route.query.orderId;
     // console.log(this.orderId)
     // this.appOrderTimeout = this.$route.query.appOrderTimeout
-    if (this.clientBrowser == "微信") {
-      this.webAppCode = this.getCode();
-    }
+    // if (this.clientBrowser == "微信") {
+    //   this.webAppCode = this.getCode();
+    // }
   },
   methods: {
+    doPay(){
+      console.log(this.$utils.clientBrowser())
+      let me = this
+      var jsondata = {
+        appId:me.$utils.xuanhuaAppid,
+        carNumber: me.carNumber,
+        orderActFee:this.$route.query.orderTotalFee, // 应收
+        orderBigType: '100',  // 订单大类型  100：停车订单     200：充值订单    300：会员卡订单
+        orderTotalFee:this.$route.query.orderFee,  // 实收
+        payOrderType: this.paySrcType, // 支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        paySource: '3',
+        //支付单来源 101：停车付款单 102：停车预付单 103：停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+        paySrcType: this.paySrcType,
+        payType: this.$utils.clientBrowser()=='支付宝'?'37':'36',  // 36微信    37支付宝
+        rltOrderId:  this.orderId,
+        sourceType: '3',
+        orgId: this.$utils.myOrgId,
+        terminalSource: this.$utils.commonTerminalSource,
+      };
+      jsondata.sign = this.$utils.signObject(jsondata)
+
+      doPay(jsondata).then(response => {
+        console.log(response.data.payinfo)
+        window.location.href = response.data.payinfo
+      })
+    },
     getCode() {
       var appID = this.$utils.myVxAppId;
       // alert(appID)
diff --git a/src/utils/request.js b/src/utils/request.js
index 62ef423..1028934 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -10,7 +10,7 @@ const service = axios.create({
 
   //  https://dev.renniting.cn/pay/  赤峰农行测试环境
 
-  baseURL: 'https://pay.ccccitd.cc', // url = base url + request url
+  baseURL: 'http://7pz385.natappfree.cc', // url = base url + request url
   // withCredentials: true, // send cookies when cross-domain requests
   timeout: 6000 // request timeout
 })
diff --git a/src/utils/utils.js b/src/utils/utils.js
index 950a1aa..3690a3c 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -173,7 +173,7 @@ export default {
 
 
 
-  myVarAppid:'0eca8f5373ca4866aec2f8e9d9367104',// 公共请求Appid
+  myVarAppid:'lrpo55tmveqe07w3gpovzgx34pdez7eh',// 公共请求Appid
 
   myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息
 
@@ -181,6 +181,9 @@ export default {
 
   myOrgId: '10120',
 
+  xuanhuaAppid:'00276515',
+  commonTerminalSource:'7',
+
   myGetSign: function (objb) { // 获取签名
     var compare = function (obj1, obj2) {
       var val1 = obj1.keyname;
@@ -194,13 +197,13 @@ export default {
       }
     }
     objb.sort(compare);
-    var strmd5 = '14318527b13840c2a4af63fef52c2d6e';
+    var strmd5 = 'gz8wfwd0gn1etamjjhzey1ggcz78pfvd';
     for(var i=0;i<objb.length;i++){
       if(objb[i].value != null&&objb[i].value != ''){
         strmd5 += objb[i].keyname+objb[i].value;
       }
     }
-    strmd5 += '14318527b13840c2a4af63fef52c2d6e';
+    strmd5 += 'gz8wfwd0gn1etamjjhzey1ggcz78pfvd';
     // console.log('strmd5-------->'+strmd5);
     strmd5 = md5(strmd5);
     strmd5=strmd5.toUpperCase();
--
libgit2 0.21.4