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 {