Merge branch 'sit-Leung' into sit-jiamin-v2

rc-busness/assets/css/global.less

@@ -21,12 +21,10 @@ body {
 .fade-leave-active {
 	opacity: 0;
 }
-
 .ts-no-data {
 	text-align: center;
 	margin: 3rem 0;
 }
-
 .ts-mask {
 	width: 100%;
 	height: 100%;
@@ -38,7 +36,15 @@ body {
 	justify-content: center;
 	align-items: center;
 	z-index: 99;
-
+	.ts-mask-close{
+		position:absolute;
+		top:1rem;
+		right:1rem;
+		width:1rem;
+		height:1rem;
+		background: url("../image/btn-close.png") center center no-repeat;
+		background-size:contain;
+	}
 	.ts-mask-bg {
 		background-color: #000;
 		opacity: .6;
@@ -54,10 +60,11 @@ input[type=checkbox]{
 	position:relative;
 	cursor: pointer;
 	border:none;
-	border: 1px solid #d7d7d7;
+	//border: 1px solid #d7d7d7;
 	border-radius: 3px;
 	width: 1.5rem;
 	height: 1.5rem;
+	-webkit-appearance:none;
 	&:before {
 		top: 0;
 		left: 0;
@@ -327,12 +334,12 @@ picture {
 	border-radius: .25rem;
 	z-index:11;
 	ul{
-		width: 60px;
-		height: 181px;
+		width: 3.75rem;
+		height: 11.3rem;
 		background-color: white;
 		display: flex;
 		flex-direction: column;
-
+		justify-content: space-between;
 		li {
 			width: 100%;
 			display: flex;
@@ -354,7 +361,7 @@ picture {
 	}
 
 	span {
-		font-size: 0.12rem;
+		font-size: .75rem;
 	}
 
 	.tuntop {
@@ -415,7 +422,7 @@ picture {
 	}
 	label {
 		input[type=checkbox] {
-			top:.25rem;
+			top:0rem;
 		}
 	}
 	.rc-header__nav--primary{
@@ -523,7 +530,12 @@ picture {
 		max-width: 768px;
 		margin: 0 auto;
 	}
-
+	div[data-js-modal-menu] {
+		display:none;
+	}
+	aside div[data-js-modal-menu] {
+		display:block;
+	}
 	html {
 		font-size: 16px;
 	}
@@ -808,7 +820,11 @@ picture {
 	margin: 0 auto;
 	.el-dialog{
 	  width: 100%;
-
+	}
+	.el-dialog__body{
+		max-height:50vh;
+		overflow-x:hidden;
+		overflow-y:auto;
 	}
 }
 #tns2-iw {

rc-busness/assets/css/index.less

@@ -20,6 +20,14 @@
 }
 .ts-position-identifier{
 
+}
+.ts-mobile-player-container {
+	video {
+		width:100%;
+		height:auto;
+		position: relative;
+		z-index:2;
+	}
 }
 .ul-zhuan,.ul-dog{
 	li{
@@ -83,6 +91,7 @@
 		}
 		li{
 			margin-top:1.875rem;
+			margin-left:0;
 		}
 	}
 	.ts-banner-swiper-container{
@@ -211,9 +220,29 @@
 			width: 100%;
 			height:auto;
 			display: block;
-			video{
-				max-width:100%;
-				max-height:100%;
+			position:relative;
+			z-index:0;
+			&:before{
+				content:"";
+				background:#000;
+				opacity:.6;
+				position:absolute;
+				width:100%;
+				height:100%;
+				left:0;
+				top:0;
+				z-index:1;
+			}
+			&:after{
+				content:"";
+				position:absolute;
+				top:0;
+				left:0;
+				width:100%;
+				height:100%;
+				background:url("../image/btn-play.png") center center no-repeat;
+				background-size:90px 90px;
+				z-index:2;
 			}
 		}
 	}
@@ -225,19 +254,32 @@
 		align-items: center;
 		border: 1px solid #d7d7d7;
 		border-radius:4px;
+		img{
+			object-fit: cover;
+			display: block;
+			z-index:0;
+		}
 		.rc-click{
 			width: 100%;
 			display: flex;
 			flex-direction: column;
 			justify-content: flex-start;
 			align-items: center;
+			img{
+				width: 100%;
+				height: auto;
+				position:relative;
+			}
 		}
-		img{
-			width: 10rem;
-			height: 10rem;
-			object-fit: cover;
-			display: block;
-			margin-top: 2.5rem;
+		.click-zone{
+			align-items: center;
+			display: flex;
+			flex-direction: column;
+			img{
+				width: 10rem;
+				height: 10rem;
+				margin-top: 2.5rem;
+			}
 		}
 		span{
 			font-size: 1.125rem;
@@ -348,13 +390,13 @@
 	//  }
 }
 .active {
-	font-size: 0.14rem;
+	font-size: .875rem;
 	img{
 		border-width: 1px;
 	}
 }
 .unactive {
-	font-size: 0.14rem;
+	font-size: .875rem;
 	img{
 		border-width: 1px;
 	}

rc-busness/assets/css/mypersonal.less

@@ -253,6 +253,9 @@ ul li ol li em strong i {
 		width: 440px;
 		height: 652px;
 	}
+.ts-crumbs {
+	padding-left:.25rem;
+}
 .ts-mypersonal{
 	margin-left:0;
 	.rc-column{

rc-busness/assets/css/orderquantity.less

@@ -288,12 +288,12 @@
                   border: 1px solid #D8D8D8;
                    margin-left: 40px;
        
-                img {
-                  width: 96px;
-                  height: 96px;
-                  display: block;
-    
-                }
+					img {
+						width: 96px;
+						height: 96px;
+						display: block;
+						object-fit: contain;
+					}
               }
     
               .rc-right {

rc-busness/assets/css/producted.less

@@ -451,7 +451,6 @@
       }
       span {
         font-size: 45px;
-        font-weight: bold;
       }
       strong {
         font-style: normal;

rc-busness/assets/css/search.less

@@ -289,7 +289,7 @@ border-radius: 100px;
 .rc-bottom{
   position: fixed;
     background: white;
-    height: 617px;
+    height: 21.875rem;
     bottom: 0;
     left: 0;
     z-index: 9;

rc-busness/assets/css/settlement.less

@@ -236,6 +236,7 @@ color: #333333;
           font-style: normal;
           display: flex;
           justify-content: space-between;
+		  align-items: baseline;
           span {
             font-size: 14px;
 
@@ -251,6 +252,10 @@ color: #333333;
           }
         }
       }
+	  .ts-right-arr {
+		  line-height:1rem;
+		  height:1.5rem;
+	  }
     }
 
 

rc-busness/assets/css/usermember.less

@@ -152,10 +152,11 @@ ul li ol li em strong i {
    
   
      }
-      .rc-value{
-        display: flex;
-        justify-content: space-between;
-   }
+	.rc-value{
+		display: flex;
+		justify-content: space-between;
+		cursor: pointer;
+	}
  }
 
   .usermember{

rc-busness/assets/css/usertion.less

@@ -326,7 +326,7 @@ margin-right: 20px;
 
 
 //pc端
-@media screen and (min-width: 768px) and (max-width: 1920px) {
+@media screen and (min-width: 768px){
   
     //快递列表
   .delivery {
@@ -518,7 +518,7 @@ margin-right: 20px;
       
         width: 100%;
         margin-left: 16px;
-      
+		justify-content: end;
   
       }
       .rc-userright {