Merge branch 'sit-Carl' of gitee.com:carl_Ming_1/smart-admin into sit-jiamin-v2

This commit is contained in:
Admin
2022-01-19 14:08:08 +00:00
committed by Gitee
53 changed files with 3905 additions and 2724 deletions

View File

@@ -8,17 +8,38 @@ body{
.fade-leave-active {
opacity: 0;
}
.ts-no-data{
text-align: center;
margin:3rem 0;
}
.ts-mask{
width:100%;
height:100%;
position: fixed;
top:0;
left:0;
display:flex;
flex-direction: column;
justify-content: center;
align-items: center;
z-index:99;
.ts-mask-bg{
background-color:#000;
opacity:.6;
width:100%;
height:100%;
z-index:0;
position:absolute;
left:0;
top:0;
}
}
.userloding {
position: fixed;
left: 50%;
margin-left: -1.56rem;
top: 50%;
margin-top: -3.75rem;
background: url(../image/onloading.png) center center no-repeat;
width: 3.12rem;
background-size: contain;
height: 7.5rem;
z-index: 1000;
height: 3.12rem;
animation: rolling 4s infinite;
-webkit-animation:rolling 4s infinite;
}
@@ -48,8 +69,6 @@ body{
}
//用户光点
.rc-screen-reader{
width: 0.81rem;
height: 0.81rem;
border-radius: 50%;
position: absolute;
background-color: red;
@@ -59,6 +78,13 @@ body{
width: 0.37rem;
height: 0.37rem;
}
.rc-menu--xs .rc-screen-reader{
left: 30%;
}
.rc-list__link.ts-login--xs .rc-screen-reader{
left:16%;
}
img, picture {
display: block;
max-width: 100%;
@@ -85,7 +111,8 @@ img, picture {
li{
border: 1px solid #D7D7D7;
display: inline-flex;
border-radius: 4px;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
flex-direction: column;
max-width:10rem;
.rc-column
@@ -117,7 +144,7 @@ img, picture {
}
img{
width:10rem;
height:10rem;
min-height:10rem;
object-fit: contain;
display: flex;
margin: 0 auto;
@@ -229,13 +256,12 @@ img, picture {
right: 0;
top: 30%;
background: #FFFFFF;
box-shadow: 0px 0px .62rem rgba(0, 0, 0, 0.16);
box-shadow: 0 0 10px rgba(0, 0, 0, 0.16);
border-radius: .25rem;
z-index:3;
ul{
width: 60px;
height: 181px;
box-shadow: 0px 0px 6px rgb(0 0 0 / 10%);
background-color: white;
display: flex;
flex-direction: column;
@@ -313,6 +339,9 @@ img, picture {
html {
//font-size:100px;
}
.rc-list__link.ts-login--xs .rc-screen-reader{
left:7%;
}
.rc-md-up {
display: none!important;
}
@@ -320,12 +349,10 @@ img, picture {
width:100%;
}
.rc-top{
margin-top: 74px;
margin-top: 90px;
}
.rc-list__header {
background: none;
padding: .5rem 0;
border-bottom: none;
}
.ts-right-arr {
border-bottom:1px solid #E1001A;
@@ -416,8 +443,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;
@@ -432,7 +464,7 @@ img, picture {
}
}
img{
width:21.7vw;
width:100%;
max-width:320px;
min-width:160px;
}
@@ -539,35 +571,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;
}
*/
/* */
}
}
@@ -589,10 +626,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;
}
}
}

View File

@@ -5,47 +5,98 @@
/deep/.van-swipe__indicator--active{
background-color: #E1001A;
}
.rc-ma{
.ul-zhuan{
li{
background: unset;;
.ts-carousel-indicator{
/deep/.swiper-pagination-bullet{
margin-left:.5rem;
}
/deep/.swiper-pagination-bullet-active{
background:#E2001A;
}
&.center{
width:100%;
text-align: center;
}
}
.ts-position-identifier{
}
.ul-zhuan,.ul-dog{
li{
background: unset;
img{
border-radius: 50%;
}
&:first-child{
margin-left:0;
}
&.active {
img{
border-radius: 50%;
border: 3px solid #E2001A;
}
&.active {
img{
border: 3px solid #E2001A;
}
color: #E2001A;
}
&.unactive {
color: #444444;
img{
border: 3px solid #D7D7D7;
}
color: #E2001A;
}
&.unactive {
color: #444444;
img{
border: 3px solid #D7D7D7;
}
}
}
}
.uservideo{
overflow: hidden;
video{
height:100%;
width:auto;
width:100%;
height:auto;
}
}
.ul-dog{
width: 100%;
display: flex;
justify-content: center;
flex-wrap: wrap;
flex-direction: row;
span{
margin-top: .5rem;
display: block;
}
img{
width: 9.5rem;
height: auto;
display: block;
}
li{
cursor: pointer;
font-size: 16px;
text-align: center;
margin-top:3rem;
margin-left:3rem;
}
}
@media screen and (max-width:768px){
.ul-dog{
display: none;
justify-content: space-evenly;
img{
width:4rem;
height:auto;
}
li{
margin-top:1.875rem;
}
}
.searchBara{
position: fixed;
.ts-banner-swiper-container{
margin-bottom:2.5rem;
}
.searchBara{
width: 100%;
position: fixed;
top:66px;
top:3.75rem;
background: white;
z-index: 9999;
z-index: 60;
overflow-x: auto;
white-space: nowrap;
overflow-y:hidden;
@@ -62,16 +113,14 @@
display: inline-block;
margin-left: 0.20rem;
text-align: center;
background: #F6F6F6;
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 +150,6 @@
}
}
.van-swipe{
z-index: 2;
}
.rc-usermessage{
span{
font-size: 1rem;
@@ -119,10 +165,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;
@@ -134,51 +182,43 @@
display: none;
}
#xxxFullScreen {
background-color: white;
margin-top: 0.40rem;
#swiper1 {
overflow: hidden;
}
.swiper-container{
height: 6.45rem;
}
.swiper-container, .swiper-container2 {
width: 100%;
// overflow: visible !important;
height: 100%;
position: relative;
}
#swiper1 .swiper-container .swiper-wrapper .swiper-slide {
width: 17.25rem;
//height: 6.45rem !important; //Auto adaption
}
/* 上一张 */
#swiper1 .swiper-container .swiper-wrapper .swiper-slide-prev {
margin-top: 0.05rem;
height: 100%;
}
/* 下一张 */
#swiper1 .swiper-container .swiper-wrapper .swiper-slide-next {
margin-top: 0.05rem;
height: 100%;
}
.swiper-container .swiper-wrapper .swiper-slide-active {
height: 100%;
}
.uservideo{
width: 100%;
height:auto;
max-height: 15.68rem;
display: block;
video{
max-width:100%;
max-height:100%;
background-color: white;
margin-top: 0.40rem;
.swiper-container{
height: 6.45rem;
}
.swiper-container {
width: 100%;
height: 100%;
position: relative;
}
.swiper-container .swiper-wrapper .swiper-slide {
width: 17.25rem;
//height: 6.45rem !important; //Auto adaption
}
/* 上一张 */
swiper-container .swiper-wrapper .swiper-slide-prev {
margin-top: 0.05rem;
height: 100%;
}
/* 下一张 */
.swiper-container .swiper-wrapper .swiper-slide-next {
margin-top: 0.05rem;
height: 100%;
}
.swiper-container .swiper-wrapper .swiper-slide-active {
height: 100%;
}
.uservideo{
width: 100%;
height:auto;
display: block;
video{
max-width:100%;
max-height:100%;
}
}
}
}
.sw-center{
width: 100%;
@@ -192,8 +232,9 @@
width: 100%;
display: flex;
flex-direction: column;
justify-content: center;
justify-content: flex-start;
align-items: center;
vertical-align: top;
}
img{
width: 10rem;
@@ -209,6 +250,7 @@
margin-top: 1.25rem;
}
p{
color: #666666;
font-size: .875rem;
text-overflow: -o-ellipsis-lastline;
overflow: hidden;
@@ -231,16 +273,14 @@
/* 中间的图片 */
.swiper-container .swiper-wrapper .swiper-slide-active {
height: 165px !important;
}
.swiperWrap{
height: 469px;
width: 100%;
height: 469px;
width: 100%;
img{
height: 469px;
width: 100%;
height: 469px;
width: 100%;
}
/deep/.swiper-pagination-bullet-active{
background: red;
@@ -301,22 +341,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 +364,24 @@
.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;
img{
margin:0 auto;
}
.ts-carousel-indicator{
position:absolute;
bottom:.4rem;
}
}
.van-swipe-item {
color: #fff;
height: 100%;
@@ -350,15 +400,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 +414,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 +565,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;
}
}
@@ -540,33 +591,7 @@ img{
}
.usermain{
.ul-dog{
width: 100%;
display: flex;
justify-content: center;
flex-wrap: wrap;
flex-direction: row;
span{
margin-top: 2.5rem;
display: block;
}
img{
width: 9.5rem;
height: 9.5rem;
display: block;
}
li{
cursor: pointer;
font-size: 16px;
width: 9.875rem;
text-align: center;
height: 9.875rem;
background: #F6F6F6;
border-radius: 50%;
margin-left:3rem;
}
}
}
.rc-main{
width: 100%;

View File

@@ -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;
@@ -53,11 +55,13 @@
}
.container {
font-size: 0.1rem;
background-color:#fff;
.van-field__body {
border-bottom: 1px solid red;
}
.content {
margin-top: 24px;
box-shadow: unset;
}
.userfoget {
font-size: 14px;