diff --git a/src/components/orderPay.vue b/src/components/orderPay.vue index 4e67f60..78b8969 100644 --- a/src/components/orderPay.vue +++ b/src/components/orderPay.vue @@ -23,7 +23,7 @@

停车引导员工号（非必填）

- +
{{clientBrowser}}支付
@@ -123,23 +123,41 @@ export default { } if (this.clientBrowser == '支付宝') { // 支付宝支付 + let me = this var aliParams = {}; aliParams.orderId = this.orderId; aliParams.carNumber = this.carNumber; 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.backType = 2, - aliParams.backDeveloperCode = this.tollNumber, + aliParams.orgId = this.$utils.myOrgId + aliParams.backType = 2 + aliParams.backDeveloperCode = this.tollNumber aliParams.recordArreaInfos = JSON.stringify(this.orderId); console.log(aliParams) aliPay(aliParams).then(response => { console.log(response) if (response.code == 0) {//进场 document.write(response.data);//打开支付表单 - } else {//其他情况如【该卡号场内已存在】 + } 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(response.message) } }) @@ -153,9 +171,10 @@ 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.backType = 2, + bankabcParams.orgId = this.$utils.myOrgId + bankabcParams.backType = 2 bankabcParams.PaymentLinkType = 1 + bankabcParams.backDeveloperCode = this.tollNumber bankabcParams.recordArreaInfos = JSON.stringify(this.orderId); console.log(bankabcParams) bankH5Pay(bankabcParams).then(response => { @@ -190,6 +209,23 @@ export default { 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('支付失败') } @@ -250,6 +286,7 @@ export default { wxParams.paySrcType = this.paySrcType;//101停车支付 wxParams.recordArreaInfos = JSON.stringify(orderIdData); wxParams.openId = openIdData; + wxParams.backDeveloperCode = this.tollNumber wxParams.appId = this.$utils.myVxAppId; vxPayQuery(wxParams).then(res => { if (res.code == 0) { // @@ -270,9 +307,25 @@ export default { } else { alert("没有找到返回值"); } - } else { + }else if(res.code == 1002){//其他情况如【该卡号场内已存在】 console.log(res.message); - alert(res.message); + MessageBox.confirm('', { + message: res.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(res.message) } }) }, diff --git a/src/utils/request.js b/src/utils/request.js index acdcd26..f07d16f 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -5,15 +5,15 @@ import axios from 'axios' // axios.defaults.baseURL = process.env.API_ROOT const service = axios.create({ - // https://pay.service.renniting.cn/ 赤峰 - // http://pay.service.huangshiparking.com/ 黄石 + // https://pay.renniting.cn/ 赤峰 + // 'http://39.98.58.92:8090'; 赤峰测试环境 // https://dev.renniting.cn/pay/ 赤峰农行测试环境 - baseURL: 'http://39.98.58.92:8090', // url = base url + request url + baseURL: 'https://pay.renniting.cn/', // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests timeout: 10000 // request timeout }) diff --git a/src/utils/utils.js b/src/utils/utils.js index 12c5dfe..e4917dd 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -122,7 +122,7 @@ export default { myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 - myVxAppId: 'wxff4cebaedbf4f886', + myVxAppId: 'wx2af2bab90d433c86', // 测试环境 微信赤峰 appid wxff4cebaedbf4f886 // 微信赤峰 appid wx2af2bab90d433c86 // 黄石 appid wxa1a66cc7d263afe6