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

Lock/release 2.8.0/parking invoice

src/pages/parkingFee/parkingFeeList.vue

@@ -32,7 +32,7 @@
           <div class="orderno">{{ item.vehicleNo }}</div>
           <!-- <van-icon name="arrow" /> -->
         </div>
-        <div class="choice_card_index">
+        <div class="choice_card_index"  style="margin-bottom:0;">
           <div class="choice_card_index_icon">
             <img
                 class="car-icon"
@@ -49,7 +49,7 @@
           </div> 
           <!-- {{ item.enterTime }} -->
         </div>
-        <div class="choice_card_index">
+        <div class="choice_card_index" >
           <div class="choice_card_index_icon">
             {{ item.enterTime }}
           </div>
@@ -267,6 +267,7 @@ export default {
     display: flex;
     justify-content: space-between;
     font-weight: 600;
+    font-size: 36px;
     color: #333;
     padding-top: 31px;
     line-height:28px;
@@ -317,7 +318,7 @@ export default {
   position: relative;
   text-align: center;
   box-sizing: border-box;
-  margin-top: 70px;
+  margin-top: 60px;
   font-size: 22px;
   font-weight: 400;
   color: #999999;

src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -88,7 +88,7 @@
                 <div class="left">
                   
                   <div class="invoiceHeader">{{ item.invoiceHeader }}</div>
-                  <div class="choice_card_index">
+                  <div class="choice_card_index" style="margin-bottom: 10px;">
                     <div class="choice_card_index_icon">
                       <img class="car-icon" :src="require(`../static/images/vector.svg`)" />
                       <div class="choice_card_index_text">开票时间</div>
@@ -134,7 +134,7 @@
     </div>
     <div v-show="isLoadMore" :class="{ noData: !list.length }">
       <img :src="noData" v-if="!list.length" alt=""/>
-      <span v-if="!list.length">暂无数据</span>
+      <span v-if="!list.length">当前暂无开票数据</span>
       <div v-else class="no-more-data">
         没有更多啦
         </div>
@@ -190,7 +190,7 @@ export default {
     left: 0;
 
     div {
-      width: 30%;
+      width: 45%;
       text-align: center;
       height: 78px;
       line-height: 78px;
@@ -217,12 +217,12 @@ export default {
     }
 
     .choice_select_ews {
-      transform: translateX(230px);
+      transform: translateX(175px);
       transition-duration: 0.1s;
     }
 
     .choice_select_ew {
-      transform: translateX(455px);
+      transform: translateX(510px);
       transition-duration: 0.1s;
     }
   }
@@ -333,7 +333,7 @@ export default {
           font-style: normal;
           font-weight: 600;
           font-size: 32px;
-          padding: 31px 35px 11px;
+          padding: 31px 35px 20px;
           
         }
         .right {

src/pages/parkingFee/vehicleManagement.vue

@@ -14,15 +14,8 @@
           :key="item.id"
         >
           <div class="plate_border">
-            <div
-              class="plate_tag"
-              :class="'bgc-' + item.licensePlateType"
-            ></div>
             <div
               class="plate_plate_index plate_plate_index1"
-              :style="{
-                padding: '0 0 0 14px',
-              }"
             >
               我的车牌
             </div>
@@ -48,15 +41,15 @@
           " v-if="custTypeId > 0"></div> -->
             <div class="plate_plate_index plate_plate_index4">
               <div class="item" @click.stop="toPay(item.vehicleNo)">
-                <img :src="require(`./static/images/icon-edit.png`)" alt=""/><span>查询</span>
+                <img :src="require(`./static/images/white_detail.png`)" alt=""/><span>查询</span>
               </div>
               <div class="item" @click="toEdit(item)">
-                <img :src="require(`./static/images/icon-find.png`)" alt=""/><span
+                <img :src="require(`./static/images/white_edit.png`)" alt=""/><span
               >编辑</span
               >
               </div>
               <div class="item" @click="toDelete(item)">
-                <img :src="require(`./static/images/icon-del-white.png`)" alt=""/><span
+                <img :src="require(`./static/images/white_delete.png`)" alt=""/><span
               >删除</span
               >
               </div>
@@ -252,7 +245,7 @@ export default {
     }
 
     .plate_plate_index {
-      padding-left: 37px;
+      // padding-left: 37px;
       padding-top: 10px;
       font-size: 26px;
     }
@@ -260,7 +253,7 @@ export default {
     .plate_plate_index1,
     .plate_plate_index3 {
       font-size: 28px;
-      font-weight: 400;
+      // font-weight: 400;
       color: #ffffff;
       line-height: 40px;
       display: flex;
@@ -275,7 +268,6 @@ export default {
       .licensePlateTypeDesc {
         margin-left: 5px;
         font-size: 28px;
-        font-weight: 500;
         color: #ffffff;
         line-height: 40px;
         margin-left: 20px;
@@ -284,13 +276,13 @@ export default {
       &.bb {
         padding-bottom: 23px;
         margin-bottom: 23px;
-        border-bottom: 1px solid #ffffff;
+        border-bottom: 0.5px solid #ffffff;
       }
     }
 
     .plate_plate_index1 {
       display: inline-block;
-      padding-left: 14px;
+      // padding-left: 14px;
     }
 
     .plate_plate_index2 {
@@ -335,9 +327,9 @@ export default {
         }
 
         img {
-          width: 45px;
-          height: 45px;
-          // margin-right: 10px;
+          width: 27px;
+          height: 27px;
+          margin-right: 15px;
         }
 
         span {
@@ -471,7 +463,7 @@ export default {
     justify-content: center;
     align-items: center;
     margin-bottom: 11px;
-    padding-top: 57px;
+    padding-top: 60px;
     //vertical-align: middle;
   }
   .add_plate_no_data_info{

src/utils/index.js

@@ -173,12 +173,12 @@ export function initEnv() {
   const href = window.location.href;
   console.log('当前页面的url地址  ',href);
   if ( /dev-|8080/.test(href) ) {
-    // window.env = 'qa';
-    // window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
-    // window.api = 'qaApi';
-    window.env = 'dev';
-    window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
-    window.api = 'devApi';
+    window.env = 'qa';
+    window.profileApi = 'https://qa-apim.kerryplus.com/c/api';
+    window.api = 'qaApi';
+    // window.env = 'dev';
+    // window.profileApi = 'https://dev-gateway-kip.kerryonvip.com/api';
+    // window.api = 'devApi';
     // window.env = 'prod';
     // window.profileApi = 'https://sl-apim.kerryplus.com/c/api';
     // window.api = 'api';
@@ -204,7 +204,7 @@ export function initEnv() {
 export function requestInit() {
   let baseURL = window.profileApi + '/temporary-parking/v1';
   if (window.location.href.indexOf('parking.') < 0) {
-    baseURL = '/msApi';
+    // baseURL = '/msApi';
   }
   window.requestms = createAxiosByinterceptors({
     // baseURL: `https://dev-kip-service-internal.kerryonvip.com/`,