Merge pull request #126 from John-Hong/John/release-2.4.0/SCRM-3298

John/release 2.4.0/scrm 3298

src/pages/parkingFee/components/base/parkingFeeDetailSuccess.vue

@@ -8,9 +8,8 @@
           <div class="price">{{ detail.actualPayFee | currency }}</div>
           <div class="price-text">
             <!-- {{ ['支付成功', '支付失败', '已退款'][detail.payStatus] }} -->
-
-<!--            {{ detail.refundStatus === '1' ? '已退款' : {'PAID': '已支付','PAY_FAIED': '支付失败'}[detail.paymentStatus] }}-->
-            {{ detail.refundStatus !== 'NO_REFUND' ? '已退款' : {'PAID': '支付成功','UN_PAID': '支付失败'}[detail.payStatus || 'UN_PAID'] }}
+<!--            {{ detail.refundStatus === '1' ? '已退款' : detail.paymentStatus }}-->
+            {{ detail.refundStatus !== 'NO_REFUND' ? '已退款' : detail.payStatus }}
           </div>
         </div>
         <div class="parking-part parking-detail">
@@ -21,7 +20,7 @@
 
           <div class="parking-info-item">
             <span class="info-key">支付时间</span>
-            <span class="info-value">{{ detail.createTime | momentFormat }}</span>
+            <span class="info-value">{{ detail.paymentTime }}</span>
           </div>
           <div class="parking-info-item">
             <span class="info-key">车牌号</span>
@@ -39,7 +38,7 @@
           </div>
           <div class="parking-info-item">
             <span class="info-key">入场时间</span>
-            <span class="info-value">{{ detail.enterTime | momentFormat }}</span>
+            <span class="info-value">{{ detail.enterTime }}</span>
           </div>
           <!-- <div class="parking-info-item">
             <span class="info-key">离场时间</span>
@@ -55,7 +54,7 @@
           </div>
         </div>
       </div>
-      <div class="parking-info mgb-40 mb-save">
+      <div class="parking-info mgb-40 mb-save" v-if="detail.discountInfo">
         <div class="parking-part">
           <div class="parking-info-item" v-if="false">
             <!--todo: 杭州首停不显示暂时根据groupId写死-->