diff --git a/src/loading/index.less b/src/loading/index.less
index abc72de46..ff2ed370a 100644
--- a/src/loading/index.less
+++ b/src/loading/index.less
@@ -2,6 +2,7 @@
.van-loading {
position: relative;
+ color: @loading-spinner-color;
font-size: 0;
vertical-align: middle;
@@ -13,7 +14,6 @@
max-width: 100%;
height: @loading-spinner-size;
max-height: 100%;
- color: @loading-spinner-color;
vertical-align: middle;
animation: van-rotate @loading-spinner-animation-duration linear infinite;
diff --git a/src/picker/index.js b/src/picker/index.js
index 54717e636..39d20d9c3 100644
--- a/src/picker/index.js
+++ b/src/picker/index.js
@@ -2,7 +2,7 @@ import { createNamespace } from '../utils';
import { preventDefault } from '../utils/dom/event';
import { deepClone } from '../utils/deep-clone';
import { pickerProps } from './shared';
-import { BLUE, BORDER_TOP_BOTTOM, BORDER_UNSET_TOP_BOTTOM } from '../utils/constant';
+import { BORDER_TOP_BOTTOM, BORDER_UNSET_TOP_BOTTOM } from '../utils/constant';
import Loading from '../loading';
import PickerColumn from './PickerColumn';
@@ -182,7 +182,7 @@ export default createComponent({
return (
{this.toolbarPosition === 'top' ? Toolbar : h()}
- {this.loading ?
: h()}
+ {this.loading ?
: h()}
{this.slots('columns-top')}
{columns.map((item, index) => (
diff --git a/src/picker/index.less b/src/picker/index.less
index a2463f858..5108cbfb7 100644
--- a/src/picker/index.less
+++ b/src/picker/index.less
@@ -48,10 +48,10 @@
display: flex;
align-items: center;
justify-content: center;
- background-color: rgba(255, 255, 255, .9);
+ color: @picker-loading-icon-color;
+ background-color: @picker-loading-mask-color;
}
- &__loading .van-loading,
&__frame {
position: absolute;
top: 50%;
diff --git a/src/picker/test/__snapshots__/demo.spec.js.snap b/src/picker/test/__snapshots__/demo.spec.js.snap
index b6cfef2f8..5d427bec3 100644
--- a/src/picker/test/__snapshots__/demo.spec.js.snap
+++ b/src/picker/test/__snapshots__/demo.spec.js.snap
@@ -115,7 +115,7 @@ exports[`renders demo correctly 1`] = `
-
+
diff --git a/src/style/var.less b/src/style/var.less
index 4cb0bcbb0..c8026ef28 100644
--- a/src/style/var.less
+++ b/src/style/var.less
@@ -461,6 +461,8 @@
@picker-option-font-size: @font-size-lg;
@picker-option-text-color: @black;
@picker-option-disabled-opacity: .3;
+@picker-loading-icon-color: @blue;
+@picker-loading-mask-color: rgba(255, 255, 255, .9);
// Popup
@popup-background-color: @white;
diff --git a/src/toast/index.less b/src/toast/index.less
index 27d713ead..cbf6bd64c 100644
--- a/src/toast/index.less
+++ b/src/toast/index.less
@@ -62,10 +62,7 @@
&__loading {
padding: @padding-base;
-
- .van-loading__spinner {
- color: @toast-loading-icon-color;
- }
+ color: @toast-loading-icon-color;
}
&__text {