diff --git a/src/utils/request.js b/src/utils/request.js index b6329a4..c2af77a 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,7 +7,7 @@ const service = axios.create({ // http://pay.service.renniting.cn/ 赤峰 baseURL: 'http://pay.service.renniting.cn/', // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 6000 // request timeout + timeout: 60000 // request timeout }) service.interceptors.request.use( diff --git a/src/views/parkPay/orderPay.vue b/src/views/parkPay/orderPay.vue index 8612249..e844fbf 100644 --- a/src/views/parkPay/orderPay.vue +++ b/src/views/parkPay/orderPay.vue @@ -67,6 +67,7 @@ export default { webAppCode: '', // 微信code appOrderTimeout: '', // 超时描述 tollNumber:'', // 收费员员工号 + myOrgId:'', } }, created() { @@ -78,6 +79,7 @@ export default { this.clientBrowser = this.$utils.clientBrowser() //支付方式 this.paySrcType = this.$route.query.paySrcType // 实收 this.orderId = this.$route.query.ordeID + this.myOrgId = this.$route.query.myOrgId console.log(this.orderId) this.appOrderTimeout = this.$route.query.appOrderTimeout if (this.clientBrowser == "微信") { @@ -132,7 +134,7 @@ export default { aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 aliParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 aliParams.paySrcType = this.paySrcType;//101停车支付 - aliParams.orgId = this.$utils.myOrgId + aliParams.orgId = this.myOrgId aliParams.backType = 2 aliParams.backDeveloperCode = this.tollNumber aliParams.recordArreaInfos = JSON.stringify(this.orderId); @@ -195,7 +197,7 @@ export default { var wxParams = {}; wxParams.orderId = orderIdData; wxParams.backType = 2, - wxParams.orgId = this.$utils.myOrgId, + wxParams.orgId = this.myOrgId, wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 wxParams.carNumber = this.carNumber; diff --git a/src/views/parkPay/parkRecord.vue b/src/views/parkPay/parkRecord.vue index c7ef11a..13b31fe 100644 --- a/src/views/parkPay/parkRecord.vue +++ b/src/views/parkPay/parkRecord.vue @@ -330,6 +330,7 @@ export default { paySrcType: 101, //支付的类型 101 是本次 103是历史欠费 ordeID: i.orderId, //支付的订单号 appOrderTimeout: res.appOrderTimeout, // 超时描述 + myOrgId:i.orgId } } ) @@ -363,7 +364,7 @@ export default { orderIds: list, terminalSource: '7', payType: this.$utils.clientBrowsePayType(), - orgId: this.$utils.myOrgId, + orgId: this.historyList[0].orgId, backDeveloperCode: this.$route.query.backDeveloperCode } jsondata.sign = this.$utils.signObject(jsondata) @@ -389,6 +390,7 @@ export default { paySrcType: 103, //支付的类型 101 是本次 103是历史欠费 ordeID: this.orderIds, //支付的订单号 appOrderTimeout: '', + myOrgId:this.historyList[0].orgId, backDeveloperCode: response.data.inChargerCode } }