From 1113721c0e068c57adbc15149cce15563960a7f2 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期三, 18 六月 2025 23:03:25 +0800
Subject: [PATCH] Merge branch 'dev' of http://42.193.1.25:9521/r/lmk-shop-wx into dev
---
pages/userPermissions/userPermissions.vue | 71 ++++++++++-------------------------
1 files changed, 21 insertions(+), 50 deletions(-)
diff --git a/pages/userPermissions/userPermissions.vue b/pages/userPermissions/userPermissions.vue
index 1c2079f..04f4a5c 100644
--- a/pages/userPermissions/userPermissions.vue
+++ b/pages/userPermissions/userPermissions.vue
@@ -32,18 +32,24 @@
</view>
<!-- 鍔犺浇鏇村鎻愮ず -->
- <view class="load-more" v-if="loading">
- <u-loading :show="loading"></u-loading>
+
+ <view class="load-more">
+ <u-loadmore
+ v-if="mockData.length > 0"
+ :status="loading ? 'loading' : noMore ? 'nomore' : 'loadmore'"
+ :load-text="{
+ loadmore: '涓婃媺鍔犺浇鏇村',
+ loading: '姝ｅ湪鍔犺浇',
+ nomore: '娌℃湁鏇村浜�'
+ }"
+ />
</view>
- <view class="load-more" v-if="noMoreData">
- <text>娌℃湁鏇村鏁版嵁浜�</text>
+ <view style="height:150rpx">
+
</view>
</scroll-view>
- <!-- 绌虹姸鎬� -->
- <view class="empty" v-else>
- <text>鏆傛棤鐢ㄦ埛鏁版嵁</text>
- </view>
+
</view>
</template>
@@ -55,27 +61,10 @@
update,
restPassword
} from "@/api/userPermissions.js"
- import UIcon from '@/uview-components/uview-ui/components/u-icon/u-icon.vue';
- import UButton from '@/uview-components/uview-ui/components/u-button/u-button.vue';
- import UForm from '@/uview-components/uview-ui/components/u-form/u-form.vue';
- import UFormItem from '@/uview-components/uview-ui/components/u-form-item/u-form-item.vue';
- import UInput from '@/uview-components/uview-ui/components/u-input/u-input.vue';
- import USearch from '@/uview-components/uview-ui/components/u-search/u-search.vue';
- import UPopup from '@/uview-components/uview-ui/components/u-popup/u-popup.vue';
- import ULoading from '@/uview-components/uview-ui/components/u-loading/u-loading.vue'
+ import '@/components/uview-components/uview-ui';
export default {
- components: {
- UIcon,
- UButton,
- UForm,
- UFormItem,
- UInput,
- USearch,
- UPopup,
- ULoading
- },
data() {
return {
userList: [], // 鐢ㄦ埛鍒楄〃鏁版嵁
@@ -270,30 +259,12 @@
}
}
}
-
.load-more {
- padding: 20rpx;
- text-align: center;
- color: #999;
- font-size: 28rpx;
- }
+ padding: 20rpx 0;
+ text-align: center;
+ color: #999;
+ font-size: 26rpx;
+ background-color: #f7f8fa;
+ }
- .empty {
- flex: 1;
- display: flex;
- flex-direction: column;
- align-items: center;
- justify-content: center;
- padding: 40rpx;
-
- image {
- width: 200rpx;
- margin-bottom: 20rpx;
- }
-
- text {
- color: #999;
- font-size: 28rpx;
- }
- }
</style>
\ No newline at end of file
--
Gitblit v1.8.0