Przeglądaj źródła

近三个月补缴-订单详情

dujingxian 4 lat temu
rodzic
commit
d4a3286ce2

+ 1 - 1
src/extend/HttpRequest.ts

@@ -97,7 +97,7 @@ export default class HttpRequest {
 
     private getToken(name: string) {
         let token = localStorage.getItem(name);
-        console.log(token);
+        // console.log(token);
         if (token) {
             return token;
         } else {

+ 1 - 1
src/static/common.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.4.1"
+  "version": "1.4.3"
 }

+ 28 - 7
src/views/order/bujiaodetail.vue

@@ -27,12 +27,13 @@
                 社保户别:
                 <label class="small" style=" font-size: 1.3rem;">{{data.social_type}}</label>
             </h6>
-            <h6 class="d-flex justify-content-between align-items-center  two-h6" style=" margin-bottom: 1rem;font-size: 1.5rem;padding-bottom:1.5rem">
+            <h6 class="d-flex justify-content-between align-items-center  two-h6" style=" margin-bottom: 0;font-size: 1.5rem;padding-bottom:1.5rem">
                 身份证号:
                 <label class="small" style=" font-size: 1.3rem;">{{data.id_card}}</label>
             </h6>
         </div>
-        <div class="detail social-detail white-box" v-for="item in data.detaillist">
+        <div class="backgroundColor" v-if="data.detaillist.length"></div>
+        <div class="detail social-detail white-box social-month" v-for="(item, idx) in data.detaillist" :key="idx">
             <h6 class="d-flex justify-content-between align-items-center two-h6" style=" font-size: 1.5rem;">
                 社保({{item.month}}月份)
                 <label class="p-0 m-0 ">缴费基数:&yen;<span class="badges">{{item.social_basic}}</span></label>
@@ -60,7 +61,7 @@
                     <span class="badges"  style=" font-size: 1.3rem;">&yen;{{item.birth}}</span>
                 </li>
             </ul>
-            <p class="subtotal d-flex justify-content-between align-items-center two-h6" style="margin-bottom: 1rem;padding-bottom:1.5rem">
+            <p class="subtotal d-flex justify-content-between align-items-center two-h6" style="margin-bottom: 0rem;padding-bottom:1.5rem">
                 社保小计
                 <span class="badges"  style=" font-size: 1.3rem;">&yen;{{item.subtotal}}</span>
             </p>
@@ -70,12 +71,13 @@
                     <label class="p-0 m-0 ">缴费基数:&yen;<span class="badges" style=" font-size: 1.3rem;">{{item.fund_basic}}</span></label>
                 </h6>
 
-                <p class="d-flex justify-content-between align-items-center" style="margin-bottom: 1rem;padding-bottom:1.5rem">
+                <p class="d-flex justify-content-between align-items-center" style="margin-bottom: 0rem;padding-bottom:1.5rem">
                     公积金
                     <span class="badges" style=" font-size: 1.3rem;">&yen;{{item.fund}}</span>
                 </p>
             </div>
         </div>
+        <div class="backgroundColor"></div>
         <div class="detail social-detail white-box">
             <h6 class="d-flex justify-content-between align-items-center price-text"  style=" font-size: 1.3rem; padding:0.5rem 0;">
                 滞纳金
@@ -101,7 +103,7 @@
             <h6 class="d-block badges pb-3 text-right"  style=" font-size: 1.3rem;color: #333;">
                 应付总计:&yen;{{data.payment}}
             </h6>
-            <h6 class="d-block badges pb-3 text-right"  style=" font-size: 1.3rem;color: #333;">
+            <h6 class="d-block badges pb-3 text-right"  style=" font-size: 1.3rem;color: #333; margin-bottom: 0">
                 实付款:<span style="color: #EC2C2C">&yen;{{data.payment}}</span>
             </h6>
         </div>
@@ -109,6 +111,7 @@
             <button class="btn-one" @click="gopay" v-if="!data.isShow">去缴费</button>
             <button class="btn-two" style="" @click="cancel" v-if="!data.isShow">取消订单</button>
         </div> -->
+        <div class="backgroundColorFooter" v-if="data.detaillist.length"></div>
         <div class="bottom-twobtn">
             <button type="button" class="button-1" @click="gopay" v-if="!data.isShow">
                 <img class="button-2-img" src="../../assets/image/payFoot@2x.png" alt="">
@@ -141,6 +144,7 @@
             let res = await Http.getInstance().repairDetail({
                 id: this.$route.params["id"],
             });
+            // console.log('补缴', res);
             this.data = res.data;
             this.data.order_sn =  res.data.order_sn;
             this.data.charge_details.fund = this.data.charge_details.fund == 0 ? false : this.data.charge_details.fund;
@@ -167,7 +171,7 @@
                  router.replace({
                      name: 'opayment',
                      params: {
-                         order_sn: res.data.order_sn
+                        order_sn: res.data.order_sn
                      }
                  });
 
@@ -245,11 +249,15 @@
 
     }
     .detail {
-        padding: 1.2rem;
+        padding: 1.3rem 1.2rem 1.2rem 1.2rem;
         padding-bottom: 0;
         font-size: 1.4rem;
     }
 
+    .social-month:nth-child(n+2) {
+        padding-top: 1.5rem;
+    }
+
     .list-group-flush {
         border-bottom: 1px solid rgba(0, 0, 0, .125);
         font-size: 1.4rem;
@@ -296,6 +304,8 @@
     }
     // 底部按钮
     .bottom-twobtn{
+        position: fixed;
+        bottom: 0;
         width: 100%;
         padding-left: 0 !important;
         // height: 4rem;
@@ -321,5 +331,16 @@
             font-size: 1.5rem;
         }
     }
+    .backgroundColor {
+        background-color: #EDF0F5;
+        width: 100%;
+        height: 1.25rem;
+    }
+    .backgroundColorFooter {
+        background-color: #EDF0F5;
+        width: 100%;
+        // height: 5rem;
+        height: 6rem;
+    }
 </style>