Merge pull request #114 from John-Hong/release-2.8.0

Release 2.8.0

src/pages/parkingFee/parkingFee.vue

@@ -128,9 +128,9 @@
             <div class="title_box">
               <span class="btn">缴费说明</span>
             </div>
-            <div class="sub_title_box">
-              <span class="btn">基础计费规则：</span>
-            </div>
+<!--            <div class="sub_title_box">-->
+<!--              <span class="btn">基础计费规则：</span>-->
+<!--            </div>-->
             
             <div class="info" :class="!init_ch ? 'info_show' : ''">
               <!-- <p></p> -->
@@ -462,6 +462,8 @@ export default {
           .item {
             width: 30%;
             height: 60px;
+            box-sizing: content-box;
+            //padding: 0 2px;
             // margin-top: 30px;
             // margin-left: 16px;
             margin-right: 15px;

src/pages/parkingFee/parkingFeeDetail.vue

@@ -72,9 +72,9 @@
         <div class="title_box">
           <span class="title">缴费说明</span>
         </div>
-        <div class="sub_title_box">
-          <span class="title">计费基础规则：</span>
-        </div>
+<!--        <div class="sub_title_box">-->
+<!--          <span class="title">计费基础规则：</span>-->
+<!--        </div>-->
         <div class="info" v-html="setDescription()"></div>
       </div>
 <!--      <div style="height: 50px;"></div>-->
@@ -193,6 +193,8 @@ export default {
   //flex-direction: column;
   background: #F5F7FE;
   padding-bottom: 250px;
+  height: 100vh;
+  overflow-y: scroll;
   //padding-bottom: 20px;
   padding-top: 24px;
 }

src/pages/parkingFee/parkingFeeList.vue

@@ -21,7 +21,7 @@
       >
         <div class="carno-box">
           <div class="carno">{{ item.orderNo  }}</div>
-          <div :class="['status-box', item.paymentStatus !== 'PAID' ? 'other' : '']">
+          <div :class="['status-box', item.paymentStatus !== 'PAID' ? '' : '']">
             <!-- {{ ['支付成功', '支付失败', '已退款'][item.refundStatus] }} -->
             {{ item.refundStatus !== 'NO_REFUND' ? '已退款' : {'PAID': '支付成功', 'FAILED': '支付失败'}[item.paymentStatus || 'FAIED'] }}
           </div>