ソースを参照

feat: 缴费记录优化

John-Hong 2 年 前
コミット
e39ec50b01

+ 4 - 4
src/pages/parkingFee/components/base/parkingFeeDetailSuccess.vue

@@ -19,7 +19,7 @@
 
           <div class="parking-info-item">
             <span class="info-key">支付时间</span>
-            <span class="info-value">{{ detail.createTime || '' }}</span>
+            <span class="info-value">{{ detail.createTime | momentFormat }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">车牌号</span>
@@ -37,7 +37,7 @@
           </div>
           <div class="parking-info-item">
             <span class="info-key">入场时间</span>
-            <span class="info-value">{{ detail.enterTime }}</span>
+            <span class="info-value">{{ detail.enterTime | momentFormat }}</span>
           </div>
           <!-- <div class="parking-info-item">
             <span class="info-key">离场时间</span>
@@ -45,7 +45,7 @@
           </div> -->
           <div class="parking-info-item">
             <span class="info-key">停车时长</span>
-            <span class="info-value">{{ detail.serviceMin }}</span>
+            <span class="info-value">{{ detail.serviceMin | parkingTime }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">开票状态</span>
@@ -101,7 +101,7 @@
           </div>
           <div class="parking-info-item">
             <span class="info-key">实缴</span>
-            <span class="info-value red">{{ (detail.actualPayFee / 100) | currency }}</span>
+            <span class="info-value red">{{ detail.actualPayFee | currency }}</span>
           </div>
         </div>
       </div>

+ 1 - 1
src/pages/parkingFee/components/base/parkingFeeList.vue

@@ -28,7 +28,7 @@
             {{ item.id + '-' + item.vehicleNo }}
           </div>
           <div style="color: red; margin-right: 6px">
-            {{ (item.actualPayFee / 100) | currency }}
+            {{ (item.totalPaidAmount ) | currency }}
           </div>
         </div>
 

+ 22 - 16
src/pages/parkingFee/mixins/parkingFeeDetailSuccess.js

@@ -2,7 +2,8 @@ import { mapState } from 'vuex';
 import uni from '@/utils/uniHooks';
 import { orderInfo } from '@/api/parking';
 import ordersInfoMockData from '@/api/mockData/ordersInfo.json';
-import {ORDER_STATUS} from '@/common/js/BaseDictionary'
+import { ORDER_STATUS } from '@/common/js/BaseDictionary'
+import moment from 'moment'
 export default {
   data() {
     return {
@@ -22,19 +23,7 @@ export default {
     this.getData();
   },
   computed: {
-    parkingTime() {
-      const time = this.detail.serviceMin;
-      const days = parseInt(time / 60 / 24);
-      const hours = parseInt((time / 60) % 24);
-      const minutes = parseInt(time % 60);
-      if (days > 0) {
-        return `${days}天 ${hours}小时 ${minutes}分钟`;
-      }
-      if (hours > 0) {
-        return `${hours}小时 ${minutes}分钟`;
-      }
-      return `${minutes}分钟`;
-    },
+
     ...mapState({
       // custTypeId: (state) => state.custTypeId,
       // paramsScene: (state) => state.paramsScene,
@@ -117,9 +106,26 @@ export default {
       });
     },
   },
-  filters:{
+  filters: {
     orderStatus(val) {
       return ORDER_STATUS[val]
-    } 
+    },
+    parkingTime(val) {
+      const time = val;
+      const days = parseInt(time / 60 / 24);
+      const hours = parseInt((time / 60) % 24);
+      const minutes = parseInt(time % 60);
+      if (days > 0) {
+        return `${days}天 ${hours}小时 ${minutes}分钟`;
+      }
+      if (hours > 0) {
+        return `${hours}小时 ${minutes}分钟`;
+      }
+      return `${minutes}分钟`;
+    },
+    momentFormat(val) {
+      if(!val)return val
+      return moment(val).format('YYYY-MM-DD hh:mm:ss')
+    }
   }
 };