Merge branch 'release-2.13.0' into John/release-2.13.0/SCRM-4258

src/pages/parkingFee/mixins/parkingReceipt/parkingReceipt.js

@@ -224,7 +224,7 @@ export default {
     },
     choice_card_scroll(e) {
       const scrollable = e.srcElement.scrollingElement;
-      const isAtBottom = scrollable.scrollHeight - scrollable.scrollTop <= scrollable.clientHeight;
+      const isAtBottom = scrollable.scrollHeight - scrollable.scrollTop <= scrollable.clientHeight + 200;
       if (isAtBottom) {
         // 已经滑动到底部
         // console.log('滑动到底部');

src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -133,7 +133,6 @@
         </van-checkbox-group>
         
       </div>
-      <div style="height:100px;background-color: #F4F7FF;width: 100%;"></div>
     </div>
     <div v-show="isLoadMore" :class="{ noData: !list.length }">
       <img :src="noData" v-if="!list.length" alt=""/>
@@ -142,6 +141,7 @@
         没有更多啦
         </div>
     </div>
+    <div style="height:14vh;background-color: #F4F7FF;width: 100%;"></div>
     <div class="flewx" v-if="tabIndex == 1">
       <div class="priceBtn">
         <div>
@@ -576,7 +576,7 @@ export default {
   background: #F4F7FF;
   border-radius: 15px;
   .van-checkbox-group{
-    padding-bottom:104px;
+    // padding-bottom:104px;
   }
 }