From a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 七月 2025 18:03:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 pages/userPermissions/userPermissions.vue |   15 ++-------------
 1 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pages/userPermissions/userPermissions.vue b/pages/userPermissions/userPermissions.vue
index 7ab4d62..5f4d1b6 100644
--- a/pages/userPermissions/userPermissions.vue
+++ b/pages/userPermissions/userPermissions.vue
@@ -5,7 +5,7 @@
 			<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">
@@ -61,7 +61,7 @@
 		restPassword,
 		checkClerkPermission
 	} from "@/api/userPermissions.js"
-  import '@/components/uview-components/uview-ui';
+	import '@/components/uview-components/uview-ui';
 
 	import storage from "@/utils/storage.js"; //缂撳瓨
 	import {
@@ -69,17 +69,6 @@
 	} from "@/api/members";
 	
 	export default {
-		components: {
-			UIcon,
-			UButton,
-			UForm,
-			UFormItem,
-			UInput,
-			USearch,
-			UPopup,
-			ULoading,
-			ULoadmore,
-		},
 		data() {
 			return {
 				total:0,

--
Gitblit v1.8.0