样式修改

src/static/common.json

@@ -1,3 +1,3 @@
 {
-  "version": "1.3.5"
+  "version": "1.3.6"
 }

src/views/index/calc.vue

@@ -32,8 +32,14 @@
                             :max="data.social_basic.pension[1]" required>
                     </div>
                 </div>
-                <el-switch v-model="data.is_fund" inactive-text="公积金缴纳" active-color="#4FDCA2">
-                </el-switch>
+                <!-- <el-switch v-model="data.is_fund" inactive-text="公积金缴纳" active-color="#4FDCA2">
+                </el-switch> -->
+                <div class="form-group row">
+                    <label class="col-3 col-form-label bigname">公积金缴纳</label>
+                    <div class="col-9">
+                        <el-switch v-model="data.is_fund" active-color="#4FDCA2" />
+                    </div>
+                </div>
                 <div id="fund" class="form-group row">
                     <label class="col-3 col-form-label bigname">公积金缴纳</label>
                     <div class="col-9" v-if="data.is_fund">
@@ -300,6 +306,9 @@
         padding-top: 0;
         position: relative;
     }
+    .el-radio {
+        line-height: 2;
+    }
     .el-radio__input.is-checked .el-radio__inner{
         // border-color: #28a745;
         // background: #28a745;
@@ -333,6 +342,9 @@
     .form-group{
         margin-top: 1rem;
     }
+    .form-group:last-child {
+        margin-top: 1.3rem;
+    }
     .col-3{
         padding-right: 0;
     }

src/views/index/index.vue

@@ -19,7 +19,7 @@
             </el-carousel>
         </div>
         <section class="index-main">
-            <el-row>
+            <el-row class="classification">
                 <el-col :span="24" @click.native="$router.push('/calc')">
                     <img src="../../assets/image/ico_04@2x.png" style="width: 100%" alt="">
                 </el-col>
@@ -37,7 +37,7 @@
                     <img src="../../assets/image/ico_06@2x.png" style="width: 100%" alt="">
                 </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="20" class="classification">
                 <el-col :span="12" @click.native="$router.push('/bujiao')">
                     <img src="../../assets/image/homeico_10@2x.png" style="width: 100%" alt="">
                 </el-col>
@@ -59,7 +59,7 @@
                     <img src="../../assets/image/car_policy@2x.png" style="width: 100%" alt="">
                 </el-col>
             </el-row>
-            <el-row :gutter="20">
+            <el-row :gutter="20" class="classification">
                 <el-col :span="12" @click.native="$router.push('/policy?school_policy')">
                     <img src="../../assets/image/school_policy@2x.png" style="width: 100%" alt="">
                 </el-col>
@@ -115,13 +115,17 @@
         /*background: #ffffc4;*/
     }
     section.index-main{
-        margin-top: 1rem;
+        // margin-top: 1rem;
+        margin-top: 1.3rem;
         // margin-bottom: 8rem;
         // margin-bottom: 10rem;
         padding: 0 1.292rem;
         .el-row {
             margin-bottom: 0.833rem;
         }
+        .classification {
+            margin-bottom: 1.3rem;
+        }
         .el-row:last-child {
             // margin-bottom: 5rem;
         }

src/views/index/payroll.vue

@@ -65,7 +65,7 @@ import login from "@/store/module/login";
 
         get cMarginTop() {
             if (this.data.clientHeight / this.data.clientWidth > 1.78) {
-                console.log('距离', this.data.clientHeight / this.data.clientWidth > 1.7);
+                // console.log('距离', this.data.clientHeight / this.data.clientWidth > 1.7);
                 
                 return this.data.clientHeight / this.data.clientWidth * 30 + 'px'
             } else {

src/views/index/policy.vue

@@ -1,10 +1,11 @@
 <template>
   <div class="content">
-    <van-nav-bar
-      :title="title"
-      left-arrow
-      @click-left="$router.replace('/index')"
-    />
+    <div class="p_head">
+      <img src="../../assets/image/payrollback_left@2x.png" class="leftIcon" alt="" @click="$router.replace('/index')">
+      <span>
+          {{title}}
+      </span>
+    </div>
     <div class="policy" style="background-color: #fff">
       <img :src="img" alt="" />
       <!-- <div v-html="text"></div> -->
@@ -65,8 +66,25 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.van-nav-bar .van-icon {
-  color: #000;
+// 顶部导航
+.p_head{
+    text-align: center;
+    position: relative;
+    top: 1.5rem;
+    font-size: 2rem;
+    // font-family: 'PingFang SC';
+    margin-bottom: 3.667rem;
+    // font-weight: bold;
+    line-height: 1.5rem;
+    .leftIcon{
+      position: absolute;
+      left: 1.667rem;
+      top: 0.5rem;
+      width: 0.667rem;
+    }
+    span {
+      vertical-align: middle;
+    }
 }
 .content {
   position: absolute;

src/views/order/detail.vue

@@ -63,7 +63,7 @@
             </p>
         </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;color: #666666; padding:0.5rem 0;">
+            <h6 class="d-flex justify-content-between align-items-center price-text"  style=" font-size: 1.3rem; padding:0.5rem 0;">
                 本次服务费
                 <span class="badges"  style=" font-size: 1.3rem;">&yen;{{data.service_charge}}</span>
             </h6>
@@ -231,19 +231,19 @@
         font-size: 1.5rem;
     }
 
-    .list-group-flush {
-        // border-bottom: 1px solid rgba(0, 0, 0, .125);
-        font-size: 1.4rem;
-    }
+    // .list-group-flush {
+    //     // border-bottom: 1px solid rgba(0, 0, 0, .125);
+    //     font-size: 1.4rem;
+    // }
 
-    .list-group-flush .list-group-item {
-        border-top: 0;
-        background: transparent;
-    }
+    // .list-group-flush .list-group-item {
+    //     border-top: 0;
+    //     background: transparent;
+    // }
 
-    .list-group-flush .list-group-item:last-child {
-        border-bottom: 0;
-    }
+    // .list-group-flush .list-group-item:last-child {
+    //     border-bottom: 0;
+    // }
     .subtotal {
         // padding: .75rem 1.25rem;
         padding: .75rem 0rem;

src/views/order/list.vue

@@ -43,7 +43,7 @@
                                 </p>
                             </div>
                             <!-- <hr> -->
-                            <div class="footer  align-items-center">
+                            <div class="footer  align-items-center" style="justify-content: space-around;">
                                 <button class="btn btn-info" style="background: #4FDCA2;border:1px solid #4FDCA2" @click="open">联系我们</button>
                                 <button class="btn btn-info" style="background: #fff;color:#666666;border:1px solid rgb(102, 102, 102,.5)" :data-id="info['id']" :data-key="key" @click="cancel">取消订单</button>
                                 <a class="btn btn-info"  style="background: #fff;color:#666666;border:1px solid rgb(102, 102, 102,.5)" :data-id="info['id']" :data-key="key" :data-type="info['order_type']"
@@ -85,7 +85,7 @@
                                 </p>
                             </div>
                             <!-- <hr> -->
-                            <div class="footer  align-items-center">
+                            <div class="footer  align-items-center" style="justify-content: space-around;">
                                 <button class="btn btn-info" style="background: #4FDCA2" @click="open">联系我们</button>
                                 <a class="btn btn-info"  style="background: #fff;color:#666666;border:1px solid rgb(102, 102, 102,.5)" :data-id="info['id']" :data-key="key" :data-type="info['order_type']"
                                    v-on:click="goDetail">查看信息</a>
@@ -128,7 +128,7 @@
                                 </div>
                             </div>
                             <!-- <hr> -->
-                            <div class="footer  align-items-center">
+                            <div class="footer  align-items-center" style="justify-content: space-around;">
                                 <button class="btn btn-info" style="background: #4FDCA2" @click="open">联系我们</button>
                                 <a class="btn btn-info" style="background: #fff;color:#666666;border:1px solid rgb(102, 102, 102,.5)" :data-id="info['id']" :data-key="key" :data-type="info['order_type']"
                                    v-on:click="goDetail">查看信息</a>
@@ -476,6 +476,7 @@ import login from "@/store/module/login";
         padding: 1rem;
         margin: .5rem;
         margin-bottom: 0;
+        background: #fff;
     }
 
     .footer {
@@ -484,7 +485,7 @@ import login from "@/store/module/login";
         width: 100%;
         display: flex;
         // justify-content: flex-end;
-        justify-content: space-around;
+        // justify-content: space-around;
         .btn {
             padding: 0.375rem 0.55rem;
         }

src/views/user/index.vue

@@ -459,7 +459,6 @@
         font-size: 1rem;
         color: #ffffff;
     }
-
 </style>
 <style lang="scss">
     .messageTel,
@@ -471,6 +470,9 @@
             background-color: #4FDCA2;
             border-color: #4FDCA2;
         }
+        .el-message-box__btns {
+            text-align: center;
+        }
     }
     .messageClass {
         .el-message-box__content {

src/views/user/info.vue

@@ -257,11 +257,19 @@ import login from "@/store/module/login";
 </script>
 
 <style lang="scss" scoped>
+    // 去掉卡片阴影
+    .el-card.is-always-shadow {
+        -webkit-box-shadow: none;
+        box-shadow: none;
+    }
+    .el-card {
+        border: 0;
+    }
     .leftIcon {
         width: 0.667rem;
         position: absolute;
         top: 4rem;
-        left: 3rem;
+        left: 2rem;
     }
     .avator {
         width: 6rem;
@@ -271,6 +279,7 @@ import login from "@/store/module/login";
 
     .list-group-item {
         border-color: #eee;
+        padding-top: 1rem;
     }
 
     .list-group-item a {
@@ -279,6 +288,13 @@ import login from "@/store/module/login";
     .align-items-center{
         font-size: 1.3rem;
     }
+    // 第一个最后一个li去掉边框
+    .list-group-item:first-child {
+        border: 0;
+    }
+    .list-group-item:last-child {
+        border-bottom: 0;
+    }
 
     .tuichu{