From 29851d845f4ab768c78724ab870ecec4ce28c32b Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 24 十月 2025 11:42:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/user_action' into user_action
---
pages/userPermissions/userPermissions.vue | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/pages/userPermissions/userPermissions.vue b/pages/userPermissions/userPermissions.vue
index ba88818..74d9a78 100644
--- a/pages/userPermissions/userPermissions.vue
+++ b/pages/userPermissions/userPermissions.vue
@@ -2,17 +2,17 @@
<view class="container">
<!-- 鏍囬 -->
<view class="header">
- <text class="title">鐢ㄦ埛鍒楄〃</text>
+ <text class="title">搴楀憳鍒楄〃</text>
</view>
<view>
- <button class="add-btn" @click="navigateToAdd()" :disabled="!isShopkeeper">鏂板鐢ㄦ埛</button>
+ <button class="add-btn" @click="navigateToAdd()">鏂板搴楀憳</button>
</view>
<!-- 鎼滅储妗� -->
<view class="search-box">
<u-search v-model="query.realName" placeholder="鎼滅储濮撳悕" :showAction="false" @change="searchClerk()"></u-search>
</view>
- <!-- 鐢ㄦ埛鍒楄〃 -->
+ <!-- 搴楀憳鍒楄〃 -->
<scroll-view scroll-y class="clerk-list" @scrolltolower="loadMore" v-if="clerkList.length > 0">
<view class="clerk-item" v-for="(clerk, index) in clerkList" :key="clerk.id" >
@@ -61,15 +61,7 @@
restPassword,
checkClerkPermission
} 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 ULoadmore from '@/uview-components/uview-ui/components/u-loadmore/u-loadmore.vue';
+ import '@/components/uview-components/uview-ui';
import storage from "@/utils/storage.js"; //缂撳瓨
import {
@@ -77,21 +69,10 @@
} from "@/api/members";
export default {
- components: {
- UIcon,
- UButton,
- UForm,
- UFormItem,
- UInput,
- USearch,
- UPopup,
- ULoading,
- ULoadmore,
- },
data() {
return {
total:0,
- clerkList: [], // 鐢ㄦ埛鍒楄〃鏁版嵁
+ clerkList: [], // 搴楀憳鍒楄〃鏁版嵁
loading: false, // 鍔犺浇鐘舵��
noMore: false, // 鏄惁娌℃湁鏇村鏁版嵁
query: {
@@ -109,7 +90,7 @@
},
onLoad() {
this.getPage()
- //鑾峰緱鐢ㄦ埛鏉冮檺
+ //鑾峰緱搴楀憳鏉冮檺
checkClerkPermission().then(res=>{
this.isSuper = res.data.data.isSuper;
this.isShopkeeper = res.data.data.isShopkeeper;
@@ -171,7 +152,7 @@
},
- // 鎼滅储鐢ㄦ埛
+ // 鎼滅储搴楀憳
searchClerk() {
this.query.pageNumber = 1
this.noMore = false
@@ -186,13 +167,13 @@
this.getPage()
}
},
- // 璺宠浆鍒版柊澧炵敤鎴�
+ // 璺宠浆鍒版柊澧炲簵鍛�
navigateToAdd() {
uni.navigateTo({
url: `/pages/userPermissions/addStoreMember`
})
},
- // 璺宠浆鍒扮敤鎴疯鎯�
+ // 璺宠浆鍒板簵鍛樿鎯�
navigateToDetail(id) {
uni.navigateTo({
url: `/pages/userPermissions/addStoreMember?id=${id}`
--
Gitblit v1.8.0