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

UI: 所有页面底部样式优化

src/api/mockData/checkout.qh10.response.json

@@ -67,6 +67,46 @@
         "superposition": "2",
         "limitCountPerOrder": 2
       },
+      {
+        "code": "gw2goi8lgzx_t",
+        "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",
+        "name": "5元停车券（周末及法定节假日）",
+        "expirationDate": "2023-05-31 23:59:59",
+        "discountFee": 5,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 2
+      },
+      {
+        "code": "g9ar30c6cpe_t",
+        "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",
+        "name": "5元停车券（周末及法定节假日）",
+        "expirationDate": "2023-05-31 23:59:59",
+        "discountFee": 5,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 2
+      },
+      {
+        "code": "gw2goi8lgzx_t",
+        "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",
+        "name": "5元停车券（周末及法定节假日）",
+        "expirationDate": "2023-05-31 23:59:59",
+        "discountFee": 5,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 2
+      },
+      {
+        "code": "g9ar30c6cpe_t",
+        "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",
+        "name": "5元停车券（周末及法定节假日）",
+        "expirationDate": "2023-05-31 23:59:59",
+        "discountFee": 5,
+        "defaultSelected": true,
+        "superposition": "2",
+        "limitCountPerOrder": 2
+      },
       {
         "code": "gw2goi8lgzx_t",
         "couponId": "60b9e286414b41ec9c32596bf6f2d0c5",

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

@@ -3,6 +3,7 @@ const app = {};
 import editwIcon from '../../static/images/edit.png';
 import delwIcon from '../../static/images/delete.png';
 import noDataIcon from '../../static/images/nodataicon.png';
+import noData from '../../static/images/no-invoice.svg';
 import { mapState } from 'vuex';
 import uni from '@/utils/uniHooks';
 import { invoicesDetail, invoicesDeletetitles } from '@/api/parking';
@@ -13,7 +14,7 @@ export default {
       picUrl: this.$picUrl,
       editwIcon: editwIcon,
       delwIcon: delwIcon,
-      noDataIcon: noDataIcon,
+      noDataIcon: noData,
       globalData: app.globalData,
       current: -1,
       ids: '',

src/pages/parkingFee/parkingFeeCoupon.vue

@@ -305,6 +305,7 @@ export default {
   right: 0;
   left: 0;
   z-index: 3;
+  box-shadow: 0 0 2px 0 hsla(0, 6%, 58%, 0.6);
   background-color: #fff;
   .control-box {
     width: 100%;
@@ -315,7 +316,7 @@ export default {
     align-items: center;
     //padding-bottom: constant(safe-area-inset-bottom);
     //padding-bottom: env(safe-area-inset-bottom);
-    padding: 30px 24px 30px 30px;
+    padding: 30px 24px 50px 30px;
     justify-content: space-between;
     .flewx-content {
       font-size: 28px;

src/pages/parkingFee/parkingFeeDetail.vue

@@ -447,6 +447,7 @@ export default {
   bottom: 0;
   right: 0;
   left: 0;
+  box-shadow: 0 0 2px 0 hsla(0, 6%, 58%, 0.6);
   background-color: #fff;
   .control-box {
     width: 100%;
@@ -457,7 +458,7 @@ export default {
     align-items: center;
     //padding-bottom: constant(safe-area-inset-bottom);
     //padding-bottom: env(safe-area-inset-bottom);
-    padding: 30px 24px 30px 30px;
+    padding: 30px 24px 50px 30px;
     justify-content: space-between;
     .flewx-content {
       font-size: 28px;

src/pages/parkingFee/parkingReceipt/parkingApplication.vue

@@ -119,9 +119,8 @@
       </div>
     </div>
     <div class="footer">
-      <k-button v-if="headerInfo.titleName" title="提交" style="margin: 0 auto 30px" disabledColor="#D1D2D9" @click="submit" />
-      <k-button v-else disabled title="请选择发票抬头" style="margin: 0 auto 30px" disabledColor="#D1D2D9" />
-      <div style="height: 30px;"></div>
+      <k-button v-if="headerInfo.titleName" title="提交" style="margin: 0 auto" disabledColor="#D1D2D9" @click="submit" />
+      <k-button v-else disabled title="请选择发票抬头" style="margin: 0 auto" disabledColor="#D1D2D9" />
     </div>
   </div>
 </template>
@@ -429,7 +428,7 @@ export default {
   //padding-bottom: env(safe-area-inset-bottom);
   //padding-bottom: 20px;
   //margin: 30px;
-  padding: 30px 30px 0px 30px;
+  padding: 30px 30px 50px 30px;
   //padding-bottom: constant(safe-area-inset-bottom);
   //padding-bottom: env(safe-area-inset-bottom);
 

src/pages/parkingFee/parkingReceipt/parkingChangeHeader.vue

@@ -115,7 +115,7 @@
       </div>
     </scroll-view>
     <div class="part footer">
-        <k-button title="保存" style="margin: 0 auto 30px" @click="submit" />
+        <k-button title="保存" style="margin: 0 auto" @click="submit" />
     </div>
   </div>
 </template>
@@ -229,15 +229,12 @@ export default {
   position: fixed;
   bottom: 0px;
   background-color: #FAFBFF;
-  padding: 30px;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
-  box-shadow: 0 0 10px 0 hsla(0, 6%, 58%, 0.6);
-  -webkit-box-shadow: 0 0 20px 0 hsla(0, 6%, 58%, 0.6);
-  -moz-box-shadow: 0 0 20px 0 hsla(0, 6%, 58%, 0.6);
-  padding: 30px;
-  padding-bottom: constant(safe-area-inset-bottom);
-  padding-bottom: env(safe-area-inset-bottom);
+  //padding-bottom: constant(safe-area-inset-bottom);
+  //padding-bottom: env(safe-area-inset-bottom);
+  box-shadow: 0 0 2px 0 hsla(0, 6%, 58%, 0.6);
+  padding: 30px 30px 50px 30px ;
+  //padding-bottom: constant(safe-area-inset-bottom);
+  //padding-bottom: env(safe-area-inset-bottom);
   
   .invoive-img {
     text-align: center;

src/pages/parkingFee/parkingReceipt/parkingChooseHeader.vue

@@ -1,6 +1,6 @@
 <template>
-  <div>
-    <div  :class="['scroll-Y', theme]" scroll-y>
+  <div :class="[theme]">
+    <div  :class="['scroll-Y', ]" scroll-y>
       <div>
         <div class="choose-invoice-header" v-if="list.length">
           <van-radio-group class="radios">
@@ -58,7 +58,7 @@
       </div>
     </div>
     <div class="footer">
-      <k-button title="添加抬头" style="margin: 0 auto 30px" disabledColor="#D1D2D9" @click="changeHeader('add')" />
+      <k-button title="添加抬头" style="margin: 0 auto 50px" disabledColor="#D1D2D9" @click="changeHeader('add')" />
     </div>
   </div>
 </template>
@@ -167,14 +167,19 @@ export default {
 
   .noData {
     position: relative;
-    top: 20%;
+    top: 148px;
     // transform: translateY(-50%);
-    color: #cccccc;
     text-align: center;
 
+    font-family: 'PingFang SC';
+    font-style: normal;
+    font-weight: 400;
+    font-size: 32px;
+    color: #919BAA;
+
     .noDataImg {
-      width: 200px;
-      margin-bottom: 20px;
+      width: 454px;
+      margin-bottom: 40px;
     }
   }
 }
@@ -189,9 +194,7 @@ export default {
   background-color: #FAFBFF;
   position: fixed;
   bottom: 0;
-  box-shadow: 0 0 10px 0 hsla(0, 6%, 58%, 0.6);
-  -webkit-box-shadow: 0 0 20px 0 hsla(0, 6%, 58%, 0.6);
-  -moz-box-shadow: 0 0 20px 0 hsla(0, 6%, 58%, 0.6);
+  box-shadow: 0 0 2px 0 hsla(0, 6%, 58%, 0.6);
    //padding-bottom: constant(safe-area-inset-bottom);
    //padding-bottom: env(safe-area-inset-bottom);
   //padding-bottom: 20px;

src/pages/parkingFee/parkingReceipt/parkingReceipt.vue

@@ -579,12 +579,13 @@ export default {
   //height: 150px;
   padding-top: 33px;
   background-color: #fafbff;
+  box-shadow: 0 0 2px 0 hsla(0, 6%, 58%, 0.6);
   position: fixed;
   bottom: 0;
   display: flex;
   align-items: center;
   // justify-content: space-between;
-  padding-bottom: 37px;
+  padding-bottom: 50px;
 
   // .checkAll {
   // 	.checkboxItem {

src/pages/parkingFee/vehicleManagement.vue

@@ -506,15 +506,11 @@ export default {
   right: 0;
   left: 0;
   z-index: 999;
-  padding: 30px 30px 0 30px;
-  box-shadow: 0px 13px 33px 0px rgba(190, 187, 187, 0.2);
+  padding: 30px 30px 50px 30px;
+  box-shadow: 0 0 2px 0 hsla(0, 6%, 58%, 0.6);
 
   .btnpb {
     width: 100%;
-    padding-bottom: 30px;
-    margin-bottom: 30px;
-    padding-bottom: constant(safe-area-inset-bottom);
-    padding-bottom: env(safe-area-inset-bottom);
   }
 
   .add_plate_btn {

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';

vue.config.js

@@ -123,6 +123,7 @@ module.exports = {
       },
       '/msApi': {
         // target: 'https://dev-kip-service-internal.kerryonvip.com/temporary-parking-service', //代理地址，这里设置的地址会代替axios中设置的baseURL
+        // target: 'https://qa-apim.kerryplus.com/c/api/temporary-parking-service', //代理地址，这里设置的地址会代替axios中设置的baseURL
         target: 'http://172.20.51.70:8080', // 代理地址，这里设置的地址会代替axios中设置的baseURL
         changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
         //ws: true, // proxy websockets