Merge remote-tracking branch 'origin/dev' into dev

xiangpei

2025-07-09 a1c289e7dfc5d9a3b8dc7ca9b05857f276c05f8d

 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,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,17 +69,6 @@
   } from "@/api/members";
   
   export default {
      components: {
         UIcon,
         UButton,
         UForm,
         UFormItem,
         UInput,
         USearch,
         UPopup,
         ULoading,
         ULoadmore,
      },
      data() {
         return {
            total:0,