From e662aa7d894a0b259dc1816e79514c1f0d38da9f Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 21 五月 2025 16:14:05 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui
---
apps/h5/src/components/Layout/LoadingLayout.vue | 81 +++++++++++++++++++---------------------
1 files changed, 38 insertions(+), 43 deletions(-)
diff --git a/apps/h5/src/components/Layout/LoadingLayout.vue b/apps/h5/src/components/Layout/LoadingLayout.vue
index 0a9d000..846aa4f 100644
--- a/apps/h5/src/components/Layout/LoadingLayout.vue
+++ b/apps/h5/src/components/Layout/LoadingLayout.vue
@@ -1,58 +1,53 @@
<template>
- <div v-if="loading" class="loading-layout-loading-content-wrapper">
- <IconFont name="loading" />
- <div class="list-empty-hint-text">鏁版嵁鍔犺浇涓�......</div>
- </div>
- <nut-empty
- v-else-if="error"
- class="loading-layout-error-wrapper"
- status="error"
- description="鍔犺浇澶辫触"
- >
- <div :style="{ marginTop: '10px' }">
- <nut-button type="primary" @click="loadError"> 閲嶈瘯 </nut-button>
+ <div class="loading-layout-wrapper">
+ <div class="spinner-wrapper" v-if="props.loading">
+ <div class="el-loading-spinner">
+ <el-icon class="is-loading">
+ <Loading />
+ </el-icon>
+ <p class="el-loading-text">鎷煎懡鍔犺浇涓�</p>
+ </div>
</div>
- </nut-empty>
- <template v-else>
- <NoData v-if="showNoData" />
- <slot v-else></slot>
- </template>
+ <template v-else>
+ <div v-if="props.error">鍑洪敊浜�</div>
+ <template v-else>
+ <slot></slot>
+ </template>
+ </template>
+ </div>
</template>
<script setup lang="ts">
-import { loadingLayoutProps } from './layout';
-import { IconFont } from '@nutui/icons-vue-taro';
-import NoData from '../NoData/NoData.vue';
-
defineOptions({
name: 'LoadingLayout',
});
-const props = defineProps(loadingLayoutProps);
+type Props = {
+ loading?: boolean;
+ error?: boolean;
+};
+
+const props = withDefaults(defineProps<Props>(), {
+ loading: false,
+ error: false,
+});
</script>
-<style lang="scss">
-@import '@/styles/common.scss';
-
-.loading-layout-loading-content-wrapper {
- padding: 40px;
- display: flex;
- justify-content: center;
- align-items: center;
-
- .nut-icon {
- color: boleGetCssVar('text-color', 'primary');
- margin-right: 8px;
- }
-
- .list-empty-hint-text {
- line-height: 1;
- font-size: 30px;
- color: boleGetCssVar('text-color', 'primary');
- }
+<style lang="scss" scoped>
+.loading-layout-wrapper {
+ position: relative;
+ width: 100%;
+ height: 100%;
}
-.loading-layout-error-wrapper {
- height: 100%;
+.spinner-wrapper {
+ min-height: calc(100vh - 80px);
+ // position: relative;
+}
+
+.hasTagsView {
+ .spinner-wrapper {
+ min-height: calc(100vh - 124px);
+ }
}
</style>
--
Gitblit v1.9.1