diff --git a/src/components/navigation.vue b/src/components/navigation.vue index 320d0eb..b627c31 100644 --- a/src/components/navigation.vue +++ b/src/components/navigation.vue @@ -54,6 +54,10 @@ export default { mounted() { this.carNumber = this.$route.query.carNumber // 车牌号码 this.carWrapBG = this.$route.query.carNumberColor // 车牌颜色 + this.$utils.myOrgId = this.$route.query.orgId // 车牌颜色 + // console.log(this.$utils.myOrgId) + sessionStorage.setItem('CfMyOrgId',this.$route.query.orgId) + console.log(this.carNumber) // this.$router.go(0) @@ -70,7 +74,7 @@ export default { salt: salt, sign_type: 'md5', sign: '1', - orgId: this.$utils.myOrgId, + orgId: sessionStorage.getItem('CfMyOrgId'), jumpType: '8' }; // jsondata = JSON.stringify(jsondata); diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue index e6d7fd3..7e34a7c 100644 --- a/src/components/orderPay.vue +++ b/src/components/orderPay.vue @@ -139,7 +139,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 = sessionStorage.getItem('CfMyOrgId') aliParams.backType = 2 aliParams.backDeveloperCode = this.tollNumber aliParams.ticketChargeCode = ticketChargeCode @@ -181,7 +181,7 @@ export default { bankabcParams.payType = 34;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号 34 农行 bankabcParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付 bankabcParams.paySrcType = this.paySrcType;//101停车支付 - bankabcParams.orgId = this.$utils.myOrgId + bankabcParams.orgId = sessionStorage.getItem('CfMyOrgId') bankabcParams.backType = 2 bankabcParams.PaymentLinkType = 1 bankabcParams.backDeveloperCode = this.tollNumber @@ -290,7 +290,7 @@ export default { var wxParams = {}; wxParams.orderId = orderIdData; wxParams.backType = 2, - wxParams.orgId = this.$utils.myOrgId, + wxParams.orgId = sessionStorage.getItem('CfMyOrgId'), 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/components/parkRecord.vue b/src/components/parkRecord.vue index 4f1c7da..ec53c3f 100644 --- a/src/components/parkRecord.vue +++ b/src/components/parkRecord.vue @@ -196,7 +196,7 @@ export default { terminalSource: 7, carNumber: this.carNumber, carNumberColor: this.carColor, - orgId: this.$utils.myOrgId, + orgId: sessionStorage.getItem('CfMyOrgId'), } jsondata.sign = this.$utils.signObject(jsondata) @@ -363,7 +363,7 @@ export default { orderIds: list, terminalSource: '7', payType: this.$utils.clientBrowsePayType(), - orgId: this.$utils.myOrgId, + orgId: sessionStorage.getItem('CfMyOrgId'), backDeveloperCode: this.$route.query.backDeveloperCode } jsondata.sign = this.$utils.signObject(jsondata) diff --git a/src/utils/request.js b/src/utils/request.js index f07d16f..1795fde 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,12 +5,8 @@ import axios from 'axios' // axios.defaults.baseURL = process.env.API_ROOT const service = axios.create({ - // https://pay.renniting.cn/ 赤峰 - - - // 'http://39.98.58.92:8090'; 赤峰测试环境 - - + // https://pay.renniting.cn/ 赤峰正式 + // https://dev.renniting.cn/pay 赤峰测试 // https://dev.renniting.cn/pay/ 赤峰农行测试环境 baseURL: 'https://pay.renniting.cn/', // url = base url + request url diff --git a/src/utils/utils.js b/src/utils/utils.js index ac2dbd7..ce7a153 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -123,12 +123,12 @@ export default { myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 - myVxAppId: 'wx2af2bab90d433c86', + myVxAppId: 'wxff4cebaedbf4f886', // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 // 微信赤峰 appid wx2af2bab90d433c86 // 黄石 appid wxa1a66cc7d263afe6 - myOrgId: '10003', // 归属地 赤峰id 10003 黄石 10079 + myOrgId: '', // 归属地 赤峰id 10003 黄石 10079 myGetSign: function (objb) { // 获取签名 var compare = function (obj1, obj2) {