Ver código fonte

Merge branch 'dev/v1.0.62_zsy' of jianyu/web into feature/v1.0.62

zhangsiya 10 meses atrás
pai
commit
5bf481f275

+ 1 - 2
apps/mobile/src/components/cell/filter-cell/index.vue

@@ -104,11 +104,10 @@ export default {
   .filter-cell-label {
   .filter-cell-label {
     margin-top: 2px;
     margin-top: 2px;
   }
   }
-  .v-vip-icon{
+  .v-vip-icon {
     display: inline-block;
     display: inline-block;
     width: 14px;
     width: 14px;
     height: 14px;
     height: 14px;
-    margin-left: 2px;
     background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
     background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
     background-size: contain;
     background-size: contain;
     margin-bottom: 1px;
     margin-bottom: 1px;

+ 0 - 1
apps/mobile/src/components/search/bidding/filters.vue

@@ -1228,7 +1228,6 @@ export default {
   display: inline-block;
   display: inline-block;
   width: 14px;
   width: 14px;
   height: 14px;
   height: 14px;
-  margin-left: 2px;
   background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
   background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
   background-size: contain;
   background-size: contain;
   margin-bottom: 1px;
   margin-bottom: 1px;

+ 1 - 2
apps/mobile/src/components/subscribe/SubscribeMoreFilters.vue

@@ -621,11 +621,10 @@ export default {
     border-bottom: 1px solid $border_color_3;
     border-bottom: 1px solid $border_color_3;
   }
   }
 }
 }
-.v-vip-icon{
+.v-vip-icon {
   display: inline-block;
   display: inline-block;
   width: 14px;
   width: 14px;
   height: 14px;
   height: 14px;
-  margin-left: 2px;
   background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
   background: url(@/assets/image/icon/vip/v_icon.png) no-repeat center;
   background-size: contain;
   background-size: contain;
   margin-bottom: 2px;
   margin-bottom: 2px;

+ 12 - 1
apps/mobile/src/views/article/ui/ServiceIntroCard.vue

@@ -139,10 +139,21 @@ export default {
 .action-group {
 .action-group {
   .action-button {
   .action-button {
     height: 32px;
     height: 32px;
-    font-size: 16px;
+    font-size: 15px;
     &:not(:first-of-type) {
     &:not(:first-of-type) {
       margin-left: 24px;
       margin-left: 24px;
     }
     }
   }
   }
 }
 }
+::v-deep {
+  .van-button {
+    font-weight: normal;
+  }
+  .van-button--plain {
+    background: transparent;
+  }
+  .van-button--normal {
+    padding: 0 12px;
+  }
+}
 </style>
 </style>