diff --git a/rc-busness/assets/css/global.less b/rc-busness/assets/css/global.less index a72ec596..40b65189 100644 --- a/rc-busness/assets/css/global.less +++ b/rc-busness/assets/css/global.less @@ -278,7 +278,7 @@ img, picture { width:100%; } .rc-top{ - margin-top: 74px; + margin-top: 90px; } .rc-list__header { background: none; @@ -369,8 +369,13 @@ img, picture { display:block; li{ max-width:20rem; + min-width:18.75rem; + width:22.8vw; //margin-right:.875rem; - margin-left:2.2vw; + margin-left:2vw; + padding-left:1px; + padding-right:1px; + box-sizing: border-box; .rc-column{ span{ font-size:1.875rem; @@ -385,7 +390,7 @@ img, picture { } } img{ - width:21.7vw; + width:100%; max-width:320px; min-width:160px; } @@ -492,35 +497,40 @@ img, picture { } h2{ font-size:20px; + padding-bottom:1rem; } .ts-scrollable { + padding-bottom:1rem; + scrollbar-width: thin; li { margin-left: 30px; width: 8.125rem; height: 2.5rem; - line-height: 40px; + //line-height: 40px; font-size: .875rem; + padding:.375rem; } - /* + &::-webkit-scrollbar{ - background:unset; - height:4px; + height: 6px; + width:50%; + background:transparent; } &::-webkit-scrollbar-thumb{ background-color:#d7d7d7; - height:2px; + border-radius:10px; + width:50%; } &::-webkit-scrollbar-track{ - background-color:ddd; - - height:2px; + //background-color:#ddd; + background-color:transparent; } &::-webkit-scrollbar-button{ background:unset; } - */ + /* */ } } @@ -542,10 +552,10 @@ img, picture { { .ts-product-list { display:flex; - justify-content: space-between; + //justify-content: space-between; li{ - margin-left:0; - margin-right:0; + //margin-left:0; + //margin-right:0; } } } \ No newline at end of file diff --git a/rc-busness/assets/css/index.less b/rc-busness/assets/css/index.less index fc6f260e..e46a91ca 100644 --- a/rc-busness/assets/css/index.less +++ b/rc-busness/assets/css/index.less @@ -5,29 +5,41 @@ /deep/.van-swipe__indicator--active{ background-color: #E1001A; } -.rc-ma{ - .ul-zhuan{ - li{ - background: unset;; - img{ - border-radius: 50%; - } - &.active { - img{ - border: 3px solid #E2001A; - } - color: #E2001A; - - } - &.unactive { - color: #444444; - img{ - border: 3px solid #D7D7D7; - } - } + +.ts-carousel-indicator{ + /deep/.swiper-pagination-bullet{ + margin-left:.5rem; + } + /deep/.swiper-pagination-bullet-active{ + background:#E2001A; + } + &.center{ + width:100%; + text-align: center; + } +} + +li{ + background: unset;; + img{ + border-radius: 50%; + } + &.active { + img{ + border: 3px solid #E2001A; + } + color: #E2001A; + + } + &.unactive { + color: #444444; + img{ + border: 3px solid #D7D7D7; } } } + + .uservideo{ overflow: hidden; video{ @@ -39,8 +51,10 @@ .ul-dog{ display: none; } - .searchBara{ - position: fixed; + .ts-banner-swiper-container{ + margin-bottom:2.5rem; + } + .searchBara{ width: 100%; position: fixed; top:66px; @@ -66,12 +80,11 @@ border-radius: 50%; opacity: 1; } - } - - .rc-login{ - width: 92%; - margin:0 auto; - } + } + .rc-login{ + width: 92%; + margin:0 auto; + } .userunlogin{ width: 100%; height: 0.60rem; @@ -101,9 +114,6 @@ } } - .van-swipe{ - z-index: 2; - } .rc-usermessage{ span{ font-size: 1rem; @@ -119,10 +129,12 @@ height: auto; object-fit: cover; } - + + .van-swipe{ + z-index: 2; + } .van-swipe-item { color: #fff; - height: 26.31rem; width: 100%; font-size: 0.20px; text-align: center; @@ -172,7 +184,6 @@ .uservideo{ width: 100%; height:auto; - max-height: 15.68rem; display: block; video{ max-width:100%; @@ -209,6 +220,7 @@ margin-top: 1.25rem; } p{ + color: #666666; font-size: .875rem; text-overflow: -o-ellipsis-lastline; overflow: hidden; @@ -301,22 +313,22 @@ } } - .active { - font-size: 0.14rem; - img{ - border-width: 1px; - } - } - .unactive { - font-size: 0.14rem; - img{ - border-width: 1px; - } - } // .usermain{ // display: none; // } } +.active { + font-size: 0.14rem; + img{ + border-width: 1px; + } +} +.unactive { + font-size: 0.14rem; + img{ + border-width: 1px; + } +} @media screen and (min-width: 769px) @@ -324,14 +336,21 @@ .rc-selection{ display: none; } - .sw-center{ - display: none; - } -.useraimg{ -width: 100%; -// height: 29.31rem; -object-fit: cover; -} + .sw-center{ + display: none; + } + .useraimg{ + width: 100%; + // height: 29.31rem; + object-fit: cover; + } + .ts-banner-swiper-container{ + position:relative; + .ts-carousel-indicator{ + position:absolute; + bottom:.4rem; + } + } .van-swipe-item { color: #fff; height: 100%; @@ -350,15 +369,12 @@ object-fit: cover; #xxxFullScreen { background-color: white; // margin-top: 100px; - #swiper1 { - width: 100%; + #swiper1,#swiper2 { overflow: hidden; margin-top: 2.31rem; - - h2{ - padding-bottom: 5rem; - } - + } + h2{ + padding-bottom: 5rem; } .swiper-container2 { @@ -367,10 +383,10 @@ object-fit: cover; // overflow: visible !important; position: relative; } -#swiper1 .swiper-container .swiper-wrapper .swiper-slide { - width: 100%; - //height: 6.18rem; -} + #swiper1 .swiper-container .swiper-wrapper .swiper-slide { + width: 100%; + //height: 6.18rem; + } /* 上一张 */ #swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev { @@ -518,14 +534,18 @@ img{ display: block; } img{ - width: 10vw; - height: 10vw; + width:100%; + height: auto; + object-fit: contain; display: block; } li{ + width: 10vw; + max-width:11rem; cursor: pointer; font-size: 16px; text-align: center; + overflow:hidden; } } @@ -548,7 +568,7 @@ img{ flex-direction: row; span{ - margin-top: 2.5rem; + margin-top: .5rem; display: block; } img{ @@ -559,11 +579,8 @@ img{ li{ cursor: pointer; font-size: 16px; - width: 9.875rem; text-align: center; - height: 9.875rem; - background: #F6F6F6; - border-radius: 50%; + margin-top:3rem; margin-left:3rem; } } diff --git a/rc-busness/assets/css/login.less b/rc-busness/assets/css/login.less index 8ba135c4..f166c777 100644 --- a/rc-busness/assets/css/login.less +++ b/rc-busness/assets/css/login.less @@ -1,7 +1,9 @@ .container{ - min-height:80vh; + min-height:100vh; height:100%; background-color:#f6f6f6; + display: flex; + flex-direction: column; } .ts-max-width--460{ border-radius: 3px; diff --git a/rc-busness/components/header.vue b/rc-busness/components/header.vue index 7c10461f..3c121957 100644 --- a/rc-busness/components/header.vue +++ b/rc-busness/components/header.vue @@ -58,11 +58,6 @@ --> - - - translations.feature.headerbar.pin - - @@ -75,16 +70,16 @@