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

John/release 2.4.0/scrm 3298

src/common/js/BaseDictionary.js

@@ -92,6 +92,7 @@ export const ORDER_STATUS = {
   PAID: '已支付',
   REFUND: '已退款',
   TIME_OUT: '已超时',
+  FAILED: '支付失败'
 }
 
 // 不同环境的基础数据

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

@@ -8,7 +8,7 @@
           <div class="price">{{ detail.actualPayFee | currency }}</div>
           <div class="price-text">
             <!-- {{ ['支付成功', '支付失败', '已退款'][detail.payStatus] }} -->
-            {{ detail.orderStatus | orderStatus }}
+            {{ detail.payStatus }}
           </div>
         </div>
         <div class="parking-part parking-detail">

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

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

src/pages/parkingFee/components/base/parkingReceipt/parkingApplication.vue

@@ -3,7 +3,8 @@
     <!--    <wx-points-commit ref='wxPointsCommit'></wx-points-commit>-->
 
     <scroll-view class="push-box">
-      <div class="choose-invoice-header lines" @click="changeHeader">
+      <div>
+        <div class="choose-invoice-header lines" @click="changeHeader">
         <div class="invoice-header-info" v-if="headerInfo.titleName">
           <div
             class="invoice-header-name"
@@ -41,9 +42,9 @@
       <div class="part" v-if="headerInfo.titleName">
         <div class="invoice-header">
           <!-- <div class="part-item">
-          			<span class="part-item-key">开票订单号</span>
-          			<span class="part-item-value">{{ orderInfo.orderNo }}</span>
-          		</div> -->
+                <span class="part-item-key">开票订单号</span>
+                <span class="part-item-value">{{ orderInfo.orderNo }}</span>
+              </div> -->
           <div class="part-item">
             <span class="part-item-key">发票类型</span>
             <span class="part-item-value">增值税普通发票</span>
@@ -152,6 +153,8 @@
           v-model="condition.remark"
         ></textarea>
       </div>
+      <div style="height:160px"></div>
+      </div>
     </scroll-view>
     <div class="push-btn">
       <div