diff --git a/main.js b/main.js index e82d52c..54b40a6 100644 --- a/main.js +++ b/main.js @@ -42,7 +42,7 @@ import httpConfig from '@/common/http.config.js' Vue.use(httpConfig, app) // 初始化全局loading管理器 -import { initGlobalLoadingManager } from '@/utils/loading-manager.js' +import { initGlobalLoadingManager } from '@/utils/request.js' initGlobalLoadingManager() // Vue.use(httpApi, app) // #ifdef MP-WEIXIN diff --git a/pages/login/login.vue b/pages/login/login.vue index 9f2e300..4d25d3d 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -19,7 +19,7 @@ + + \ No newline at end of file diff --git a/pages/test/loading-manager-test.vue b/pages/test/loading-manager-test.vue new file mode 100644 index 0000000..e77e57a --- /dev/null +++ b/pages/test/loading-manager-test.vue @@ -0,0 +1,141 @@ + + + + + \ No newline at end of file diff --git a/utils/request.js b/utils/request.js index f1d4a1b..0cc456c 100644 --- a/utils/request.js +++ b/utils/request.js @@ -5,7 +5,13 @@ import { hideLoading, forceHideLoading, initGlobalLoadingManager, - config as loadingConfig + config as loadingConfig, + getLoadingStatus, + setLoadingConfig, + getLoadingConfig, + showLoadingWithDelay, + hideLoadingWithDelay, + AutoLoadingManager } from './loading-manager.js' // 环境配置 @@ -348,4 +354,27 @@ export function getToken() { return uni.getStorageSync('token') } +// 导出loading相关函数,作为统一入口 +export { + // 基础loading函数 + showLoading, + hideLoading, + forceHideLoading, + + // 高级loading函数 + showLoadingWithDelay, + hideLoadingWithDelay, + + // 状态和配置管理 + getLoadingStatus, + setLoadingConfig, + getLoadingConfig, + + // 全局初始化 + initGlobalLoadingManager, + + // 自动loading管理器类 + AutoLoadingManager +} + // Loading管理相关函数已从loading-manager.js导入 \ No newline at end of file