Merge pull request #93 from tron/lock/release-2.8.0/parkingInvoice

Lock/release 2.8.0/parking invoice

public/index.html

@@ -33,21 +33,21 @@
   <script>
     // const debug = window.localStorage.getItem('H5_DEBUG');
     // 开发环境和qa环境 打开debug
-    // const debug = /dev-|qa-/.test(window?.injectConfig?.api) || window.location.href.indexOf(8080) > -1;
-    // if (debug) {
-    //   const script = document.createElement('script');
-    //   script.src = 'https://unpkg.com/vconsole@latest/dist/vconsole.min.js';
-    //   document.head.appendChild(script);
-    //   script.addEventListener('load', () => {
-    //     setTimeout(() => {
-    //       window.vConsole = new window.VConsole();
-    //     }, 200);
-    //   });
-    // }
-    // if ( /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent) ) {
-    //   // https://developers.weixin.qq.com/community/develop/doc/000ae2cb950808f90d8bc415551800
-    //   window.H5_LAUNCH_URL = location.href;
-    // }
+    const debug = /dev-|qa-/.test(window?.injectConfig?.api) || window.location.href.indexOf(8080) > -1;
+    if (debug) {
+      const script = document.createElement('script');
+      script.src = 'https://unpkg.com/vconsole@latest/dist/vconsole.min.js';
+      document.head.appendChild(script);
+      script.addEventListener('load', () => {
+        setTimeout(() => {
+          window.vConsole = new window.VConsole();
+        }, 200);
+      });
+    }
+    if ( /(iPhone|iPad|iPod|iOS)/i.test(navigator.userAgent) ) {
+      // https://developers.weixin.qq.com/community/develop/doc/000ae2cb950808f90d8bc415551800
+      window.H5_LAUNCH_URL = location.href;
+    }
   </script>
   <script>
       // var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))

src/pages/parkingFee/parkingFeeList.vue

@@ -77,10 +77,10 @@
           <!-- <van-icon name="arrow" /> -->
         </div>
       </div>
-      <div class="notice-info">
+      <div class="no-more-data">
         <!-- 为确保用户可以执行下滑动作，设置单次响应的数据量为4 -->
         <div
-        >{{ numberOfElements? '查看更多' : '没有更多数据了' }}
+        >{{ numberOfElements ? '查看更多' : '没有更多啦' }}
         </div>
       </div>
       <div style="height: 10vh;"></div>
@@ -312,4 +312,35 @@ export default {
     margin-bottom: -7px;
   }
 }
+.no-more-data {
+  width: 100%;
+  position: relative;
+  text-align: center;
+  box-sizing: border-box;
+  margin-top: 70px;
+  font-size: 22px;
+  font-weight: 400;
+  color: #999999;
+  line-height: 41px;
+  background:rgba(255,255,255,0);
+  padding:0 24px;
+  &::before {
+    content: '';
+    display: block;
+    width: calc(40% - 49px);
+    position: absolute;
+    left: 49px;
+    top: 16px;
+    border-top: 1px dashed #cfcfcf;
+  }
+  &::after {
+    content: '';
+    display: block;
+    width: calc(40% - 49px);
+    position: absolute;
+    right: 49px;
+    top: 16px;
+    border-top: 1px dashed #cfcfcf;
+  }
+}
 </style>

src/pages/parkingFee/parkingReceipt/parkingChooseHeader.vue

@@ -103,7 +103,7 @@ export default {
 
           .invoice-header-text {
             width: 100%;
-            padding: 0 20px;
+            padding: 0 36px;
 
             .invoice-header-name {
               color: #333333;

src/pages/parkingFee/parkingReceipt/parkingInvoice.vue

@@ -42,7 +42,7 @@
           ><span class="purple">¥{{ order.invoiceTotalAmount }}</span></span
         >
       </div>
-      <div class="part-item" style="background: #cedce8; margin-bottom: 0">
+      <div class="part-item" style="background: #cedce8; margin-bottom: 0; padding: 16px 30px; ">
         <span class="part-item-key"
           >共<span class="purple-order">{{ order.totalOrderCount }}笔</span>缴费记录</span
         >

src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -66,7 +66,7 @@
                     <!-- {{ item.enterTime }} -->
                   </div>
                   <div class="choice_card_index">
-                    <div class="choice_card_index_icon bg_parkingRoom">
+                    <div class="choice_card_index_icon bg_parkingRoom2">
                       <img class="car-icon" :src="require(`../static/images/parking_room.svg`)" />
                       <div class="choice_card_index_text2">{{ item.parkName }}</div>
                     </div>
@@ -102,7 +102,7 @@
                     <!-- {{ item.enterTime }} -->
                   </div>
                   <div class="choice_card_index">
-                    <div class="choice_card_index_icon bg_parkingRoom">
+                    <div class="choice_card_index_icon bg_parkingRoom2 ">
                       <img class="car-icon" :src="require(`../static/images/parking_room.svg`)" />
                       <div class="choice_card_index_text2">{{ item.parkName }}</div>
                     </div>
@@ -330,7 +330,7 @@ export default {
           font-style: normal;
           font-weight: 600;
           font-size: 32px;
-          padding: 11px 35px;
+          padding: 31px 35px 11px;
           
         }
         .right {
@@ -446,12 +446,17 @@ export default {
         }
         .bg_parkingRoom {
           background-color: #f4f7ff;
-          width: 100%;
+          width:calc(100% - 40px);
+          padding: 11px 0px 15px 8px ;
+        }
+        .bg_parkingRoom2 {
+          background-color: #f4f7ff;
+          width:calc(100% - 42px);
           padding: 11px 0px 15px 8px ;
         }
         .choice_card_index_text {
           display: inline-block;
-          line-height: 40px;
+          line-height: 42px;
           font-family: 'PingFang SC';
           font-style: normal;
           font-weight: 400;