From b6e729f2f96165c36237cd5b7407239540bc8d9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B4=AB=E6=98=9F?= <1315228475@qq.com>
Date: Thu, 5 Dec 2024 23:34:42 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=9A=84=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .vscode/settings.json                      |  2 +-
 src/pages.json                             |  8 +++++
 src/pages/user/components/filterDrawer.vue | 38 ++++++++++++++++++++++
 src/pages/user/edit.vue                    | 20 ++++++++++++
 src/pages/user/index.vue                   | 32 ++++++++++--------
 src/types/uni-pages.d.ts                   |  1 +
 6 files changed, 86 insertions(+), 15 deletions(-)
 create mode 100644 src/pages/user/components/filterDrawer.vue
 create mode 100644 src/pages/user/edit.vue

diff --git a/.vscode/settings.json b/.vscode/settings.json
index ecadbef..ba2dad4 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -22,7 +22,7 @@
     "editor.defaultFormatter": "foxundermoon.shell-format"
   },
   "[vue]": {
-    "editor.defaultFormatter": "octref.vetur"
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
diff --git a/src/pages.json b/src/pages.json
index 2479eed..de19bf0 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -167,6 +167,14 @@
       "path": "pages/role/show",
       "type": "page"
     },
+    {
+      "path": "pages/user/edit",
+      "type": "page",
+      "layout": "default",
+      "style": {
+        "navigationBarTitleText": "新增用户"
+      }
+    },
     {
       "path": "pages/user/index",
       "type": "page",
diff --git a/src/pages/user/components/filterDrawer.vue b/src/pages/user/components/filterDrawer.vue
new file mode 100644
index 0000000..5d9c27b
--- /dev/null
+++ b/src/pages/user/components/filterDrawer.vue
@@ -0,0 +1,38 @@
+<template>
+  <view>
+    <view
+      class="px-5 bg-white flex items-center justify-center"
+      @click="showPop = true"
+    >
+      <wd-icon name="filter" size="22px" custom-style="filter-custom-style" />
+    </view>
+
+    <wd-popup
+      v-model="showPop"
+      position="right"
+      custom-style="border-radius:32rpx; width: 80%;"
+      @close="closeDrawer"
+    >
+      <wd-checkbox-group v-model="value2" cell shape="button">
+        <wd-checkbox modelValue="1" disabled>选项一</wd-checkbox>
+        <wd-checkbox modelValue="2">选项二</wd-checkbox>
+        <wd-checkbox modelValue="3">选项三</wd-checkbox>
+        <wd-checkbox modelValue="4">选项四</wd-checkbox>
+        <wd-checkbox modelValue="5">选项五</wd-checkbox>
+        <wd-checkbox modelValue="6">选项六</wd-checkbox>
+        <wd-checkbox modelValue="7">选项七</wd-checkbox>
+      </wd-checkbox-group>
+    </wd-popup>
+  </view>
+</template>
+
+<script lang="ts" setup>
+  defineOptions({ name: 'filterDrawer' })
+
+  const showPop = ref<boolean>(false)
+  const value2 = ref([])
+
+  function closeDrawer() {
+    showPop.value = false
+  }
+</script>
diff --git a/src/pages/user/edit.vue b/src/pages/user/edit.vue
new file mode 100644
index 0000000..345c0a2
--- /dev/null
+++ b/src/pages/user/edit.vue
@@ -0,0 +1,20 @@
+<route lang="json5" type="page">
+{
+  layout: 'default',
+  style: {
+    navigationBarTitleText: '新增用户'
+  }
+}
+</route>
+
+<template>
+  <view class="">新增用户 </view>
+</template>
+
+<script lang="ts" setup>
+  //
+</script>
+
+<style lang="scss" scoped>
+  //
+</style>
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index ea6ef69..cf689f3 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -19,16 +19,8 @@
         @search="getUserList"
       >
         <template #suffix>
-          <view
-            class="px-5 bg-white flex items-center justify-center"
-            @click="showFilter"
-          >
-            <wd-icon
-              name="filter"
-              size="22px"
-              custom-style="filter-custom-style"
-            />
-          </view>
+          <!-- 筛选的弹窗 -->
+          <filterDrawer />
         </template>
       </wd-search>
     </wd-sticky>
@@ -63,13 +55,23 @@
         </view>
       </view>
     </wd-card>
+    <!-- 加载更多 -->
     <wd-loadmore :state="loadMoreState" @reload="getUserList" />
+    <!-- 用户新增按钮 -->
+    <wd-fab
+      :expandable="false"
+      type="primary"
+      draggable
+      position="right-bottom"
+      @click="toUserForm"
+    />
   </view>
 </template>
 
 <script lang="ts" setup>
   import { getList, UserVO } from '@/service/user/UserApi'
   import { LoadMoreState } from '@/types/enums'
+  import filterDrawer from './components/filterDrawer.vue'
 
   const keyword = ref()
   const loadMoreState = ref(LoadMoreState.loading)
@@ -93,10 +95,6 @@
     }
   }
 
-  // TODO @xiaohong：坐等实现！
-  /** 筛选 */
-  function showFilter() {}
-
   /** 跳转到用户详情 */
   function toUserDetail(user: UserVO) {
     uni.navigateTo({
@@ -104,6 +102,12 @@
     })
   }
 
+  function toUserForm() {
+    uni.navigateTo({
+      url: '/pages/user/edit'
+    })
+  }
+
   onReachBottom(() => {
     if (userList.value.length >= totalCount.value) {
       loadMoreState.value = LoadMoreState.finished
diff --git a/src/types/uni-pages.d.ts b/src/types/uni-pages.d.ts
index e8bce39..3ba2f33 100644
--- a/src/types/uni-pages.d.ts
+++ b/src/types/uni-pages.d.ts
@@ -19,6 +19,7 @@ interface NavigateToOptions {
        "/pages/role/edit" |
        "/pages/role/index" |
        "/pages/role/show" |
+       "/pages/user/edit" |
        "/pages/user/index" |
        "/pages/user/show" |
        "/pages/colab/detail/index" |
-- 
Gitee