diff --git a/src/style/var.less b/src/style/var.less index 5d997ed88..4cb0bcbb0 100644 --- a/src/style/var.less +++ b/src/style/var.less @@ -665,6 +665,7 @@ @toast-max-width: 70%; @toast-font-size: @font-size-md; @toast-text-color: @white; +@toast-loading-icon-color: @white; @toast-line-height: 20px; @toast-border-radius: @border-radius-md; @toast-background-color: rgba(@text-color, .88); diff --git a/src/toast/README.md b/src/toast/README.md index 27652a4b7..8c0f9ddc1 100644 --- a/src/toast/README.md +++ b/src/toast/README.md @@ -21,8 +21,8 @@ Toast('Some messages'); ```javascript Toast.loading({ - mask: true, - message: 'Loading...' + message: 'Loading...', + forbidClick: true }); ``` diff --git a/src/toast/README.zh-CN.md b/src/toast/README.zh-CN.md index 240a6c52b..5047dfa26 100644 --- a/src/toast/README.zh-CN.md +++ b/src/toast/README.zh-CN.md @@ -21,8 +21,8 @@ Toast('提示内容'); ```js Toast.loading({ - mask: true, - message: '加载中...' + message: '加载中...', + forbidClick: true }); ``` diff --git a/src/toast/Toast.js b/src/toast/Toast.js index 0e842cf43..fbd31541b 100644 --- a/src/toast/Toast.js +++ b/src/toast/Toast.js @@ -95,7 +95,7 @@ export default createComponent({ } if (type === 'loading') { - return ; + return ; } } diff --git a/src/toast/demo/index.vue b/src/toast/demo/index.vue index 5a975d168..d302b75a4 100644 --- a/src/toast/demo/index.vue +++ b/src/toast/demo/index.vue @@ -106,7 +106,7 @@ export default { methods: { showLoadingToast() { - this.$toast.loading({ mask: true, message: this.$t('loading') }); + this.$toast.loading({ forbidClick: true, message: this.$t('loading') }); }, showSuccessToast() { diff --git a/src/toast/index.less b/src/toast/index.less index 312e72517..5ee9b898a 100644 --- a/src/toast/index.less +++ b/src/toast/index.less @@ -61,6 +61,10 @@ &__loading { padding: @padding-base; + + .van-loading__spinner { + color: @toast-loading-icon-color; + } } &__text { diff --git a/src/toast/test/__snapshots__/index.spec.js.snap b/src/toast/test/__snapshots__/index.spec.js.snap index 14fe3a233..56be7321c 100644 --- a/src/toast/test/__snapshots__/index.spec.js.snap +++ b/src/toast/test/__snapshots__/index.spec.js.snap @@ -29,7 +29,7 @@ exports[`show html toast 1`] = ` exports[`show loading toast 1`] = `
-
+
Message
`;