Commit 458b6ecf30876e7089b48e97cbd7605b8d6a18ee

Authored by 刘淇
1 parent 854b8485

orgin 从url获取

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