diff --git a/common/common.js b/common/common.js
index afc9c8c..42faa9e 100644
--- a/common/common.js
+++ b/common/common.js
@@ -1,6 +1,8 @@
import md5 from './md5.min.js';
// 江阴正式环境
var serverUrl = "https://bus.jycrtc.com";
+// 测试环境
+// var serverUrl = "http://test.jycrtc.com:8096";
//江阴微信小程序appid
const hs_wxPay_appId = 'wxfdc1af620d3ab750';
// 江阴慧停车orgId
@@ -67,13 +69,17 @@ const walletDetailsPage = serverUrl + "/business/h5/wallet/detailsPage";
// 钱包充值-微信
const publicUnifiedOrder = serverUrl + "/business/h5/pay/weixinpay/publicUnifiedOrder";
+// 根据商户支出停车费订单ID获取订单信息
+const getParkingInfoByOrderId = serverUrl + "/business/h5/wallet/detail/getParkingInfoByOrderId";
+
// 钱包-根据订单ID获取购买优惠券信息
const couponInfo = serverUrl + "/business/h5/wallet/detail/couponInfo";
// 根据车牌号查询车牌号订单支付详情
const queryParkingRecordByCarNumbers ="https://pay.jycrtc.com/queryParkOrder/queryParkingRecordPageByCarNumbersForBusiness";
-
-const getOpenIdByCode = "https://pay.jycrtc.com/weixinPublicPay/getSmallRoutineOpenIdByCode"
-
+// 根据商户支出 购买卡券订单ID获取订单信息
+const getOpenIdByCode = "https://pay.jycrtc.com/weixinPublicPay/getSmallRoutineOpenIdByCode"
+// 停车记录明细总览
+const parkingCouponSummary = serverUrl +"/business/h5/order/parkingCouponSummary"
const requestSign = function (inputData) {
var jsonList = inputData || {};
@@ -257,4 +263,6 @@ export default {
couponInfo,
queryParkingRecordByCarNumbers,
getOpenIdByCode,
+ getParkingInfoByOrderId,
+ parkingCouponSummary,
}
diff --git a/common/filters.js b/common/filters.js
index f57c60d..c7e52fb 100644
--- a/common/filters.js
+++ b/common/filters.js
@@ -3,7 +3,11 @@ const tranNull = value => {
if (value === null || value === undefined || value === '') return '-'
return value
}
-
+// 为空处理 return ‘’
+const tranStrNull = value => {
+ if (value === null || value === undefined || value === '') return ''
+ return value
+}
/*
@切割字符串
@@ -124,14 +128,37 @@ const cardTypeFormate = num => {
}
+function formatDateYMD(value) {
+ if (value === null || value === undefined || value === ''){
+ return '-'
+ } else{
+ var date = new Date(value);
+ var y = date.getFullYear(),
+ m = date.getMonth() + 1,
+ d = date.getDate(),
+ h = date.getHours(),
+ i = date.getMinutes(),
+ s = date.getSeconds();
+ if (m < 10) { m = '0' + m; }
+ if (d < 10) { d = '0' + d; }
+ if (h < 10) { h = '0' + h; }
+ if (i < 10) { i = '0' + i; }
+ if (s < 10) { s = '0' + s; }
+ var t = y + '-' + m + '-' + d + ' ' + h + ':' + i + ':' + s;
+ return t;
+ }
+
+}
export default {
tranNull,
+ tranStrNull,
RMB,
cutString,
toFixed2,
ortherToFixed,
toThousands,
timeFormatter,
- cardTypeFormate
+ cardTypeFormate,
+ formatDateYMD,
}
diff --git a/pages/businessCard/buyCard.vue b/pages/businessCard/buyCard.vue
index ac82670..5d777b9 100644
--- a/pages/businessCard/buyCard.vue
+++ b/pages/businessCard/buyCard.vue
@@ -174,7 +174,7 @@ export default {
let that = this
let paramsData = {
buyNum: this.vModelValue.toString(),
- totalPrice: this.needPay.toString(),
+ totalPrice: (this.needPay * 100).toString(),
cardRelParkNo: this.cardRelParkNo,
cardRuleNo: this.cardRuleNo
}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 807503c..565050a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -21,7 +21,7 @@
diff --git a/pages/moneyRecharge/moneyRecharge.vue b/pages/moneyRecharge/moneyRecharge.vue
index 82a258f..8c32820 100644
--- a/pages/moneyRecharge/moneyRecharge.vue
+++ b/pages/moneyRecharge/moneyRecharge.vue
@@ -3,7 +3,7 @@
明细 >
- ¥{{acctBalance | toFixed2 }}
+ ¥{{acctBalance | toFixed2 }}元
diff --git a/pages/parkPay/parkPay.vue b/pages/parkPay/parkPay.vue
index 37ffe89..5d95f1e 100644
--- a/pages/parkPay/parkPay.vue
+++ b/pages/parkPay/parkPay.vue
@@ -1,226 +1,276 @@
-
+
-
-
- 订单详情
-
-
- 车牌号:{{mycarNumber | tranNull}}
-
-
-
- 停车场:{{parkName | tranNull}}
-
-
-
- 进场时间:{{parkInTime | tranNull}}
-
-
-
- 停车时间:{{staytime | timeFormatter}}
-
-
-
- 总计费用:{{due |toFixed2}}元
-
-
-
-
-
- 支付金额
-
-
-
- {{orderFee | toFixed2}}
-
-
- 元
-
-
-
-
-
-
-
- 支付方法
-
-
-
-
-
-
- 商户余额
-
-
-
-
-
-
-
-
-
+
+ 订单详情
+
+
+ 车牌号:{{mycarNumber | tranNull}}
+
+
+
+ 停车场:{{parkName | tranNull}}
+
+
+
+ 进场时间:{{parkInTime | tranNull}}
+
+
+
+ 停车时间:{{staytime | timeFormatter}}
+
+
+
+ 总计费用:{{due |toFixed2}}元
+
+
+
+
+
+ 需支付金额
+
+
+
+ {{orderFee | toFixed2}}
+
+
+ 元
+
+
+
+
+
+
+ 元
+
+
+
+
+
+ 支付方法
+
+
+
+
+
+
+ 商户余额
+
+
+
+
+
+
+
+
+
diff --git a/pages/parkRecordList/parkRecordList.vue b/pages/parkRecordList/parkRecordList.vue
index 1599d13..993b31b 100644
--- a/pages/parkRecordList/parkRecordList.vue
+++ b/pages/parkRecordList/parkRecordList.vue
@@ -1,173 +1,200 @@
-
-
+
+
+
+
+
+
+
+ 开始时间
+
+
+
+ {{startTime}}
+
+
+
-
-
-
- 开始时间
-
-
-
- {{startTime}}
-
-
-
+
+
+ 结束时间
+
+
+
+ {{endTime}}
+
+
+
+
-
-
- 结束时间
-
-
-
- {{endTime}}
-
-
-
-
+
+
+
+ {{i.plName}}
+
+
+ {{i.carNumber}}
+
+
+
+
+ 实收:{{ $common.moneyFormat(i.orderActFee) }}
+ 应收:{{ $common.moneyFormat(i.orderTotalFee) }}
+
+
-
-
-
- {{i.plName}}
-
-
- {{i.carNumber}}
-
-
-
-
- 实收:{{ $common.moneyFormat(i.orderTotalFee) }}
- 应收:{{ $common.moneyFormat(i.orderActFee) }}
-
-
+
-
+
+
+
+ 暂无停车记录
+
-
-
-
- 暂无停车记录
-
+
-
-
-
+
diff --git a/pages/rechargeDetail/outDetail.vue b/pages/rechargeDetail/outDetail.vue
index f8a79e9..8b6cf9d 100644
--- a/pages/rechargeDetail/outDetail.vue
+++ b/pages/rechargeDetail/outDetail.vue
@@ -1,7 +1,7 @@
- {{changeFeeDetail}}
+ {{changeFeeDetail}}元
@@ -38,6 +38,42 @@
{{typeName | tranNull}}
+
+
+
+
+ 车场名称
+
+
+ {{plName | tranNull}}
+
+
+
+
+ 车牌号码
+
+
+ {{carNumber | tranNull}}
+
+
+
+
+ 入场时间
+
+
+ {{parkInTime | formatDateYMD}}
+
+
+
+
+ 出场时间
+
+
+ {{parkOutTime | formatDateYMD}}
+
+
+
+
@@ -81,9 +117,14 @@
typeName: '',
payType: '商户余额',
cardRuleName: '',
+ plName: '',
+ carNumber: '',
+ parkInTime: '',
+ parkOutTime: '',
cardType: '',
cardNum: '',
cardIsShow: false,
+ parkIsShow: false,
}
},
onLoad(params) {
@@ -101,8 +142,12 @@
if (option.typeName == "购买卡券") {
this.cardIsShow = true;
this.getCouponInfo();
+ } else if (option.typeName == "支付停车费") {
+ this.parkIsShow = true;
+ this.getParkingInfo();
} else {
this.cardIsShow = false;
+ this.parkIsShow = false;
}
},
onShow() {
@@ -173,6 +218,24 @@
that.cardNum = res.data.buyNum
})
},
+ getParkingInfo() {
+ let that = this
+ let paramsData = {
+ orderId: that.orderId
+ }
+ that.$myRequest({
+ url: that.$common.getParkingInfoByOrderId,
+ method: 'POST',
+ data: that.$common.requestSign(paramsData)
+ }).then(res => {
+ console.log(res)
+
+ that.plName = res.data.plName
+ that.carNumber = res.data.carNumber
+ that.parkInTime = res.data.parkInTime
+ that.parkOutTime = res.data.parkOutTime
+ })
+ },
}
}
diff --git a/pages/rechargeDetail/rechargeDetail.vue b/pages/rechargeDetail/rechargeDetail.vue
index dfb08e2..5f91263 100644
--- a/pages/rechargeDetail/rechargeDetail.vue
+++ b/pages/rechargeDetail/rechargeDetail.vue
@@ -76,7 +76,7 @@
- {{item.changeFeeDetail}}
+ {{item.changeFeeDetail}}元 {{item.carNumber | tranStrNull}}
{{item.payStateDesc}}