소스 검색

Merge remote-tracking branch 'origin/feature/yc-mobile-1020' into feature/wangcz-mobile-1020

# Conflicts:
#	components/mobile/MobileHeader.vue
wangcz 8 년 전
부모
커밋
a29d2fad6d

+ 4 - 0
assets/scss/mobileCommon.scss

@@ -26,9 +26,13 @@
         padding: .2rem 0;
         line-height: .31rem;
         border-bottom: .01rem solid rgb(183,213,254);
+        text-align: center;
         &:last-child {
           border-bottom: none;
         }
+        &:first-child {
+          text-align: left;
+        }
       }
     }
   }

+ 0 - 1
components/mobile/Home.vue

@@ -130,7 +130,6 @@
   .home{
     font-size:.28rem;
     margin-bottom:1rem;
-    margin-top:.88rem;
     .home-header{
       width:100%;
       padding-top:1.3rem;

+ 1 - 1
components/mobile/MobileHeader.vue

@@ -59,7 +59,7 @@
   @import '~assets/scss/mobileCommon';
   .mobile-header{
     width:100%;
-    position:relative;
+    position:fixed;
     top:0;
     z-index:10000;
     height:.88rem;

+ 1 - 0
components/mobile/brand/BrandDetail.vue

@@ -199,6 +199,7 @@
 <style lang="scss" scoped>
   .brand-detail {
     margin: 0 auto;
+    margin-bottom: .98rem;
     text-align: center;
     .brand-logo {
       text-align: center;

+ 1 - 0
components/mobile/brand/ComponentDetail.vue

@@ -165,6 +165,7 @@
 <style lang="scss" scoped>
   .component-detail {
     font-size: .28rem;
+    margin-bottom: .98rem;
     .base-detail {
       margin: .34rem .66rem .34rem .40rem;
       .base-detail-item {

+ 1 - 1
pages/mobile/search/_keycode.vue

@@ -38,8 +38,8 @@
 
 <style scoped lang="scss">
   .search-list{
-    margin-top:.88rem;
     width:100%;
+    margin-bottom: .98rem;
   .search-item{
     justify-content: space-around;
     text-align: center;

+ 1 - 1
pages/mobile/shop/index.vue

@@ -47,7 +47,7 @@
 
 <style scoped lang="scss">
   .shop{
-    margin-top:1rem;
+    margin-bottom: .98rem;
     min-height: 10rem;
     background: #e2e4e6;
   .shop-top{

+ 1 - 1
pages/mobile/user/_uuid.vue

@@ -41,7 +41,7 @@
 
 <style scoped lang="scss">
   .user-content{
-    margin-top:1rem;
+    margin-bottom: .98rem;
     min-height: 10rem;
     background: #e2e4e6;
     .user-name{