Merge remote-tracking branch 'origin/branch' into branch

# Conflicts: # common/common.js # pages/index/index.vue

Merge remote-tracking branch 'origin/branch' into branch
# Conflicts: # common/common.js # pages/index/index.vue
chenbiao
2 parents 93c5ecb3 752e0b8b
Showing 4 changed files with 64 additions and 35 deletions
common/common.js
pages.json
pages/index/index.vue
pages/parkRecordList/parkRecordList.vue
@@ -35,13 +35,16 @@ const walletAccount = serverUrl + &quot;/business/h5/wallet/account&quot;;
 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",
 }
@@ -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": "设置",
@@ -48,7 +48,7 @@
 							</view>
 							<view class="index-title">停车缴费</view>
 						</view>
-						<view class="flex-item">
+						<view class="flex-item" @click="toRecordPage">
 							<view class="">
 								<image src="../../static/me/me-recoder.png" class="index-icon"></image>
 							</view>
@@ -178,7 +178,7 @@
 			toPursePage() {
 				uni.navigateTo({
 					url: '../moneyRecharge/moneyRecharge'
-			
+
 				});
 			},
 			toInvoicePage() {
@@ -193,7 +193,15 @@
  
 				});
 			},
-			
+            toRecordPage() {
+            	uni.navigateTo({
+              		url: '../parkRecordList/parkRecordList'
+
+            	});
+          	},
+
+
+
 		}
 	}
 </script>
 <template>
     <view>
         <!--<view class="uni-title uni-common-pl">日期选择器</view>-->
-		
-		
+
+
         <view class="uni-list">
             <view class="uni-list-cell">
                 <view class="uni-list-cell-left">
@@ -71,12 +71,8 @@
 </template>
  
 <script>
-import common from "../../common/common.js";
-import requestServer from "../../common/requestServer.js";
-
  
 export default {
-
   data() {
     const currentDate = this.getDate({
       format: true
@@ -100,8 +96,7 @@ export default {
       this.mycarNumber = params.carNumber;
       // this.mycarNumber = '苏B3M913';
     }
-    // this.getRecordOrder(this.mycarNumber, 10);
-    //console.log("xxxmake = "+this.makedateFormat());
+   this.getBusinessParkOrderByBusIdForPage()
   },
   onShow() {
     var me = this;
@@ -113,9 +108,7 @@ export default {
     }
   },
   // 过滤器
-  filters: {
-
-  },
+  filters: {},
   //计算属性
   computed: {
     startDate() {
@@ -126,6 +119,23 @@ export default {
     }
   },
   methods: {
+    // 通过商户ID查询停车记录信息
+    getBusinessParkOrderByBusIdForPage() {
+      let that = this
+      let paramsData = {
+        businessId: uni.getStorageSync("indexInfo").businessId,
+        startTime: that.date,
+        endTime: that.date
+      }
+      // 首页信息获取 接口
+      that.$myRequest({
+        url: that.$common.getBusinessParkOrderByBusIdForPage,
+        method: 'POST',
+        data: that.$common.requestSign(paramsData)
+      }).then(res => {
+        console.log(res)
+      })
+    },
     bindDateChange: function (e) {
       this.date = e.detail.value
     },
@@ -151,16 +161,17 @@ export default {
     .parkRecordWrap {
         padding: 5px 40px 5px 15px;
         border-bottom: 1px solid #ccc;
-        position:relative;
-        :after{
+        position: relative;
+        :after {
             content: '>';
             position: absolute;
-            top:20px;
+            top: 20px;
             right: 5px;
             font-size: 18px;
         }
     }
-    .recordCon{
+
+    .recordCon {
         color: #999;
         display: flex;
         justify-content: space-between;