Commit 1214e25646fcdc559386e7b5d22920ebbed343e6
1 parent
a7e4d723
d动态origID
Showing
3 changed files
with
8 additions
and
4 deletions
src/utils/request.js
| @@ -7,7 +7,7 @@ const service = axios.create({ | @@ -7,7 +7,7 @@ const service = axios.create({ | ||
| 7 | // http://pay.service.renniting.cn/ 赤峰 | 7 | // http://pay.service.renniting.cn/ 赤峰 |
| 8 | baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url | 8 | baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url |
| 9 | // withCredentials: true, // send cookies when cross-domain requests | 9 | // withCredentials: true, // send cookies when cross-domain requests |
| 10 | - timeout: 6000 // request timeout | 10 | + timeout: 60000 // request timeout |
| 11 | }) | 11 | }) |
| 12 | 12 | ||
| 13 | service.interceptors.request.use( | 13 | service.interceptors.request.use( |
src/views/parkPay/orderPay.vue
| @@ -67,6 +67,7 @@ export default { | @@ -67,6 +67,7 @@ export default { | ||
| 67 | webAppCode: '', // 微信code | 67 | webAppCode: '', // 微信code |
| 68 | appOrderTimeout: '', // 超时描述 | 68 | appOrderTimeout: '', // 超时描述 |
| 69 | tollNumber:'', // 收费员员工号 | 69 | tollNumber:'', // 收费员员工号 |
| 70 | + myOrgId:'', | ||
| 70 | } | 71 | } |
| 71 | }, | 72 | }, |
| 72 | created() { | 73 | created() { |
| @@ -78,6 +79,7 @@ export default { | @@ -78,6 +79,7 @@ export default { | ||
| 78 | this.clientBrowser = this.$utils.clientBrowser() //支付方式 | 79 | this.clientBrowser = this.$utils.clientBrowser() //支付方式 |
| 79 | this.paySrcType = this.$route.query.paySrcType // 实收 | 80 | this.paySrcType = this.$route.query.paySrcType // 实收 |
| 80 | this.orderId = this.$route.query.ordeID | 81 | this.orderId = this.$route.query.ordeID |
| 82 | + this.myOrgId = this.$route.query.myOrgId | ||
| 81 | console.log(this.orderId) | 83 | console.log(this.orderId) |
| 82 | this.appOrderTimeout = this.$route.query.appOrderTimeout | 84 | this.appOrderTimeout = this.$route.query.appOrderTimeout |
| 83 | if (this.clientBrowser == "微信") { | 85 | if (this.clientBrowser == "微信") { |
| @@ -132,7 +134,7 @@ export default { | @@ -132,7 +134,7 @@ export default { | ||
| 132 | aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 | 134 | aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 |
| 133 | aliParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | 135 | aliParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 |
| 134 | aliParams.paySrcType = this.paySrcType;//101停车支付 | 136 | aliParams.paySrcType = this.paySrcType;//101停车支付 |
| 135 | - aliParams.orgId = this.$utils.myOrgId | 137 | + aliParams.orgId = this.myOrgId |
| 136 | aliParams.backType = 2 | 138 | aliParams.backType = 2 |
| 137 | aliParams.backDeveloperCode = this.tollNumber | 139 | aliParams.backDeveloperCode = this.tollNumber |
| 138 | aliParams.recordArreaInfos = JSON.stringify(this.orderId); | 140 | aliParams.recordArreaInfos = JSON.stringify(this.orderId); |
| @@ -195,7 +197,7 @@ export default { | @@ -195,7 +197,7 @@ export default { | ||
| 195 | var wxParams = {}; | 197 | var wxParams = {}; |
| 196 | wxParams.orderId = orderIdData; | 198 | wxParams.orderId = orderIdData; |
| 197 | wxParams.backType = 2, | 199 | wxParams.backType = 2, |
| 198 | - wxParams.orgId = this.$utils.myOrgId, | 200 | + wxParams.orgId = this.myOrgId, |
| 199 | wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 | 201 | wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 |
| 200 | wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | 202 | wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 |
| 201 | wxParams.carNumber = this.carNumber; | 203 | wxParams.carNumber = this.carNumber; |
src/views/parkPay/parkRecord.vue
| @@ -330,6 +330,7 @@ export default { | @@ -330,6 +330,7 @@ export default { | ||
| 330 | paySrcType: 101, //支付的类型 101 是本次 103是历史欠费 | 330 | paySrcType: 101, //支付的类型 101 是本次 103是历史欠费 |
| 331 | ordeID: i.orderId, //支付的订单号 | 331 | ordeID: i.orderId, //支付的订单号 |
| 332 | appOrderTimeout: res.appOrderTimeout, // 超时描述 | 332 | appOrderTimeout: res.appOrderTimeout, // 超时描述 |
| 333 | + myOrgId:i.orgId | ||
| 333 | } | 334 | } |
| 334 | } | 335 | } |
| 335 | ) | 336 | ) |
| @@ -363,7 +364,7 @@ export default { | @@ -363,7 +364,7 @@ export default { | ||
| 363 | orderIds: list, | 364 | orderIds: list, |
| 364 | terminalSource: '7', | 365 | terminalSource: '7', |
| 365 | payType: this.$utils.clientBrowsePayType(), | 366 | payType: this.$utils.clientBrowsePayType(), |
| 366 | - orgId: this.$utils.myOrgId, | 367 | + orgId: this.historyList[0].orgId, |
| 367 | backDeveloperCode: this.$route.query.backDeveloperCode | 368 | backDeveloperCode: this.$route.query.backDeveloperCode |
| 368 | } | 369 | } |
| 369 | jsondata.sign = this.$utils.signObject(jsondata) | 370 | jsondata.sign = this.$utils.signObject(jsondata) |
| @@ -389,6 +390,7 @@ export default { | @@ -389,6 +390,7 @@ export default { | ||
| 389 | paySrcType: 103, //支付的类型 101 是本次 103是历史欠费 | 390 | paySrcType: 103, //支付的类型 101 是本次 103是历史欠费 |
| 390 | ordeID: this.orderIds, //支付的订单号 | 391 | ordeID: this.orderIds, //支付的订单号 |
| 391 | appOrderTimeout: '', | 392 | appOrderTimeout: '', |
| 393 | + myOrgId:this.historyList[0].orgId, | ||
| 392 | backDeveloperCode: response.data.inChargerCode | 394 | backDeveloperCode: response.data.inChargerCode |
| 393 | } | 395 | } |
| 394 | } | 396 | } |