diff --git a/src/api/doPay.js b/src/api/doPay.js
new file mode 100644
index 0000000..addf0a3
--- /dev/null
+++ b/src/api/doPay.js
@@ -0,0 +1,16 @@
+import request from '@/utils/request'
+
+
+export function doPay(params) { // 支付信息获取
+ return request({
+ url: 'allInPay/doPay',
+ method: 'post',
+ data: params
+ })
+}
+
+
+
+
+
+
diff --git a/src/api/parkRecord/parkRecord.js b/src/api/parkRecord/parkRecord.js
index dcbdb0b..6f10b72 100644
--- a/src/api/parkRecord/parkRecord.js
+++ b/src/api/parkRecord/parkRecord.js
@@ -1,37 +1,49 @@
-import request from '@/utils/request'
+import request from "@/utils/request";
export function parkRecordList(params) {
return request({
- url: 'queryParkOrder/queryParkingRecordPageByCarNumbers',
- method: 'post',
+ url: "queryParkOrder/queryParkingRecordPageByCarNumbers",
+ method: "post",
data: params
- })
+ });
}
-
export function historyQuery(params) {
return request({
- url: 'queryParkOrder/queryArrearageStaForWXPublc',
- method: 'post',
+ url: "queryParkOrder/queryArrearageStaForWXPublc",
+ method: "post",
data: params
- })
+ });
}
export function parkingQuery(params) {
return request({
- url: 'queryParkOrder/billQuery',
- method: 'post',
+ url: "queryParkOrder/billQuery",
+ method: "post",
data: params
- })
+ });
}
export function appApplyParkOut(params) { // 0元出场
return request({
- url: 'appAccountPay/appApplyParkOut',
- method: 'post',
+ url: "appAccountPay/appApplyParkOut",
+ method: "post",
data: params
- })
+ });
}
+export function queryArrearageSta(params) { // 查询补缴订单详情
+ return request({
+ url: "queryParkOrder/queryArrearageSta",
+ method: "post",
+ data: params
+ });
+}
-
+export function doOrderCreate(params) { // 查询补缴订单详情
+ return request({
+ url: "allInPay/doOrderCreate",
+ method: "post",
+ data: params
+ });
+}
diff --git a/src/utils/request.js b/src/utils/request.js
index afb5215..b5c0e72 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -8,7 +8,7 @@ const service = axios.create({
// http://pay.service.renniting.cn/ 赤峰
// http://pay.service.huangshiparking.com/ 黄石正式环境
// http://39.98.54.240:8090/ 黄石测试环境
- baseURL: 'https://pay.ccccitd.cc', // url = base url + request url
+ baseURL: 'http://wxzhifu.natapp1.cc', // url = base url + request url
// withCredentials: true, // send cookies when cross-domain requests
timeout: 6000 // request timeout
})
diff --git a/src/utils/utils.js b/src/utils/utils.js
index b59e81c..98ef1a2 100644
--- a/src/utils/utils.js
+++ b/src/utils/utils.js
@@ -120,10 +120,13 @@ export default {
openId: "oWw3o5rY_bFsiT_nFd2CEQWGZfhs",
myOrgId: "10120", // 归属地 赤峰id 10003 黄石 10079
+
+ xuanhuaAppid:'00276515',
+ commonTerminalSource:'7',
// myVxAppId: 'wx1489e48e6a547023',
signObject: function(jsonObj) { //签名字段
jsonObj.sign_type = "md5";
- jsonObj.app_id = "ud8yq5tv0inxupc05xfeau39jywlqoj2";
+ jsonObj.app_id = "lrpo55tmveqe07w3gpovzgx34pdez7eh";
jsonObj.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
jsonObj.salt = myCommonSalt(32);
jsonObj.token = localStorage.getItem('userToken');
@@ -149,13 +152,13 @@ export default {
}
};
objb.sort(compare);
- var strmd5 = "ny1u72b6k374sg379z0kqjgfxe2ycnpw";
+ var strmd5 = "gz8wfwd0gn1etamjjhzey1ggcz78pfvd";
for (var i = 0; i < objb.length; i++) {
if (objb[i].value != null && objb[i].value != "") {
strmd5 += objb[i].keyname + objb[i].value;
}
}
- strmd5 += "ny1u72b6k374sg379z0kqjgfxe2ycnpw";
+ strmd5 += "gz8wfwd0gn1etamjjhzey1ggcz78pfvd";
// console.log('strmd5-------->'+strmd5);
strmd5 = md5(strmd5);
strmd5 = strmd5.toUpperCase();
diff --git a/src/views/parkPay/orderPay.vue b/src/views/parkPay/orderPay.vue
index b3c552a..e6d44c5 100644
--- a/src/views/parkPay/orderPay.vue
+++ b/src/views/parkPay/orderPay.vue
@@ -27,7 +27,7 @@
-
{{clientBrowser}}支付
+
{{clientBrowser}}支付
@@ -48,7 +48,8 @@
// import CryptoJS from '../utils/AES.js'
// let Base64 = require('js-base64').Base64
import { MessageBox } from 'mint-ui';
-import { aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers } from '@/api/orderPay/orderPay'
+import { aliPay, getOpenId, vxPayQuery, bankH5Pay, queryParkingRecordPageByCarNumbers} from '@/api/orderPay/orderPay'
+import { doPay } from '@/api/doPay'
export default {
name: 'orderPay',
@@ -80,9 +81,9 @@ export default {
this.orderId = this.$route.query.ordeID
console.log(this.orderId)
this.appOrderTimeout = this.$route.query.appOrderTimeout
- if (this.clientBrowser == "微信") {
- this.webAppCode = this.getCode();
- }
+ // if (this.clientBrowser == "微信") {
+ // this.webAppCode = this.getCode();
+ // }
@@ -109,99 +110,126 @@ export default {
},
toPay() {
let me = this
- let _order = []
-
- console.log(this.orderId)
- if (this.paySrcType == 103) {
- this.orderId = JSON.parse(this.orderId)
- this.orderId.forEach(item => {
- _order.push({
- orderId: item
- })
- })
- this.orderId = []
- this.orderId = _order
- }
-
-
- if (this.clientBrowser == '微信') { // 微信支付
- let _openId = sessionStorage.getItem('openIdData')
- if(_openId){
- me.vxPay(_openId, this.orderId)
- }else{
- //第一步获取openid
- var codeParams = {
- code: this.webAppCode,
- appId: this.$utils.myVxAppId
- };
- getOpenId(codeParams).then(res => {
- if (res.code == 0) {
- me.vxPay(res.data, this.orderId)
- sessionStorage.setItem('openIdData',res.data)
- } else if (res.code == 40163) { //code been used, hints[重复code问题]
- alert('请重新扫码重复code问题')
- console.log(res.message);
- } else {
- alert('请重新扫码')
- }
- })
- }
- }
+ // let _order = []
+ //
+ // console.log(this.orderId)
+ // if (this.paySrcType == 103) {
+ // this.orderId = JSON.parse(this.orderId)
+ // this.orderId.forEach(item => {
+ // _order.push({
+ // orderId: item
+ // })
+ // })
+ // this.orderId = []
+ // this.orderId = _order
+ // }
+
+
+ // if (this.clientBrowser == '微信') { // 微信支付
+ // let _openId = sessionStorage.getItem('openIdData')
+ // if(_openId){
+ // me.vxPay(_openId, this.orderId)
+ // }else{
+ // //第一步获取openid
+ // var codeParams = {
+ // code: this.webAppCode,
+ // appId: this.$utils.myVxAppId
+ // };
+ // getOpenId(codeParams).then(res => {
+ // if (res.code == 0) {
+ // me.vxPay(res.data, this.orderId)
+ // sessionStorage.setItem('openIdData',res.data)
+ // } else if (res.code == 40163) { //code been used, hints[重复code问题]
+ // alert('请重新扫码重复code问题')
+ // console.log(res.message);
+ // } else {
+ // alert('请重新扫码')
+ // }
+ // })
+ // }
+ // }
},
- vxPay(openIdData, orderIdData) {
- let vm = this
- var wxParams = {};
- wxParams.orderId = orderIdData;
- wxParams.backType = 2,
- wxParams.orgId = this.$utils.myOrgId,
- wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号
- wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付
- wxParams.carNumber = this.carNumber;
- 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) { //
- if (res.data) {
- var data = res.data;
- console.log(JSON.stringify(data));
- if (typeof WeixinJSBridge === 'undefined') { // 微信浏览器内置对象。参考微信官方文档
- if (document.addEventListener) {
- document.addEventListener('WeixinJSBridgeReady', vm.onBridgeReady(data), false)
- } else if (document.attachEvent) {
- document.attachEvent('WeixinJSBridgeReady', vm.onBridgeReady(data))
- document.attachEvent('onWeixinJSBridgeReady', vm.onBridgeReady(data))
- }
- } else {
- console.log('准备调用微信支付')
- vm.onBridgeReady(data)
- }
- } else {
- alert("没有找到返回值");
- }
- } else if(res.code == 1002){//其他情况如【该卡号场内已存在】
- console.log(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)
- }
+ vxPay() {
+ let me = this
+ var jsondata = {
+ appId:this.$utils.xuanhuaAppid,
+ carNumber: me.carNumber,
+ orderActFee: me.arrearageActFee, // 应收
+ orderBigType: '100', // 订单大类型 100:停车订单 200:充值订单 300:会员卡订单
+ orderTotalFee: me.arrearageActFee, // 实收
+ payOrderType: this.paySrcType, // 支付单来源 101:停车付款单 102:停车预付单 103:停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+ paySource: '3',
+ //支付单来源 101:停车付款单 102:停车预付单 103:停车补缴单 104 共享车位 201 余额充值单 202 押金充值单 301 会员卡购买单 302 会员卡续费
+ paySrcType: this.paySrcType,
+ payType: 36, // 36微信 37支付宝
+ rltOrderId: this.orderId,
+ sourceType: '3',
+ orgId: this.$utils.myOrgId,
+ terminalSource: this.$utils.commonTerminalSource,
+ };
+ jsondata.sign = this.$utils.signObject(jsondata)
+
+ doPay(jsondata).then(response => {
+ console.log(response.data.payinfo)
+ window.location.href = response.data.payinfo
})
+
+
+
+
+ // let vm = this
+ // var wxParams = {};
+ // wxParams.orderId = orderIdData;
+ // wxParams.backType = 2,
+ // wxParams.orgId = this.$utils.myOrgId,
+ // wxParams.payType = 4;// 1:支付宝 2:微信 3:银联 10:H5 4微信公众号
+ // wxParams.terminalSource = 7;//请求端来源 1: 任你停 2:pda 3:微信公共号 7:H5扫码 10页面支付
+ // wxParams.carNumber = this.carNumber;
+ // 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) { //
+ // if (res.data) {
+ // var data = res.data;
+ // console.log(JSON.stringify(data));
+ // if (typeof WeixinJSBridge === 'undefined') { // 微信浏览器内置对象。参考微信官方文档
+ // if (document.addEventListener) {
+ // document.addEventListener('WeixinJSBridgeReady', vm.onBridgeReady(data), false)
+ // } else if (document.attachEvent) {
+ // document.attachEvent('WeixinJSBridgeReady', vm.onBridgeReady(data))
+ // document.attachEvent('onWeixinJSBridgeReady', vm.onBridgeReady(data))
+ // }
+ // } else {
+ // console.log('准备调用微信支付')
+ // vm.onBridgeReady(data)
+ // }
+ // } else {
+ // alert("没有找到返回值");
+ // }
+ // } else if(res.code == 1002){//其他情况如【该卡号场内已存在】
+ // console.log(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)
+ // }
+ // })
},
onBridgeReady(params) {
let me = this
diff --git a/src/views/parkPay/parkRecord.vue b/src/views/parkPay/parkRecord.vue
index ea6224f..8a8239b 100644
--- a/src/views/parkPay/parkRecord.vue
+++ b/src/views/parkPay/parkRecord.vue
@@ -33,7 +33,8 @@
停车时长:{{ $utils.dateFormat(i.parkDuration)}}
¥{{(i.unPayFee/100).toFixed(2)}}
-
申请离场
+
申请离场
出场缴费
@@ -47,9 +48,9 @@
-
+
-
+
总欠费金额:
¥{{(allMoney/100).toFixed(2)}}
@@ -118,49 +119,45 @@