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

# Conflicts: # common/common.js

Merge remote-tracking branch 'origin/branch' into branch
# Conflicts: # common/common.js
chenbiao
2 parents b398dc4a 5b4291f2
Showing 3 changed files with 73 additions and 28 deletions
common/common.js
pages/parkRecordList/parkRecordList.vue
pages/parkRecordList/recordDetail.vue
@@ -4,7 +4,7 @@ import md5 from &#39;./md5.min.js&#39;;
 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 + &quot;/business/h5/index/logout&quot;;
 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",
+
+
+
 }
@@ -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();
@@ -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
     },