From 3000760fcc1ce821037aed3ffb31926cf28a7824 Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Fri, 7 Sep 2018 15:47:33 +0800
Subject: [PATCH] [bugfix] Button: loading color (#1768)

---
 packages/button/index.vue                                | 2 +-
 packages/button/test/__snapshots__/demo.spec.js.snap     | 4 ++--
 packages/submit-bar/test/__snapshots__/demo.spec.js.snap | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/button/index.vue b/packages/button/index.vue
index f21ec7a5f..6fb8984d7 100644
--- a/packages/button/index.vue
+++ b/packages/button/index.vue
@@ -18,7 +18,7 @@
     ])"
     @click="onClick"
   >
-    <loading v-if="loading" size="20px" :color="type === 'default' ? 'black' : 'white'" />
+    <loading v-if="loading" size="20px" :color="type === 'default' ? void 0 : ''" />
     <span v-else :class="b('text')">
       <slot>{{ text }}</slot>
     </span>
diff --git a/packages/button/test/__snapshots__/demo.spec.js.snap b/packages/button/test/__snapshots__/demo.spec.js.snap
index d3186b523..62f5abf60 100644
--- a/packages/button/test/__snapshots__/demo.spec.js.snap
+++ b/packages/button/test/__snapshots__/demo.spec.js.snap
@@ -29,10 +29,10 @@ exports[`renders demo correctly 1`] = `
   </div>
   <div>
     <button class="van-button van-button--default van-button--normal van-button--loading van-button--unclickable">
-      <div class="van-loading van-loading--circular van-loading--black" style="color:#c9c9c9;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
+      <div class="van-loading van-loading--circular van-loading" style="color:#c9c9c9;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
     </button>
     <button class="van-button van-button--primary van-button--normal van-button--loading van-button--unclickable">
-      <div class="van-loading van-loading--circular van-loading--white" style="color:white;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
+      <div class="van-loading van-loading--circular van-loading" style="color:;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
     </button>
   </div>
   <div>
diff --git a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
index e54f1fd58..958d963d9 100644
--- a/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
+++ b/packages/submit-bar/test/__snapshots__/demo.spec.js.snap
@@ -31,7 +31,7 @@ exports[`renders demo correctly 1`] = `
       <div class="van-submit-bar__bar">
         <div class="van-submit-bar__text"><span>合计：</span> <span class="van-submit-bar__price">¥ 30.50</span></div>
         <button class="van-button van-button--danger van-button--normal van-button--loading van-button--unclickable">
-          <div class="van-loading van-loading--circular van-loading--white" style="color:white;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
+          <div class="van-loading van-loading--circular van-loading" style="color:;width:20px;height:20px;"><span class="van-loading__spinner van-loading__spinner--circular"> <svg viewBox="25 25 50 50" class="van-loading__circular"><circle cx="50" cy="50" r="20" fill="none"></circle></svg></span></div>
         </button>
       </div>
     </div>