From b4cfcceca81c90f5878a6e32c277f400845a125d Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@youzan.com>
Date: Wed, 24 Jun 2020 17:38:15 +0800
Subject: [PATCH] feat(Picker): update action button style (#3316)

---
 packages/common/style/var.less |  5 +++--
 packages/picker/index.less     | 16 +++++++++++-----
 packages/picker/toolbar.wxml   |  2 +-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/packages/common/style/var.less b/packages/common/style/var.less
index 88655283..a909d6ea 100644
--- a/packages/common/style/var.less
+++ b/packages/common/style/var.less
@@ -27,6 +27,7 @@
 @disabled-opacity: 0.5;
 @background-color: @gray-1;
 @background-color-light: #fafafa;
+@text-link-color: #576b95;
 
 // Padding
 @padding-base: 4px;
@@ -328,8 +329,8 @@
 @picker-title-font-size: @font-size-lg;
 @picker-action-padding: 0 @padding-md;
 @picker-action-font-size: @font-size-md;
-@picker-action-text-color: @blue;
-@picker-action-active-color: @active-color;
+@picker-confirm-action-color: @text-link-color;
+@picker-cancel-action-color: @gray-6;
 @picker-option-font-size: @font-size-lg;
 @picker-option-text-color: @black;
 @picker-loading-icon-color: @blue;
diff --git a/packages/picker/index.less b/packages/picker/index.less
index a500197a..efe78241 100644
--- a/packages/picker/index.less
+++ b/packages/picker/index.less
@@ -19,13 +19,20 @@
   &__confirm {
     .theme(padding, '@picker-action-padding');
     .theme(font-size, '@picker-action-font-size');
-    .theme(color, '@picker-action-text-color');
 
     &--hover {
-      .theme(background-color, '@picker-action-active-color');
+      opacity: @active-opacity;
     }
   }
 
+  &__confirm {
+    .theme(color, '@picker-confirm-action-color');
+  }
+
+  &__cancel {
+    .theme(color, '@picker-cancel-action-color');
+  }
+
   &__title {
     max-width: 50%;
     text-align: center;
@@ -75,13 +82,12 @@
     pointer-events: none;
   }
 
-  &__loading .van-loading,
   &__frame {
     position: absolute;
     top: 50%;
-    left: 0;
+    right: @padding-md;
+    left: @padding-md;
     z-index: 1;
-    width: 100%;
     transform: translateY(-50%);
     pointer-events: none;
   }
diff --git a/packages/picker/toolbar.wxml b/packages/picker/toolbar.wxml
index 4fa9db50..e41a7301 100644
--- a/packages/picker/toolbar.wxml
+++ b/packages/picker/toolbar.wxml
@@ -1,7 +1,7 @@
 <template name="toolbar">
   <view
     wx:if="{{ showToolbar }}"
-    class="van-picker__toolbar van-hairline--top-bottom toolbar-class"
+    class="van-picker__toolbar toolbar-class"
   >
     <view
       class="van-picker__cancel"