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

Lock/release 2.8.0/parking invoice

src/pages/parkingFee/parkingReceipt/parkingApplication.vue

@@ -2,7 +2,7 @@
   <div>
     <div :class="['scroll-Y', theme]">
       <div class="push-box">
-        <div class="choose-invoice-header lines" @click="changeHeader">
+        <div class="choose-invoice-header" @click="changeHeader">
           <div class="invoice-header-info" v-if="headerInfo.titleName">
             <div class="invoice-header-name" :class="headerInfo.invoiceTitleType == 'COMPANY' ? 'header-name' : ''">
               <div>
@@ -76,7 +76,7 @@
               ><span class="purple">{{ invoiceAmount }} 元</span></span
             >
           </div>
-          <div class="part-item top" v-if="type == ''">
+          <div class="part-item top part-item-bg" v-if="type == ''">
             <span class="part-item-key"
               >共<span class="purple">{{ orderQuantity }}笔</span>缴费记录</span
             >
@@ -87,20 +87,32 @@
           </div>
         </div>
         <div class="tab-header">接收方式</div>
-        <div class="part">
+        <div class="part" style="padding-top: 10px;">
           <div class="part-item lines">
             <span class="part-item-key" style="min-width: 120px; white-space: nowrap">电子邮箱</span>
             <div class="part-item-value">
               <input class="van-field__control" style="white-space: nowrap" type="text" @blur="mailboxChange" placeholder="请输入电子邮箱" v-model="condition.email" />
             </div>
           </div>
-          <div class="part-item default-email" @click="changeDefaultEMail">
-            <van-checkbox v-model="condition.emailAsDefault" @change="emailAsDefaultChange" icon-size="30PX"><span class="text">保存电子邮箱为默认邮箱</span></van-checkbox>
+          <div class="part-item default-email part-item-bg" @click="changeDefaultEMail">
+            <van-checkbox checked-color="var(--k-color-primary-01)" v-model="condition.emailAsDefault" @change="emailAsDefaultChange" icon-size="30PX"><span class="text">保存电子邮箱为默认邮箱</span></van-checkbox>
           </div>
         </div>
-        <div class="tab-header">备注</div>
+        <div class="tab-header2">备注</div>
         <div class="textarea-remark">
-          <textarea rows="3" placeholder-style="color:#999999" placeholder="选填" @blur="storeRemarkChange" v-model="condition.remark"></textarea>
+          <textarea
+            rows="3"
+            placeholder-style="color:#999999;
+              font-style: normal;
+              font-weight: 400;
+              font-size: 30px;
+              height:275px;
+              background:#fff;"
+              
+            placeholder="如果您对本次发票申请有其他需求，可在此输入详细信息。"
+            @blur="storeRemarkChange"
+            v-model="condition.remark"
+          ></textarea>
         </div>
         <!-- 占位 -->
         <div style="height: 75px; background-color: transparent; color: transparent; position: relative">占位</div>
@@ -115,7 +127,7 @@
 
 <script>
 import parkingApplicationJs from '../mixins/parkingReceipt/parkingApplication';
-import baseMixins from '../mixins/base'
+import baseMixins from '../mixins/base';
 export default {
   mixins: [baseMixins, parkingApplicationJs],
 };
@@ -147,10 +159,10 @@ export default {
     align-items: center;
     justify-content: space-between;
     // padding: 20px 30px;
-    padding: 32px;
+    padding: 32px 0;
     font-size: 28px;
     background: #fafbff;
-    border: 1px solid #d8dae0;
+    // border: 1px solid #d8dae0;
     margin-bottom: 24px;
     border-radius: 4px;
 
@@ -162,12 +174,13 @@ export default {
         display: flex;
         justify-content: space-between;
         align-items: center;
+        padding: 0 30px;
         padding-bottom: 32px;
-        border-bottom: 1px solid #d8dae0;
+        border-bottom: 1px dashed #d8dae0;
 
         .isDefault {
           color: #8cc63f;
-          border: 1px solid #8cc63f;
+          border: 1px dashed #8cc63f;
           margin-left: 30px;
           border-radius: 20px;
           display: inline-block;
@@ -178,6 +191,7 @@ export default {
       .duty-paragraph {
         color: #999;
         margin-top: 32px;
+        padding: 0 30px;
       }
     }
   }
@@ -186,7 +200,12 @@ export default {
     color: #808080;
     padding: 10px 20px 20px;
   }
-
+  .tab-header2 {
+    background: #fff;
+    color: #808080;
+    padding: 20px 20px 20px;
+    border-bottom: 1px dashed #e1e2e8;
+  }
   .part {
     // background-color: #ffffff;
 
@@ -194,24 +213,25 @@ export default {
     // padding-left: 30px;
     margin-bottom: 20px;
     border-radius: 4px;
-    padding: 30px;
-    border: 1px solid #d8dae0;
-
+    padding: 30px 0;
+    // border: 1px solid #d8dae0;
+    .part-item-bg {
+      background: #cedce8;
+    }
     .part-item {
       font-size: 28px;
       display: flex;
       justify-content: space-between;
       align-items: center;
+      padding: 10px 30px;
       padding-bottom: 20px;
-
       .part-item-key {
         color: #333333;
         min-width: 146px;
       }
 
       .part-item-value {
-        flex: 1;
-        color: #999;
+        color: #666;
         text-align: right;
         display: flex;
         align-items: center;
@@ -255,7 +275,7 @@ export default {
       font-family: PingFangSC-Regular, PingFang SC;
       font-weight: 400;
       color: #999999;
-      padding-bottom: 0;
+      padding-bottom: 10px;
       .text {
         font-size: 28px;
         font-weight: 400;
@@ -273,12 +293,13 @@ export default {
   }
 
   .top {
-    padding-top: 20px;
-    padding-bottom: 0 !important;
+    margin-top: 20px;
+    // padding-bottom: 0 !important;
+    padding: 10px 30px !important;
   }
 
   .middle {
-    // padding: 20px 0;
+    padding-top: 10px;
 
     > .part-item {
       // background-color: #ffffff;
@@ -286,7 +307,7 @@ export default {
     }
 
     .purple {
-      color: #064c8a;
+      color: var(--k-color-primary-01);
     }
   }
 
@@ -299,14 +320,14 @@ export default {
     margin-bottom: 20px;
 
     > textarea {
-      background-color: #fafbff;
+      background-color: #fff;
       width: 100%;
       padding: 32px;
       // padding: 10px 20px;
       border-radius: 4px;
       box-sizing: border-box;
-
-      border-color: #d8dae0;
+      height: 275px;
+      border: none;
     }
   }
 
@@ -315,7 +336,7 @@ export default {
   }
 
   .lines {
-    border-bottom: 1px solid #d8dae0;
+    border-bottom: 1px dashed #e1e2e8;
   }
 
   .toBottom {
@@ -410,7 +431,7 @@ export default {
   .push-again-btn {
     color: #ffffff;
     // background-image: linear-gradient(to right, #7d4ea1, #40397c);
-    background-color: #064c8a;
+    background-color: var(--k-color-primary-01);
     border-radius: 50px;
     text-align: center;
     //padding: 20px 0;

src/pages/parkingFee/parkingReceipt/parkingChangeHeader.vue

@@ -3,7 +3,7 @@
     <scroll-view  :class="['scroll-Y']" scroll-y>
       <div class="part top">
         <div class="invoice-header">
-          <div class="part-item header-type lines">
+          <div class="part-item header-type">
             <span class="part-item-key">抬头类型</span>
             <van-radio-group
               v-model="condition.invoiceTitleType"
@@ -14,14 +14,14 @@
               <van-radio
                 v-for="item in items"
                 :key="item.name + item.value"
-                checked-color="#064C8A"
+                checked-color="var(--k-color-primary-01)"
                 :name="item.value"
               >
                 {{ item.name }}
               </van-radio>
             </van-radio-group>
           </div>
-          <div class="part-item lines">
+          <div class="part-item">
             <span class="part-item-key">抬头名称</span>
             <div class="part-item-value">
               <!-- <input
@@ -37,15 +37,16 @@
               />
             </div>
           </div>
-          <div class="part-item lines" v-if="isCompany">
-            <span class="part-item-key">公司税号</span>
-            <div class="part-item-value">
+          <div class="part-item" >
+            <span class="part-item-key" v-if="isCompany">公司税号</span>
+            <div class="part-item-value" v-if="isCompany">
               <!-- <input
               type="text"
               placeholder="请输入公司税号"
               v-model="condition.corporationTax"
             /> -->
               <van-field
+                v-if="isCompany"
                 v-model="condition.taxNo"
                 right-icon="arrow"
                 input-align="right"
@@ -53,11 +54,13 @@
               />
             </div>
           </div>
-          <div class="part-item lines">
+          <div class="part-item">
             <span class="part-item-key">设为默认</span>
             <div class="part-item-value">
               <van-switch
-                active-color="#064C8A"
+                active-color="var(--k-color-primary-01)"
+                inactive-color="#ccc"
+                size="34px"
                 v-model="condition.defaultOrNot"
                 @change="switch1Change"
               />
@@ -67,45 +70,41 @@
         <div class="invoice-more" v-if="isCompany">
           <div class="tab-title">更多信息(以下为选填内容)</div>
           <div class="company-box">
-            <div class="part-item lines">
+            <div class="part-item">
               <span class="part-item-key">公司地址</span>
               <div class="part-item-value">
                 <van-field
                   v-model="condition.companyAddress"
-                  right-icon="arrow"
                   input-align="right"
                   placeholder="请输入公司地址"
                 />
               </div>
             </div>
-            <div class="part-item lines">
+            <div class="part-item">
               <span class="part-item-key">公司电话</span>
               <div class="part-item-value">
                 <van-field
                   v-model="condition.companyTel"
-                  right-icon="arrow"
                   input-align="right"
                   placeholder="请输入公司电话"
                 />
               </div>
             </div>
-            <div class="part-item lines">
+            <div class="part-item">
               <span class="part-item-key">开户银行</span>
               <div class="part-item-value">
                 <van-field
                   v-model="condition.depositBank"
-                  right-icon="arrow"
                   input-align="right"
                   placeholder="请输入开户银行"
                 />
               </div>
             </div>
-            <div class="part-item lines" style="border: none">
+            <div class="part-item" style="border: none">
               <span class="part-item-key">开户账户</span>
               <div class="part-item-value">
                 <van-field
                   v-model="condition.depositAccount"
-                  right-icon="arrow"
                   input-align="right"
                   placeholder="请输入开户账户"
                 />
@@ -165,7 +164,6 @@ export default {
         > label {
           margin-left: 20px;
         }
-
         .van-cell {
           background-color: transparent;
           font-size: 30px;
@@ -176,20 +174,23 @@ export default {
 
     .tab-title {
       color: #676767;
-      padding-top: 36px;
-      padding-bottom: 20px;
+      padding-top: 28px;
+      padding-left:30px;
+      padding-bottom: 26px;
       // padding: 30px 35px;
-      // background-color: #f1f1f1;
-      font-size: 30px;
-      font-weight: 400;
+      background-color: #fff;
+      font-family: 'PingFang SC';
+      font-style: normal;
+      font-weight: 500;
+      font-size: 32px;
       color: #333333;
       line-height: 42px;
+      margin-top: 24px;
     }
 
     .company-box {
       background: #fafbff;
       border-radius: 4px;
-      border: 1px solid #d8dae0;
     }
 
     .lines {
@@ -203,7 +204,6 @@ export default {
     .invoice-header {
       background: #fafbff;
       border-radius: 4px;
-      border: 1px solid #d8dae0;
     }
   }
 
@@ -222,6 +222,7 @@ export default {
 
 
 }
+
 .footer {
   width: 100%;
   //height: 150px;

src/pages/parkingFee/parkingReceipt/parkingChooseHeader.vue

@@ -40,8 +40,11 @@
                       </div>
                     </div>
                   </div>
-                  <div class="duty-paragraph" v-if="item.invoiceTitleType === 'COMPANY'">
-                    税号 {{ item.taxNo }}
+                  <div class="duty-paragraph" >
+                    <span v-if="item.invoiceTitleType === 'COMPANY'">
+                      公司税号 {{ item.taxNo }}
+                    </span>
+                    
                   </div>
                 </div>
               </div>
@@ -105,17 +108,22 @@ export default {
             .invoice-header-name {
               color: #333333;
               padding: 20px 0;
-              border-bottom: 2px solid #f8f8f8;
+              border-bottom: 2px dashed #E1E2E8;
               display: flex;
               justify-content: space-between;
               align-items: center;
 
               .isDefault {
-                color: #8cc63f;
-                border: 2px solid #8cc63f;
+                color: #fff;
                 margin-left: 16px;
-                border-radius: 20px;
-                padding: 0 10px;
+                background: var(--k-color-primary-01);;
+                border-radius: 4px;
+                padding: 4px 8px;
+                font-family: 'PingFang SC';
+                font-style: normal;
+                font-weight: 400;
+                font-size: 22px;
+
               }
 
               .invoice-header-name-icon {
@@ -132,6 +140,7 @@ export default {
           }
 
           .duty-paragraph {
+            height:40px;
             color: #6f6f70;
             padding: 20px 0;
           }