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

chenbiao
2 parents eb4f2617 16cff37f
Showing 3 changed files with 32 additions and 39 deletions
common/common.js
common/uni.css
pages/parkRecordList/parkRecordList.vue
@@ -111,6 +111,11 @@ var getGlobalUser = function(key) {
 	}
 }
+// 除了金额
+var moneyFormat = function (val) {
+	return (val/100).toFixed(2)
+}
+
 export default {
 	// deviceInfo,
@@ -122,6 +127,7 @@ export default {
 	appVerson,
 	SetToken,
 	requestSign,
+  moneyFormat,
 	// 接口
 	userLogin,
@@ -1848,4 +1848,9 @@ checkbox-group label {
 .color-62c7ee {
 	background-color: #62c7ee !important;
+}
+
+.marginAuto{
+	width: 100%;
+	margin: 0 auto;
 }
 \ No newline at end of file
@@ -27,40 +27,28 @@
             </view>
         </view>
-
-        <view class="parkRecordWrap">
-            <view>
-                金融物流港（原蒙东云计算）
-            </view>
-            <view class="recordCon">
-                <text>蒙DL232112</text>
-                <text>2022-03-20 20:20:20</text>
-            </view>
-            <view class="recordCon">
-                <text>实收:10.00</text>
-                <text>应收:10.00</text>
+        <view v-if="recordList.length>0">
+            <view class="parkRecordWrap" v-for="(i, index) in recordList">
+                <view>
+                    {{i.plName}}
+                </view>
+                <view class="recordCon">
+                    <text>{{i.carNumber}}</text>
+                    <!--<text>{{i.parkOutTime}}</text>-->
+                    <uni-dateformat :date="i.parkOutTime" format="yyyy-MM-dd hh:mm:ss"></uni-dateformat>
+                </view>
+                <view class="recordCon">
+                    <text>实收:{{ $common.moneyFormat(i.orderTotalFee) }}</text>
+                    <text>应收:{{ $common.moneyFormat(i.orderActFee) }}</text>
+                </view>
             </view>
-        </view>
-
-        <view class="parkRecordWrap">
-            <view>
-                金融物流港（原蒙东云计算）
-            </view>
-            <view class="recordCon">
-                <text>蒙DL232112</text>
-                <text>2022-03-20 20:20:20</text>
-            </view>
-            <view class="recordCon">
-                <text>实收:10.00</text>
-                <text>应收:10.00</text>
-            </view>
         </view>
-        <view v-if="shownoFlag == 1" class="novipcard_Mid">
-            <image class="novipcard" src="../../static/vipcard/novipcard.png" mode="aspectFit"></image>
-            <view class="novipcard_txt">
+        <view v-else>
+            <image class="marginAuto" src="../../static/vipcard/novipcard.png" mode="aspectFit"></image>
+            <view class="text-center">
                 暂无停车记录
             </view>
@@ -81,7 +69,8 @@ export default {
       date: currentDate,
       mycarNumber: '',
       userIsLogin: false,
-      shownoFlag: 0
+      // shownoFlag: 0,
+      recordList: [],
     }
   },
   onLoad(params) {
@@ -89,14 +78,7 @@ export default {
       withShareTicket: true
     })
     console.log("params.record : " + params.record);
-    if (params.record == 1) {
-      this.mycarNumber = '';
-    }
-    else {
-      this.mycarNumber = params.carNumber;
-      // this.mycarNumber = '苏B3M913';
-    }
-   this.getBusinessParkOrderByBusIdForPage()
+    this.getBusinessParkOrderByBusIdForPage()
   },
   onShow() {
     var me = this;
@@ -133,7 +115,7 @@ export default {
         method: 'POST',
         data: that.$common.requestSign(paramsData)
       }).then(res => {
-        console.log(res)
+        this.recordList = res.data.dataList
       })
     },
     bindDateChange: function (e) {