Commit 458b6ecf30876e7089b48e97cbd7605b8d6a18ee
1 parent
854b8485
orgin 从url获取
Showing
5 changed files
with
14 additions
and
14 deletions
src/components/navigation.vue
| @@ -54,6 +54,10 @@ export default { | @@ -54,6 +54,10 @@ export default { | ||
| 54 | mounted() { | 54 | mounted() { |
| 55 | this.carNumber = this.$route.query.carNumber // 车牌号码 | 55 | this.carNumber = this.$route.query.carNumber // 车牌号码 |
| 56 | this.carWrapBG = this.$route.query.carNumberColor // 车牌颜色 | 56 | this.carWrapBG = this.$route.query.carNumberColor // 车牌颜色 |
| 57 | + this.$utils.myOrgId = this.$route.query.orgId // 车牌颜色 | ||
| 58 | + // console.log(this.$utils.myOrgId) | ||
| 59 | + sessionStorage.setItem('CfMyOrgId',this.$route.query.orgId) | ||
| 60 | + | ||
| 57 | console.log(this.carNumber) | 61 | console.log(this.carNumber) |
| 58 | // this.$router.go(0) | 62 | // this.$router.go(0) |
| 59 | 63 | ||
| @@ -70,7 +74,7 @@ export default { | @@ -70,7 +74,7 @@ export default { | ||
| 70 | salt: salt, | 74 | salt: salt, |
| 71 | sign_type: 'md5', | 75 | sign_type: 'md5', |
| 72 | sign: '1', | 76 | sign: '1', |
| 73 | - orgId: this.$utils.myOrgId, | 77 | + orgId: sessionStorage.getItem('CfMyOrgId'), |
| 74 | jumpType: '8' | 78 | jumpType: '8' |
| 75 | }; | 79 | }; |
| 76 | // jsondata = JSON.stringify(jsondata); | 80 | // jsondata = JSON.stringify(jsondata); |
src/components/orderPay.vue
| @@ -139,7 +139,7 @@ export default { | @@ -139,7 +139,7 @@ export default { | ||
| 139 | aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 | 139 | aliParams.payType = 1;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 |
| 140 | aliParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | 140 | aliParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 |
| 141 | aliParams.paySrcType = this.paySrcType;//101停车支付 | 141 | aliParams.paySrcType = this.paySrcType;//101停车支付 |
| 142 | - aliParams.orgId = this.$utils.myOrgId | 142 | + aliParams.orgId = sessionStorage.getItem('CfMyOrgId') |
| 143 | aliParams.backType = 2 | 143 | aliParams.backType = 2 |
| 144 | aliParams.backDeveloperCode = this.tollNumber | 144 | aliParams.backDeveloperCode = this.tollNumber |
| 145 | aliParams.ticketChargeCode = ticketChargeCode | 145 | aliParams.ticketChargeCode = ticketChargeCode |
| @@ -181,7 +181,7 @@ export default { | @@ -181,7 +181,7 @@ export default { | ||
| 181 | bankabcParams.payType = 34;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 34 农行 | 181 | bankabcParams.payType = 34;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 34 农行 |
| 182 | bankabcParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | 182 | bankabcParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 |
| 183 | bankabcParams.paySrcType = this.paySrcType;//101停车支付 | 183 | bankabcParams.paySrcType = this.paySrcType;//101停车支付 |
| 184 | - bankabcParams.orgId = this.$utils.myOrgId | 184 | + bankabcParams.orgId = sessionStorage.getItem('CfMyOrgId') |
| 185 | bankabcParams.backType = 2 | 185 | bankabcParams.backType = 2 |
| 186 | bankabcParams.PaymentLinkType = 1 | 186 | bankabcParams.PaymentLinkType = 1 |
| 187 | bankabcParams.backDeveloperCode = this.tollNumber | 187 | bankabcParams.backDeveloperCode = this.tollNumber |
| @@ -290,7 +290,7 @@ export default { | @@ -290,7 +290,7 @@ export default { | ||
| 290 | var wxParams = {}; | 290 | var wxParams = {}; |
| 291 | wxParams.orderId = orderIdData; | 291 | wxParams.orderId = orderIdData; |
| 292 | wxParams.backType = 2, | 292 | wxParams.backType = 2, |
| 293 | - wxParams.orgId = this.$utils.myOrgId, | 293 | + wxParams.orgId = sessionStorage.getItem('CfMyOrgId'), |
| 294 | wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 | 294 | wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 |
| 295 | wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 | 295 | wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 |
| 296 | wxParams.carNumber = this.carNumber; | 296 | wxParams.carNumber = this.carNumber; |
src/components/parkRecord.vue
| @@ -196,7 +196,7 @@ export default { | @@ -196,7 +196,7 @@ export default { | ||
| 196 | terminalSource: 7, | 196 | terminalSource: 7, |
| 197 | carNumber: this.carNumber, | 197 | carNumber: this.carNumber, |
| 198 | carNumberColor: this.carColor, | 198 | carNumberColor: this.carColor, |
| 199 | - orgId: this.$utils.myOrgId, | 199 | + orgId: sessionStorage.getItem('CfMyOrgId'), |
| 200 | 200 | ||
| 201 | } | 201 | } |
| 202 | jsondata.sign = this.$utils.signObject(jsondata) | 202 | jsondata.sign = this.$utils.signObject(jsondata) |
| @@ -363,7 +363,7 @@ export default { | @@ -363,7 +363,7 @@ export default { | ||
| 363 | orderIds: list, | 363 | orderIds: list, |
| 364 | terminalSource: '7', | 364 | terminalSource: '7', |
| 365 | payType: this.$utils.clientBrowsePayType(), | 365 | payType: this.$utils.clientBrowsePayType(), |
| 366 | - orgId: this.$utils.myOrgId, | 366 | + orgId: sessionStorage.getItem('CfMyOrgId'), |
| 367 | backDeveloperCode: this.$route.query.backDeveloperCode | 367 | backDeveloperCode: this.$route.query.backDeveloperCode |
| 368 | } | 368 | } |
| 369 | jsondata.sign = this.$utils.signObject(jsondata) | 369 | jsondata.sign = this.$utils.signObject(jsondata) |
src/utils/request.js
| @@ -5,12 +5,8 @@ import axios from 'axios' | @@ -5,12 +5,8 @@ import axios from 'axios' | ||
| 5 | // axios.defaults.baseURL = process.env.API_ROOT | 5 | // axios.defaults.baseURL = process.env.API_ROOT |
| 6 | const service = axios.create({ | 6 | const service = axios.create({ |
| 7 | 7 | ||
| 8 | - // https://pay.renniting.cn/ 赤峰 | ||
| 9 | - | ||
| 10 | - | ||
| 11 | - // 'http://39.98.58.92:8090'; 赤峰测试环境 | ||
| 12 | - | ||
| 13 | - | 8 | + // https://pay.renniting.cn/ 赤峰正式 |
| 9 | + // https://dev.renniting.cn/pay 赤峰测试 | ||
| 14 | // https://dev.renniting.cn/pay/ 赤峰农行测试环境 | 10 | // https://dev.renniting.cn/pay/ 赤峰农行测试环境 |
| 15 | 11 | ||
| 16 | baseURL: 'https://pay.renniting.cn/', // url = base url + request url | 12 | baseURL: 'https://pay.renniting.cn/', // url = base url + request url |
src/utils/utils.js
| @@ -123,12 +123,12 @@ export default { | @@ -123,12 +123,12 @@ export default { | ||
| 123 | 123 | ||
| 124 | myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 | 124 | myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 |
| 125 | 125 | ||
| 126 | - myVxAppId: 'wx2af2bab90d433c86', | 126 | + myVxAppId: 'wxff4cebaedbf4f886', |
| 127 | // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 | 127 | // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 |
| 128 | // 微信赤峰 appid wx2af2bab90d433c86 | 128 | // 微信赤峰 appid wx2af2bab90d433c86 |
| 129 | // 黄石 appid wxa1a66cc7d263afe6 | 129 | // 黄石 appid wxa1a66cc7d263afe6 |
| 130 | 130 | ||
| 131 | - myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079 | 131 | + myOrgId: '', // 归属地 赤峰id 10003 黄石 10079 |
| 132 | 132 | ||
| 133 | myGetSign: function (objb) { // 获取签名 | 133 | myGetSign: function (objb) { // 获取签名 |
| 134 | var compare = function (obj1, obj2) { | 134 | var compare = function (obj1, obj2) { |