Commit 9b6fc6f2fe7cd538f277c0fa2fc0f052444994e3
1 parent
7528d5a2
add
Showing
5 changed files
with
18 additions
and
8 deletions
src/components/navigation.vue
@@ -107,7 +107,8 @@ export default { | @@ -107,7 +107,8 @@ export default { | ||
107 | path: 'parkRecord', | 107 | path: 'parkRecord', |
108 | query: { | 108 | query: { |
109 | carNumber: this.carNumber, | 109 | carNumber: this.carNumber, |
110 | - carNumberColor: this.carWrapBG | 110 | + carNumberColor: this.carWrapBG, |
111 | + backDeveloperCode: this.$route.query.inChargerCode | ||
111 | } | 112 | } |
112 | }) | 113 | }) |
113 | }, | 114 | }, |
src/components/orderPay.vue
@@ -66,6 +66,7 @@ export default { | @@ -66,6 +66,7 @@ export default { | ||
66 | webAppCode: '', // 微信code | 66 | webAppCode: '', // 微信code |
67 | appOrderTimeout: '', // 超时描述 | 67 | appOrderTimeout: '', // 超时描述 |
68 | tollNumber:'', // 收费员员工号 | 68 | tollNumber:'', // 收费员员工号 |
69 | + backDeveloperCode: '' | ||
69 | } | 70 | } |
70 | }, | 71 | }, |
71 | created() { | 72 | created() { |
@@ -121,6 +122,11 @@ export default { | @@ -121,6 +122,11 @@ export default { | ||
121 | this.orderId = [] | 122 | this.orderId = [] |
122 | this.orderId = _order | 123 | this.orderId = _order |
123 | } | 124 | } |
125 | + if(this.tollNumber){ | ||
126 | + this.backDeveloperCode = this.tollNumber | ||
127 | + }else{ | ||
128 | + this.backDeveloperCode = this.$route.query.backDeveloperCode | ||
129 | + } | ||
124 | 130 | ||
125 | if (this.clientBrowser == '支付宝') { // 支付宝支付 | 131 | if (this.clientBrowser == '支付宝') { // 支付宝支付 |
126 | let me = this | 132 | let me = this |
@@ -132,7 +138,7 @@ export default { | @@ -132,7 +138,7 @@ export default { | ||
132 | aliParams.paySrcType = this.paySrcType;//101停车支付 | 138 | aliParams.paySrcType = this.paySrcType;//101停车支付 |
133 | aliParams.orgId = this.$utils.myOrgId | 139 | aliParams.orgId = this.$utils.myOrgId |
134 | aliParams.backType = 2 | 140 | aliParams.backType = 2 |
135 | - aliParams.backDeveloperCode = this.tollNumber | 141 | + aliParams.backDeveloperCode = this.backDeveloperCode |
136 | aliParams.recordArreaInfos = JSON.stringify(this.orderId); | 142 | aliParams.recordArreaInfos = JSON.stringify(this.orderId); |
137 | console.log(aliParams) | 143 | console.log(aliParams) |
138 | aliPay(aliParams).then(response => { | 144 | aliPay(aliParams).then(response => { |
@@ -174,7 +180,7 @@ export default { | @@ -174,7 +180,7 @@ export default { | ||
174 | bankabcParams.orgId = this.$utils.myOrgId | 180 | bankabcParams.orgId = this.$utils.myOrgId |
175 | bankabcParams.backType = 2 | 181 | bankabcParams.backType = 2 |
176 | bankabcParams.PaymentLinkType = 1 | 182 | bankabcParams.PaymentLinkType = 1 |
177 | - bankabcParams.backDeveloperCode = this.tollNumber | 183 | + bankabcParams.backDeveloperCode = this.backDeveloperCode |
178 | bankabcParams.recordArreaInfos = JSON.stringify(this.orderId); | 184 | bankabcParams.recordArreaInfos = JSON.stringify(this.orderId); |
179 | console.log(bankabcParams) | 185 | console.log(bankabcParams) |
180 | bankH5Pay(bankabcParams).then(response => { | 186 | bankH5Pay(bankabcParams).then(response => { |
@@ -286,7 +292,7 @@ export default { | @@ -286,7 +292,7 @@ export default { | ||
286 | wxParams.paySrcType = this.paySrcType;//101停车支付 | 292 | wxParams.paySrcType = this.paySrcType;//101停车支付 |
287 | wxParams.recordArreaInfos = JSON.stringify(orderIdData); | 293 | wxParams.recordArreaInfos = JSON.stringify(orderIdData); |
288 | wxParams.openId = openIdData; | 294 | wxParams.openId = openIdData; |
289 | - wxParams.backDeveloperCode = this.tollNumber | 295 | + wxParams.backDeveloperCode = this.backDeveloperCode |
290 | wxParams.appId = this.$utils.myVxAppId; | 296 | wxParams.appId = this.$utils.myVxAppId; |
291 | vxPayQuery(wxParams).then(res => { | 297 | vxPayQuery(wxParams).then(res => { |
292 | if (res.code == 0) { // | 298 | if (res.code == 0) { // |
src/components/parkRecord.vue
@@ -192,7 +192,8 @@ export default { | @@ -192,7 +192,8 @@ export default { | ||
192 | terminalSource: 7, | 192 | terminalSource: 7, |
193 | carNumber: this.carNumber, | 193 | carNumber: this.carNumber, |
194 | carNumberColor: this.carColor, | 194 | carNumberColor: this.carColor, |
195 | - orgId: this.$utils.myOrgId | 195 | + orgId: this.$utils.myOrgId, |
196 | + | ||
196 | } | 197 | } |
197 | jsondata.sign = this.$utils.signObject(jsondata) | 198 | jsondata.sign = this.$utils.signObject(jsondata) |
198 | 199 | ||
@@ -357,6 +358,7 @@ export default { | @@ -357,6 +358,7 @@ export default { | ||
357 | terminalSource: '7', | 358 | terminalSource: '7', |
358 | payType: this.$utils.clientBrowsePayType(), | 359 | payType: this.$utils.clientBrowsePayType(), |
359 | orgId: this.$utils.myOrgId, | 360 | orgId: this.$utils.myOrgId, |
361 | + backDeveloperCode: this.$route.query.backDeveloperCode | ||
360 | } | 362 | } |
361 | jsondata.sign = this.$utils.signObject(jsondata) | 363 | jsondata.sign = this.$utils.signObject(jsondata) |
362 | console.log(jsondata) | 364 | console.log(jsondata) |
@@ -378,7 +380,8 @@ export default { | @@ -378,7 +380,8 @@ export default { | ||
378 | carNumber: this.carNumber, // 车牌 | 380 | carNumber: this.carNumber, // 车牌 |
379 | paySrcType: 103, //支付的类型 101 是本次 103是历史欠费 | 381 | paySrcType: 103, //支付的类型 101 是本次 103是历史欠费 |
380 | ordeID: this.orderIds, //支付的订单号 | 382 | ordeID: this.orderIds, //支付的订单号 |
381 | - appOrderTimeout: '' | 383 | + appOrderTimeout: '', |
384 | + backDeveloperCode: response.data.inChargerCode | ||
382 | } | 385 | } |
383 | } | 386 | } |
384 | ) | 387 | ) |
src/utils/request.js
@@ -13,7 +13,7 @@ const service = axios.create({ | @@ -13,7 +13,7 @@ const service = axios.create({ | ||
13 | 13 | ||
14 | // https://dev.renniting.cn/pay/ 赤峰农行测试环境 | 14 | // https://dev.renniting.cn/pay/ 赤峰农行测试环境 |
15 | 15 | ||
16 | - baseURL: 'https://pay.renniting.cn/', // url = base url + request url | 16 | + baseURL: 'https://dev.renniting.cn/pay/', // url = base url + request url |
17 | // withCredentials: true, // send cookies when cross-domain requests | 17 | // withCredentials: true, // send cookies when cross-domain requests |
18 | timeout: 10000 // request timeout | 18 | timeout: 10000 // request timeout |
19 | }) | 19 | }) |
src/utils/utils.js
@@ -122,7 +122,7 @@ export default { | @@ -122,7 +122,7 @@ export default { | ||
122 | 122 | ||
123 | myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 | 123 | myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 |
124 | 124 | ||
125 | - myVxAppId: 'wx2af2bab90d433c86', | 125 | + myVxAppId: 'wxff4cebaedbf4f886', |
126 | // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 | 126 | // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 |
127 | // 微信赤峰 appid wx2af2bab90d433c86 | 127 | // 微信赤峰 appid wx2af2bab90d433c86 |
128 | // 黄石 appid wxa1a66cc7d263afe6 | 128 | // 黄石 appid wxa1a66cc7d263afe6 |