diff --git a/common/common.js b/common/common.js
index 55a9747..f912dfa 100644
--- a/common/common.js
+++ b/common/common.js
@@ -4,7 +4,7 @@ import md5 from './md5.min.js';
var serverUrl = "https://bus.jycrtc.com";
//江阴微信小程序appid
-const hs_wxPay_appId = 'wxfdc1af620d3ab750';
+const hs_wxPay_appId = 'wxfdc1af620d3ab750';
// 江阴慧停车orgId
const public_orgId = '10107';
@@ -29,25 +29,33 @@ const userLoginout = serverUrl + "/business/h5/index/logout";
const useraboutUs = serverUrl + "/business/h5/index/aboutUs";
// 商户账户余额信息
-const walletAccount = serverUrl + "/business/h5/wallet/account";
+const walletAccount = serverUrl + "/business/h5/wallet/account";
// 商户充值金额列表
const rechargeList = serverUrl + "/business/h5/wallet/rechargeList";
+// 通过商户ID查询停车记录信息
+const getBusinessParkOrderByBusIdForPage = serverUrl + "/business/h5/order/getBusinessParkOrderByBusIdForPage";
+
+// 通过商户ID查询停车记录信息
+const getPayOrderByOrderId = serverUrl + "/business/h5/order/getPayOrderByOrderId";
+
+
+
//
const requestSign = function(inputData) {
var jsonList = inputData || {};
- jsonList.orgId = public_orgId;
+ jsonList.orgId = public_orgId;
jsonList.sign_type = "md5";
jsonList.app_id = "0eca8f5373ca4866aec2f8e9d9367104";
jsonList.deviceInfo = "BC0703A4-AFB0-4B51-9089-9B7487C0CC6E";
jsonList.salt = getSalt();
jsonList.terminalSource = "11";
+ // jsonList.token = getGlobalUser("globalUser").token;
jsonList.token = getGlobalUser("globalUser").token;
- // jsonList.token = getGlobalUser("globalUser").token;
- // jsonList.token = 'af7ed65335f842ee8f754e841ff940ea';
+ // jsonList.token = 'af7ed65335f842ee8f754e841ff940ea';
var arrData = [];
for (var key in jsonList) {
@@ -130,7 +138,7 @@ export default {
appVerson,
SetToken,
requestSign,
- moneyFormat,
+ moneyFormat,
// 接口
userLogin,
@@ -138,7 +146,21 @@ export default {
userLoginout,
useraboutUs,
walletAccount,
+ //刘淇接口
+ getBusinessParkOrderByBusIdForPage,
+ getPayOrderByOrderId,
+
+
+
+
+
+
+
+
+
+ //陈彪接口
rechargeList,
- // 通过商户ID查询停车记录信息
- getBusinessParkOrderByBusIdForPage:serverUrl + "/business/h5/order/getBusinessParkOrderByBusIdForPage",
+
+
+
}
diff --git a/pages/parkRecordList/parkRecordList.vue b/pages/parkRecordList/parkRecordList.vue
index cfb92c1..ce750b9 100644
--- a/pages/parkRecordList/parkRecordList.vue
+++ b/pages/parkRecordList/parkRecordList.vue
@@ -9,8 +9,8 @@
开始时间
-
- {{date}}
+
+ {{startTime}}
@@ -20,15 +20,15 @@
结束时间
-
- {{date}}
+
+ {{endTime}}
-
+
{{i.plName}}
@@ -60,13 +60,15 @@