Merge branch 'dev' into alpha

19ca1516 · qiang · fd9293cf · 7e774b0b · 19ca1516
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

src/platforms/app-plus/service/api/ui/popup.js src/platforms/app-plus/service/api/ui/popup.js +1 -1

未找到文件。
--- a/src/platforms/app-plus/service/api/ui/popup.js
+++ b/src/platforms/app-plus/service/api/ui/popup.js
@@ -70,7 +70,7 @@ export function showToast ({
        interval: duration
      }
    } else {
-      if (icon !== 'loading') {
+      if (['success', 'error'].indexOf(icon) !== -1) {
        waitingOptions.loading = {
          display: 'block',
          height: '55px',