Merge branch 'master' of gitlab.qima-inc.com:fe/oxygen

packages/zanui/src/button.pcss

@@ -28,16 +28,19 @@
     @modifier default {
       color: $button-default-color;
       background-color: $button-default-background-color;
+      border: 1px solid $button-default-border-color;
     }
 
     @modifier primary {
       color: $button-primary-color;
       background-color: $button-primary-background-color;
+      border: 1px solid $button-primary-border-color;
     }
 
     @modifier danger {
       color: $button-danger-color;
       background-color: $button-danger-background-color;
+      border: 1px solid $button-danger-border-color;
     }
 
     @modifier large {

packages/zanui/src/common/var.pcss

@@ -17,12 +17,15 @@ $c-blue: #38f;
 $c-background: #f8f8f8;
 
 /* 按钮颜色 */
-$button-default-color: $c-white;
-$button-default-background-color: $c-green-wx;
-$button-primary-color: $c-black;
-$button-primary-background-color: $c-white;
+$button-primary-color: $c-white;
+$button-primary-background-color: $c-green-wx;
+$button-primary-border-color: #0a0;
+$button-default-color: $c-black;
+$button-default-background-color: $c-white;
+$button-default-border-color: #bbb;
 $button-danger-color: $c-white;
 $button-danger-background-color: #f44;
+$button-danger-border-color: #e33;
 
 :root{
 

packages/zanui/src/switch.pcss

@@ -28,11 +28,17 @@
     @when on {
       background-color: #44db5e;
       border-color: #44db5e;
+      @descendent node {
+        left: 0;
+      }
     }
 
     @when off {
       background-color: #fff;
       border-color: rgba(0, 0, 0, .1);
+      @descendent node {
+        right: 0;
+      }
     }
 
     @when loading {