diff --git a/common/common.js b/common/common.js
index 296d728..df74e17 100644
--- a/common/common.js
+++ b/common/common.js
@@ -35,13 +35,16 @@ const walletAccount = serverUrl + "/business/h5/wallet/account";
const requestSign = function(inputData) {
var jsonList = inputData || {};
+
+ 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 = '84b5a8edb5974f7989e7888b9f48a765';
+ // jsonList.token = getGlobalUser("globalUser").token;
+ // jsonList.token = getGlobalUser("globalUser").token;
+ jsonList.token = 'eb1538c4c2ee45d7b2610cf071c4a27f';
var arrData = [];
for (var key in jsonList) {
@@ -126,4 +129,6 @@ export default {
userLoginout,
useraboutUs,
walletAccount,
+ // 通过商户ID查询停车记录信息
+ getBusinessParkOrderByBusIdForPage:serverUrl + "/business/h5/order/getBusinessParkOrderByBusIdForPage",
}
diff --git a/pages.json b/pages.json
index 3dee268..e9f9b82 100644
--- a/pages.json
+++ b/pages.json
@@ -13,13 +13,30 @@
},
"pages": [
// pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
-
+ {
+ "path": "pages/parkRecordList/parkRecordList",
+ "style": {
+ "navigationBarTitleText": "停车记录"
+ }
+ },
{
"path": "pages/index/index",
"style": {
"navigationBarTitleText": "商户管理"
}
},
+
+ {
+ "path": "pages/login/login",
+ "style": {
+ "navigationBarTitleText": "商户中心",
+ "enablePullDownRefresh": false
+ }
+
+ },
+
+
+
{
"path": "pages/businessCard/cardPrint",
"style": {
@@ -58,12 +75,7 @@
"navigationBarTitleText": "订单详情"
}
},
- {
- "path": "pages/parkRecordList/parkRecordList",
- "style": {
- "navigationBarTitleText": "停车记录"
- }
- },
+
{
"path": "pages/parkPay/parkPay",
"style": {
@@ -127,14 +139,7 @@
"navigationBarTitleText": "账单详情"
}
},
- {
- "path": "pages/login/login",
- "style": {
- "navigationBarTitleText": "商户中心",
- "enablePullDownRefresh": false
- }
-
- }, {
+ {
"path": "pages/setting/setting",
"style": {
"navigationBarTitleText": "设置",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index af22923..2b99320 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -48,7 +48,7 @@
停车缴费
-
+
@@ -178,7 +178,7 @@
toPursePage() {
uni.navigateTo({
url: '../moneyRecharge/moneyRecharge'
-
+
});
},
toInvoicePage() {
@@ -193,7 +193,15 @@
});
},
-
+ toRecordPage() {
+ uni.navigateTo({
+ url: '../parkRecordList/parkRecordList'
+
+ });
+ },
+
+
+
}
}
diff --git a/pages/parkRecordList/parkRecordList.vue b/pages/parkRecordList/parkRecordList.vue
index 6e9c1fa..e87149d 100644
--- a/pages/parkRecordList/parkRecordList.vue
+++ b/pages/parkRecordList/parkRecordList.vue
@@ -1,8 +1,8 @@
-
-
+
+
@@ -71,12 +71,8 @@