From f36d25ac22a8c273e0ed9a1c8e8d2606f8d02752 Mon Sep 17 00:00:00 2001 From: liugongyu <290219706@qq.com> Date: Wed, 24 Aug 2022 12:07:49 +0800 Subject: [PATCH] 西城家园 --- src/utils/request.js | 2 +- src/utils/utils.js | 12 +++++------- src/views/parkPay/orderPay.vue | 15 ++++++++------- src/views/parkPay/parkRecord.vue | 16 ++++++++-------- src/views/parkPay/plateNumber.vue | 24 ++++++++++++------------ 5 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/utils/request.js b/src/utils/request.js index b6329a4..3c4ca86 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,7 +5,7 @@ import axios from 'axios' const service = axios.create({ // https://dev.renniting.cn/pay/ 赤峰测试 // http://pay.service.renniting.cn/ 赤峰 - baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url + baseURL: 'http://pay.service.renniting.cn/v1', // 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 b84c44d..f185679 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -145,14 +145,12 @@ export default { // ud8yq5tv0inxupc05xfeau39jywlqoj2 新的id // ny1u72b6k374sg379z0kqjgfxe2ycnpw 新的签名 - myVarAppid:'65grtq5tv0wewec05xfeau39jyghhjm',// 公共请求Appid + myVarAppid:'ud8yq5tv0inxupc05xfeau39jywlqoj2',// 公共请求Appid myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 - myVxAppId: 'wx2af2bab90d433c86', - // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 - // 微信赤峰 appid wx2af2bab90d433c86 - // 黄石 appid wxa1a66cc7d263afe6 + myVxAppId: 'wx78702b90dadb9586', + myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079 @@ -169,13 +167,13 @@ export default { } } objb.sort(compare); - var strmd5 = 'dfdf2b6k37r5y79z0kqjgfxe2wet3434'; + var strmd5 = 'ny1u72b6k374sg379z0kqjgfxe2ycnpw'; for(var i=0;i'+strmd5); strmd5 = md5(strmd5); strmd5=strmd5.toUpperCase(); diff --git a/src/views/parkPay/orderPay.vue b/src/views/parkPay/orderPay.vue index 8612249..a8a0914 100644 --- a/src/views/parkPay/orderPay.vue +++ b/src/views/parkPay/orderPay.vue @@ -22,8 +22,8 @@ -

停车引导员工号（非必填）

- + +
@@ -125,15 +125,16 @@ export default { if (this.clientBrowser == '支付宝') { // 支付宝支付 + console.log('1') let me = this var aliParams = {}; aliParams.orderId = this.orderId; aliParams.carNumber = this.carNumber; - aliParams.payType = 1;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - aliParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 + aliParams.payType = '1';// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 + aliParams.terminalSource = '3';//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 aliParams.paySrcType = this.paySrcType;//101停车支付 aliParams.orgId = this.$utils.myOrgId - aliParams.backType = 2 + aliParams.backType = '2' aliParams.backDeveloperCode = this.tollNumber aliParams.recordArreaInfos = JSON.stringify(this.orderId); console.log(aliParams) @@ -197,7 +198,7 @@ export default { wxParams.backType = 2, wxParams.orgId = this.$utils.myOrgId, wxParams.payType = 4;// 1:支付宝 2：微信 3：银联 10:H5 4微信公众号 - wxParams.terminalSource = 7;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 + wxParams.terminalSource = 3;//请求端来源 1： 任你停 2：pda 3：微信公共号 7:H5扫码 10页面支付 wxParams.carNumber = this.carNumber; wxParams.paySrcType = this.paySrcType;//101停车支付 wxParams.recordArreaInfos = JSON.stringify(orderIdData); @@ -268,7 +269,7 @@ export default { pageNum: 1, pageSize: 10000, parkState: 10, - terminalSource: 7, + terminalSource: 3, carNumber: me.carNumber, app_id: me.$utils.myVarAppid, deviceInfo: me.$utils.myDeviceInfo, diff --git a/src/views/parkPay/parkRecord.vue b/src/views/parkPay/parkRecord.vue index 48031f7..d2534b5 100644 --- a/src/views/parkPay/parkRecord.vue +++ b/src/views/parkPay/parkRecord.vue @@ -188,13 +188,13 @@ export default { deviceInfo: this.$utils.myDeviceInfo, salt: salt, sign_type: "md5", - pageNum: 1, - pageSize: 1000, - parkState: 10, - terminalSource: 7, + pageNum: "1", + pageSize: "1000", + parkState: "10", + terminalSource:"3", carNumber: this.carNumber, - carNumberColor: this.carColor, - orgId: this.$utils.myOrgId, + // carNumberColor: this.carColor, + // orgId: this.$utils.myOrgId, } jsondata.sign = this.$utils.signObject(jsondata) @@ -303,7 +303,7 @@ export default { payType: this.$utils.clientBrowsePayType(), appId: this.$utils.myVxAppId, orderId: i.orderId, - terminalSource: '7', + terminalSource: '3', parkCode: i.parkCode, carNumber: this.carNumber, } @@ -357,7 +357,7 @@ export default { sign_type: "md5", appId: this.$utils.myVxAppId, orderIds: list, - terminalSource: '7', + terminalSource: '3', payType: this.$utils.clientBrowsePayType(), orgId: this.$utils.myOrgId, backDeveloperCode: this.$route.query.backDeveloperCode diff --git a/src/views/parkPay/plateNumber.vue b/src/views/parkPay/plateNumber.vue index d9ecda5..f320d15 100644 --- a/src/views/parkPay/plateNumber.vue +++ b/src/views/parkPay/plateNumber.vue @@ -1,19 +1,19 @@