diff --git a/.env.development b/.env.development new file mode 100644 index 0000000..8ae00a9 --- /dev/null +++ b/.env.development @@ -0,0 +1,3 @@ +NODE_ENV='development' +let VUE_APP_URL='https://bus.jycrtc.com/' +let VUE_APP_URL_TWO='https://pay.jycrtc.com/' diff --git a/.env.production b/.env.production new file mode 100644 index 0000000..5357d5e --- /dev/null +++ b/.env.production @@ -0,0 +1,3 @@ +NODE_ENV='production' +let VUE_APP_URL='https://bus.jycrtc.com/' +let VUE_APP_URL_TWO='https://pay.jycrtc.com/' diff --git a/src/api/couponPay/couponPay.js b/src/api/couponPay/couponPay.js new file mode 100644 index 0000000..a0bbcd1 --- /dev/null +++ b/src/api/couponPay/couponPay.js @@ -0,0 +1,14 @@ +import request from '@/utils/request' + +export function scanCouponQR(params) { + return request({ + requestBase:'VUE_APP_URL', + url: 'business/h5/qr/scanCouponQR', + method: 'post', + data: params + }) +} + + + + diff --git a/src/api/orderPay/orderPay.js b/src/api/orderPay/orderPay.js index 0a9d574..328a642 100644 --- a/src/api/orderPay/orderPay.js +++ b/src/api/orderPay/orderPay.js @@ -36,6 +36,7 @@ export function bankH5Pay(params) { // 农行 export function queryParkingRecordPageByCarNumbers(params) { // 支付完成后查询记录 return request({ + requestBase:'VUE_APP_URL_TWO', url: 'queryParkOrder/queryParkingRecordPageByCarNumbers', method: 'post', data: params diff --git a/src/router/index.js b/src/router/index.js index e0a0e9a..0683922 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -11,7 +11,7 @@ export default new Router({ { path: '/', redirect: { - name: 'plateNumber' + name: 'coupon' } }, // { diff --git a/src/utils/request.js b/src/utils/request.js index a15ca16..ade28e1 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -2,16 +2,34 @@ import axios from 'axios' // let _url = process.env.API_ROOT // axios.defaults.baseURL = process.env.API_ROOT + const service = axios.create({ - // https://dev.renniting.cn/pay/ 赤峰测试 - // http://pay.service.renniting.cn/ 赤峰 - baseURL: 'https://pay.jycrtc.com/', // url = base url + request url + // baseURL:'https://bus.jycrtc.com/', + baseURL:process.env.VUE_APP_URL, // withCredentials: true, // send cookies when cross-domain requests - timeout: 6000 // request timeout + timeout: 6000, // request timeout + withCredentials: false, + headers:{ + 'Access-Control-Allow-Origin':'*', + 'Content-Type':'application/x-www-form-urlencoded' + } }) service.interceptors.request.use( + config => { + if(config.requestBase=='VUE_APP_URL'){ + // config.headers['Content-Type']="application/x-www-form-urlencoded"; + config.baseURL='https://bus.jycrtc.com/'; + config.data=JSON.stringify(config.data); + + }else if(config.requestBase=='VUE_APP_URL_TWO'){ + // config.headers['Content-Type']="application/x-www-form-urlencoded"; + config.baseURL='https://pay.jycrtc.com/'; + config.data=JSON.stringify(config.data); + + } + return config }, error => { diff --git a/src/utils/utils.js b/src/utils/utils.js index 4bf4480..a34d8e2 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -145,7 +145,7 @@ export default { myDeviceInfo: 'BC0703A4-AFB0-4B51-9089-9B7487C0CC6E', // 公共请求设备信息 - myVxAppId: 'wxfdc1af620d3ab750', + myVxAppId: 'wx74f1b0ec227958da', myOrgId: '10107', // diff --git a/src/views/parkPay/coupon.vue b/src/views/parkPay/coupon.vue index 9731352..5dbdb6a 100644 --- a/src/views/parkPay/coupon.vue +++ b/src/views/parkPay/coupon.vue @@ -1,35 +1,73 @@