diff --git a/.vscode/settings.json b/.vscode/settings.json
index ecadbef1c35693704dee396722b716fc6ab7380f..ba2dad46fbead7e9cc53073139e91e79d358ba01 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 2479eed0fdc0e3cdf2fcd4ebd552390c8b848b64..de19bf0f2dcdb8a8eda91e73dae9355508f8a1cf 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 0000000000000000000000000000000000000000..5d9c27b9c170556c0b8decd17a68d6135b0bec70
--- /dev/null
+++ b/src/pages/user/components/filterDrawer.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
+ 选项一
+ 选项二
+ 选项三
+ 选项四
+ 选项五
+ 选项六
+ 选项七
+
+
+
+
+
+
diff --git a/src/pages/user/edit.vue b/src/pages/user/edit.vue
new file mode 100644
index 0000000000000000000000000000000000000000..345c0a251e732722a85093d2018a23c3deed5acb
--- /dev/null
+++ b/src/pages/user/edit.vue
@@ -0,0 +1,20 @@
+
+{
+ layout: 'default',
+ style: {
+ navigationBarTitleText: '新增用户'
+ }
+}
+
+
+
+ 新增用户
+
+
+
+
+
diff --git a/src/pages/user/index.vue b/src/pages/user/index.vue
index ea6ef6977af320d46e36d99229fed0a8b4173eb7..cf689f31e8c02567e699eec4279deb7e9471d8d2 100644
--- a/src/pages/user/index.vue
+++ b/src/pages/user/index.vue
@@ -19,16 +19,8 @@
@search="getUserList"
>
-
-
-
+
+
@@ -63,13 +55,23 @@
+
+
+