Merge branch 'sit-Leung' into sit-Carl

# Conflicts:
#	rc-busness/components/header.vue
#	rc-busness/pages/index.vue

rc-busness/assets/css/global.less

@@ -38,8 +38,7 @@ img, picture {
 	flex-wrap: wrap;
 	justify-content: space-evenly;
 	&:after{
-		content:"";
-		width:154px;
+
 	}
 	li{
 		border: 1px solid #D7D7D7;
@@ -151,11 +150,9 @@ img, picture {
 		flex-wrap: nowrap;
 		text-align: center;
 		width: 86%;
-		&::-webkit-scrollbar{
-			display:none;
-		}
 		li{
 			border-radius: 100px;
+			flex-shrink:0;
 		}
 	}
 	.active{
@@ -345,6 +342,9 @@ img, picture {
 				font-size:.75rem;
 				line-height: 1.375rem;
 			}
+			&::-webkit-scrollbar{
+				display:none;
+			}
 		}
 	}
 	
@@ -369,17 +369,25 @@ img, picture {
 		display:block;
 		li{
 			max-width:20rem;
-			margin-right:.9rem;
-			margin-left:.9rem;
+			//margin-right:.875rem;
+			margin-left:2.2vw;
 			.rc-column{
 				span{
 					font-size:1.875rem;
 					height: 5.2rem;
 				}
 			}
+			&:nth-child(4n+1){
+				margin-left:0;
+			}
+			&:nth-child(4n){
+				//margin-right:0;
+			}
 		}
 		img{
-			width:20rem;
+			width:100%;
+			max-width:320px;
+			min-width:160px;
 		}
 	}
 	.ts-right-arr {
@@ -489,12 +497,30 @@ img, picture {
 		{
 			li
 			{
-				margin-left: 40px;
+				margin-left: 30px;
 				width: 8.125rem;
 				height: 2.5rem;
 				line-height: 40px;
 				font-size: .875rem;
 			}
+			/*
+			&::-webkit-scrollbar{
+				background:unset;
+				height:4px;
+			}
+			&::-webkit-scrollbar-thumb{
+				background-color:#d7d7d7;
+				height:2px;
+			}
+			&::-webkit-scrollbar-track{
+				background-color:ddd;
+				
+				height:2px;
+			}
+			&::-webkit-scrollbar-button{
+				background:unset;
+			}
+			*/
 		}
 	}
 
@@ -511,4 +537,15 @@ img, picture {
 	.rc-xl-down {
 		display: none!important;
 	}
+}
+@media screen and (min-width: 769px) and (max-width: 1370px)
+{
+	.ts-product-list {
+		display:flex;
+		justify-content: space-between;
+		li{
+			margin-left:0;
+			margin-right:0;
+		}
+	}
 }