diff --git a/src/components/navigation.vue b/src/components/navigation.vue index 62b9b3a..acd1464 100644 --- a/src/components/navigation.vue +++ b/src/components/navigation.vue @@ -107,7 +107,8 @@ export default { path: 'parkRecord', query: { carNumber: this.carNumber, - carNumberColor: this.carWrapBG + carNumberColor: this.carWrapBG, + backDeveloperCode: this.$route.query.inChargerCode } }) }, diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue index 78b8969..407e0c4 100644 --- a/src/components/orderPay.vue +++ b/src/components/orderPay.vue @@ -66,6 +66,7 @@ export default { webAppCode: '', // 微信code appOrderTimeout: '', // 超时描述 tollNumber:'', // 收费员员工号 + backDeveloperCode: '' } }, created() { @@ -121,6 +122,11 @@ export default { this.orderId = [] this.orderId = _order } + if(this.tollNumber){ + this.backDeveloperCode = this.tollNumber + }else{ + this.backDeveloperCode = this.$route.query.backDeveloperCode + } if (this.clientBrowser == '支付宝') { // 支付宝支付 let me = this @@ -132,7 +138,7 @@ export default { aliParams.paySrcType = this.paySrcType;//101停车支付 aliParams.orgId = this.$utils.myOrgId aliParams.backType = 2 - aliParams.backDeveloperCode = this.tollNumber + aliParams.backDeveloperCode = this.backDeveloperCode aliParams.recordArreaInfos = JSON.stringify(this.orderId); console.log(aliParams) aliPay(aliParams).then(response => { @@ -174,7 +180,7 @@ export default { bankabcParams.orgId = this.$utils.myOrgId bankabcParams.backType = 2 bankabcParams.PaymentLinkType = 1 - bankabcParams.backDeveloperCode = this.tollNumber + bankabcParams.backDeveloperCode = this.backDeveloperCode bankabcParams.recordArreaInfos = JSON.stringify(this.orderId); console.log(bankabcParams) bankH5Pay(bankabcParams).then(response => { @@ -286,7 +292,7 @@ export default { wxParams.paySrcType = this.paySrcType;//101停车支付 wxParams.recordArreaInfos = JSON.stringify(orderIdData); wxParams.openId = openIdData; - wxParams.backDeveloperCode = this.tollNumber + wxParams.backDeveloperCode = this.backDeveloperCode wxParams.appId = this.$utils.myVxAppId; vxPayQuery(wxParams).then(res => { if (res.code == 0) { // diff --git a/src/components/parkRecord.vue b/src/components/parkRecord.vue index 450a786..0c9f106 100644 --- a/src/components/parkRecord.vue +++ b/src/components/parkRecord.vue @@ -192,7 +192,8 @@ export default { terminalSource: 7, carNumber: this.carNumber, carNumberColor: this.carColor, - orgId: this.$utils.myOrgId + orgId: this.$utils.myOrgId, + } jsondata.sign = this.$utils.signObject(jsondata) @@ -357,6 +358,7 @@ export default { terminalSource: '7', payType: this.$utils.clientBrowsePayType(), orgId: this.$utils.myOrgId, + backDeveloperCode: this.$route.query.backDeveloperCode } jsondata.sign = this.$utils.signObject(jsondata) console.log(jsondata) @@ -378,7 +380,8 @@ export default { carNumber: this.carNumber, // 车牌 paySrcType: 103, //支付的类型 101 是本次 103是历史欠费 ordeID: this.orderIds, //支付的订单号 - appOrderTimeout: '' + appOrderTimeout: '', + backDeveloperCode: response.data.inChargerCode } } ) diff --git a/src/utils/request.js b/src/utils/request.js index f07d16f..84221fe 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -13,7 +13,7 @@ const service = axios.create({ // https://dev.renniting.cn/pay/ 赤峰农行测试环境 - baseURL: 'https://pay.renniting.cn/', // url = base url + request url + baseURL: 'https://dev.renniting.cn/pay/', // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests timeout: 10000 // request timeout }) diff --git a/src/utils/utils.js b/src/utils/utils.js index e4917dd..12c5dfe 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -122,7 +122,7 @@ export default { myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 - myVxAppId: 'wx2af2bab90d433c86', + myVxAppId: 'wxff4cebaedbf4f886', // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 // 微信赤峰 appid wx2af2bab90d433c86 // 黄石 appid wxa1a66cc7d263afe6