From d9f79954b88e1f7d27bb9e96d8388519298e91eb Mon Sep 17 00:00:00 2001
From: liugongyu <290219706@qq.com>
Date: Mon, 16 May 2022 11:04:36 +0800
Subject: [PATCH] 停车记录

---
 common/common.js                        | 17 +++++++++++++----
 pages/parkRecordList/parkRecordList.vue | 32 +++++++++++++++++++++++---------
 pages/parkRecordList/recordDetail.vue   | 31 ++++++++++++++++++++-----------
 3 files changed, 56 insertions(+), 24 deletions(-)

diff --git a/common/common.js b/common/common.js
index 3d3d18b..131c621 100644
--- a/common/common.js
+++ b/common/common.js
@@ -31,6 +31,14 @@ const useraboutUs = serverUrl + "/business/h5/index/aboutUs";
 //  商户账户余额信息
 const walletAccount = serverUrl + "/business/h5/wallet/account";
 
+//  通过商户ID查询停车记录信息
+const getBusinessParkOrderByBusIdForPage = serverUrl + "/business/h5/order/getBusinessParkOrderByBusIdForPage";
+
+//  通过商户ID查询停车记录信息
+const getPayOrderByOrderId = serverUrl + "/business/h5/order/getPayOrderByOrderId";
+
+
+
 //
 const requestSign = function(inputData) {
 
@@ -43,8 +51,8 @@ const requestSign = function(inputData) {
 	jsonList.salt = getSalt();
 	jsonList.terminalSource = "11";
 	// jsonList.token = getGlobalUser("globalUser").token;
-  // jsonList.token = getGlobalUser("globalUser").token;
-  jsonList.token = 'eb1538c4c2ee45d7b2610cf071c4a27f';
+  jsonList.token = getGlobalUser("globalUser").token;
+  // jsonList.token = 'af7ed65335f842ee8f754e841ff940ea';
 
 	var arrData = [];
 	for (var key in jsonList) {
@@ -135,6 +143,7 @@ export default {
 	userLoginout,
 	useraboutUs,
 	walletAccount,
-  //  通过商户ID查询停车记录信息
-  getBusinessParkOrderByBusIdForPage:serverUrl + "/business/h5/order/getBusinessParkOrderByBusIdForPage",
+  //
+  getBusinessParkOrderByBusIdForPage,
+  getPayOrderByOrderId
 }
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 @@
                     开始时间
                 </view>
                 <view class="uni-list-cell-db">
-                    <picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
-                        <view class="uni-input">{{date}}</view>
+                    <picker mode="date" :value="startTime" :start="startDate" :end="endDate" @change="bindStartDateChange">
+                        <view class="uni-input">{{startTime}}</view>
                     </picker>
                 </view>
             </view>
@@ -20,15 +20,15 @@
                     结束时间
                 </view>
                 <view class="uni-list-cell-db">
-                    <picker mode="date" :value="date" :start="startDate" :end="endDate" @change="bindDateChange">
-                        <view class="uni-input">{{date}}</view>
+                    <picker mode="date" :value="endTime" :start="startDate" :end="endDate" @change="bindDateChange">
+                        <view class="uni-input">{{endTime}}</view>
                     </picker>
                 </view>
             </view>
         </view>
 
         <view v-if="recordList.length>0">
-            <view class="parkRecordWrap" v-for="(i, index) in recordList">
+            <view class="parkRecordWrap" v-for="(i, index) in recordList" @click="toRecordDetail(i.orderId)">
                 <view>
                     {{i.plName}}
                 </view>
@@ -60,13 +60,15 @@
 
 <script>
 
+import common from "../../common/common";
 export default {
   data() {
     const currentDate = this.getDate({
       format: true
     })
     return {
-      date: currentDate,
+      startTime:currentDate,
+      endTime: currentDate,
       mycarNumber: '',
       userIsLogin: false,
       // shownoFlag: 0,
@@ -106,8 +108,8 @@ export default {
       let that = this
       let paramsData = {
         businessId: uni.getStorageSync("indexInfo").businessId,
-        startTime: that.date,
-        endTime: that.date
+        startTime: that.startTime,
+        endTime: that.endTime
       }
       // 首页信息获取 接口
       that.$myRequest({
@@ -118,8 +120,20 @@ export default {
         this.recordList = res.data.dataList
       })
     },
+    toRecordDetail: function(orderId){
+      console.log(orderId)
+      uni.navigateTo({
+        url: '../parkRecordList/recordDetail?orderId='+orderId
+      });
+
+    },
+    bindStartDateChange: function (e) {
+      this.startTime = e.detail.value
+      this.getBusinessParkOrderByBusIdForPage()
+    },
     bindDateChange: function (e) {
-      this.date = e.detail.value
+      this.endTime = e.detail.value
+      this.getBusinessParkOrderByBusIdForPage()
     },
     getDate(type) {
       const date = new Date();
diff --git a/pages/parkRecordList/recordDetail.vue b/pages/parkRecordList/recordDetail.vue
index 7431802..9989de4 100644
--- a/pages/parkRecordList/recordDetail.vue
+++ b/pages/parkRecordList/recordDetail.vue
@@ -173,23 +173,17 @@ export default {
       date: currentDate,
       mycarNumber: '',
       userIsLogin: false,
-      shownoFlag: 0
+      shownoFlag: 0,
+      orderId:'',// 订单号
     }
   },
   onLoad(params) {
     wx.showShareMenu({
       withShareTicket: true
     })
-    console.log("params.record : " + params.record);
-    if (params.record == 1) {
-      this.mycarNumber = '';
-    }
-    else {
-      this.mycarNumber = params.carNumber;
-      // this.mycarNumber = '苏B3M913';
-    }
-    // this.getRecordOrder(this.mycarNumber, 10);
-    //console.log("xxxmake = "+this.makedateFormat());
+    this.orderId = params.orderId
+    console.log(this.orderId)
+    this.getPayOrderByOrderId();
   },
   onShow() {
     var me = this;
@@ -212,6 +206,21 @@ export default {
     }
   },
   methods: {
+    // 通过商户ID查询停车记录信息
+    getPayOrderByOrderId() {
+      let that = this
+      let paramsData = {
+        orderId: '101962015377023516672'
+      }
+      // 首页信息获取 接口
+      that.$myRequest({
+        url: that.$common.getPayOrderByOrderId,
+        method: 'POST',
+        data: that.$common.requestSign(paramsData)
+      }).then(res => {
+       console.log(res)
+      })
+    },
     bindDateChange: function (e) {
       this.date = e.detail.value
     },
--
libgit2 0.21.4