Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-09-12 fb48777cd4c3f086f77b5b26e1d03aebf995f4f5

 plugins/http.js

@@ -52,6 +52,7 @@
            dataType: options.dataType ? options.dataType : 'json',
            data: options.data || null,
            header,
            timeout: 30000,
            success: async (res) => {
               if (!options.ignore) {
                  message.hideLoading()
@@ -219,6 +220,7 @@
               if (!options.ignore) {
                  message.hideLoading()
               }
               message.showToast('网络异常')
               reject({
                  data: null,
                  code: 9999,