diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue index 407e0c4..1a5bf6e 100644 --- a/src/components/orderPay.vue +++ b/src/components/orderPay.vue @@ -136,7 +136,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('orgId') aliParams.backType = 2 aliParams.backDeveloperCode = this.backDeveloperCode aliParams.recordArreaInfos = JSON.stringify(this.orderId); @@ -169,90 +169,6 @@ export default { }) } - console.log(this.clientBrowser) - if (this.clientBrowser == '立即') { // 农行支付 - var bankabcParams = {}; - bankabcParams.orderId = this.orderId; - bankabcParams.carNumber = this.carNumber; - 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.backType = 2 - bankabcParams.PaymentLinkType = 1 - bankabcParams.backDeveloperCode = this.backDeveloperCode - bankabcParams.recordArreaInfos = JSON.stringify(this.orderId); - console.log(bankabcParams) - bankH5Pay(bankabcParams).then(response => { - console.log(response) - if(response.code=='0'){ - let res = response.data.PaymentURL - let _token = res.split('TOKEN=')[1] - let OrderNo = response.data.OrderNo - localStorage.setItem('OrderNum',OrderNo) - - - if(window.navigator.userAgent.indexOf('Bankabc/Portal') > -1) { - // alert('当前页面在新容器'); - AlipayJSBridge.call('startApp',{ - appId:'30603024', // 固定值 - param:{ - type:"3", // 3: 掌银内H5页面, - tokenId:_token, //商户传过来的tokenId - paySystem:"", //商户传过来的paySystem, 没有则传空字符串 - payType:"1111", //商户传过来的payType,没有则传'1111' - webviewURL:"https://wxgzh.renniting.cn/wechatwuxi/Chifeng/TEST/sweeping_payment/codepay/index.html#/payResult", //商户传过来的回跳地址 - remark:"其他参数", //扩展备用 - showProgress:'NO', - backBehavior:'back' - }, - },function(result){ - - }); - } else { - // alert('当前页面在旧容器'); - // 旧支付方式 - window.location.href = 'https://www.abchina.com/luascript/mobilePayLua/'+ encodeURI('{"return":{"tokenID":"'+_token+'","backURL":"https://wxgzh.renniting.cn/wechatwuxi/Chifeng/TEST/sweeping_payment/codepay/index.html#/payResult","payType":""}}'); - - } - }else if(response.code == 1002){//其他情况如【该卡号场内已存在】 - console.log(response.message); - MessageBox.confirm('', { - message: response.message, - title: '温馨提示', - showCancelButton:false, - confirmButtonText: '确定', - }).then(action => { - if (action == 'confirm') { //确认的回调 - console.log('确定'); - this.$router.go(-1) - } - }).catch(err => { - if (err == 'cancel') { //取消的回调 - console.log('取消'); - } - }); - }else{ - alert('支付失败') - } - - - // console.log(_token) - // let _data = 'method=invokePayFromBrowser&tokenID='+_token - // let cryData = CryptoJS.encrypt(_data, 'G9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvM3', 'EkpTEA3FbZFGGq8Y') - // - // let baseCRY = Base64.encode(cryData) - // console.log(baseCRY) - // window.location.href='bankabc:' + encodeURIComponent('{"method":"invokePayFromBrowser","param":'+baseCRY+'}') - // // 即为加密后的数据。其中paramsEncode是需要加密的数据、 - // // keyStr是加密时使用的key,与服务端一致、hash是偏移量,是一个随机生成的16位字符串。 - }) - } - - - - - if (this.clientBrowser == '微信') { // 微信支付 @@ -284,8 +200,8 @@ export default { let vm = this var wxParams = {}; wxParams.orderId = orderIdData; - wxParams.backType = 2, - wxParams.orgId = this.$utils.myOrgId, + wxParams.backType = 2 + wxParams.orgId = sessionStorage.getItem('orgId') 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/utils/utils.js b/src/utils/utils.js index c3dac17..4e37a0b 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -129,7 +129,7 @@ export default { // 黄石 appid wxa1a66cc7d263afe6 // 天水 appid wx776e81ec7494232e - // myOrgId: sessionStorage.getItem('orgId'), // 归属地 赤峰id 10003 黄石 10079 + myOrgId: sessionStorage.getItem('orgId'), // 归属地 赤峰id 10003 黄石 10079 myGetSign: function (objb) { // 获取签名 var compare = function (obj1, obj2) {