Merge branch 'sit-Carl' into sit-Leung

# Conflicts:
#	rc-busness/pages/personal/userpay.vue

rc-busness/assets/css/discount.less

@@ -88,6 +88,9 @@
           font-style: normal;
           font-size: 14px;
           color: #e1001a;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis
         }
         .rc-userfont {
           overflow: hidden;
@@ -254,6 +257,9 @@ margin-top: 30px;
           font-style: normal;
           font-size: 16px;
           color: #e1001a;
+          white-space: nowrap;
+          overflow: hidden;
+          text-overflow: ellipsis
         }
         .rc-userfont {
           overflow: hidden;

rc-busness/assets/css/global.less

@@ -62,15 +62,15 @@ input[type=checkbox]{
 	border:none;
 	//border: 1px solid #d7d7d7;
 	border-radius: 3px;
-	width: 1.5rem;
-	height: 1.5rem;
+	width: 1rem;
+	height: 1rem;
 	-webkit-appearance:none;
 	&:before {
 		top: 0;
 		left: 0;
 		content: "";
-		width: 1.5rem;
-		height: 1.5rem;
+		width: 1rem;
+		height: 1rem;
 		position: absolute;
 		display: inline-block;
 		background-color: #fff;
@@ -83,7 +83,7 @@ input[type=checkbox]{
 }
 label {
 	input[type=checkbox] {
-		top:.375rem;
+		// top:.375rem;
 	}
 }
 

rc-busness/assets/css/login.less

@@ -14,6 +14,7 @@
 }
 .usecheck label{
 	display:flex;
+  align-items: center;
 	input{
 		margin-right:.687rem;
 	}
@@ -48,10 +49,10 @@
    .usecheck{
     display: flex;
     text-align: left;
-    width: 335px;
     margin: 0 auto;
     align-items: center;
     margin-top: 18px;
+    border-bottom: 1px solid #d7d7d7;
  
   }
   .container {
@@ -106,6 +107,20 @@
       border: none;
       outline: none;
     }
+  .rc-one-column {
+    font-size: 12px;
+     strong{
+       font-size: 12px;
+       margin-left: 6px;
+       font-weight: bold;
+     }
+     i{
+       font-style: normal;
+       color: #E1001A;
+       font-weight: bold;
+     }
+  
+  }
     .rc-center {
       font-size: 30px;
       color: #333333;
@@ -142,14 +157,50 @@
 }
 //    /* 最小768px最大1920 *pc端/
 @media screen and (min-width: 769px) {
+  .rc-one-column{
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    .rc-one-column {
+      font-size: 12px;
+      .rc-text--left{
+        strong{
+          font-size: 12px;
+          margin-left: 6px;
+          font-weight: bold;
+        }
+      
+     
+     }
+     i{
+       font-style: normal;
+       color: #E1001A;
+       font-weight: bold;
+     }
+      }
+    
+  }
   .usecheck{
     display: flex;
     text-align: left;
-    width: 395px;
     margin: 0 auto;
     align-items: center;
     margin-top: 18px;
- 
+    border-bottom: 1px solid #d7d7d7
+  }
+  .usecheck label{
+    display: flex;
+    align-items: center;
+    i{
+      font-style: normal;
+      color: #E1001A;
+     font-weight: bold;
+    }
+  }
+  .rc-one-column strong{
+    font-size: 12px;
+    margin-left: 6px;
+    font-weight: bold;
   }
   /deep/
   .van-field-one{

rc-busness/assets/css/royalcanin-standard.css

@@ -22019,9 +22019,6 @@ li:last-child .edge .rc-tab--view-control:focus,li:last-child
 }
 
 @media (max-width: 1024px) {
-    .rc-xl-up,.xl-up {
-        display: none !important;
-    }
 
     .rc-flex-direction--reverse--xl-down {
         -webkit-box-orient: vertical;