diff --git a/abc.html b/abc.html
new file mode 100644
index 000000000..aa2ac4c8b
--- /dev/null
+++ b/abc.html
@@ -0,0 +1,27 @@
+
+
+
+
+
+
+
diff --git a/src/api/system/user/index.ts b/src/api/system/user/index.ts
index beb6e5154..c9b572992 100644
--- a/src/api/system/user/index.ts
+++ b/src/api/system/user/index.ts
@@ -1,13 +1,14 @@
import request from '@/config/axios'
export interface UserVO {
- id: number
+ id?: number
username: string
nickname: string
deptId: number
postIds: string[]
email: string
mobile: string
+ password: string
sex: number
avatar: string
loginIp: string
diff --git a/src/router/modules/flowrouter.ts b/src/router/modules/flowrouter.ts
index fe2b1b67e..468312e24 100644
--- a/src/router/modules/flowrouter.ts
+++ b/src/router/modules/flowrouter.ts
@@ -19,6 +19,11 @@ export default [
path: 'contact',
name: 'contact',
component: () => import('@/views/flow/Contact.vue')
+ },
+ {
+ path: 'features',
+ name: 'features',
+ component: () => import('@/views/flow/Features.vue')
}
]
},
@@ -59,5 +64,10 @@ export default [
path: '/register',
name: 'Register',
component: () => import('@/views/flow/Register.vue')
+ },
+ {
+ path: '/login2',
+ name: 'Login2',
+ component: () => import('@/views/flow/Login.vue')
}
]
diff --git a/src/views/flow/Home.vue b/src/views/flow/Home.vue
index fcb9bc5fc..f125a031e 100644
--- a/src/views/flow/Home.vue
+++ b/src/views/flow/Home.vue
@@ -6,13 +6,13 @@
- 首页
- 功能
- 价格
- 联系我们
+ 首页
+ 功能
+ 价格
+ 联系我们
- 登录
+ 登录
注册
设计
diff --git a/src/views/flow/Register.vue b/src/views/flow/Register.vue
index 9d27f79c5..fca66a31b 100644
--- a/src/views/flow/Register.vue
+++ b/src/views/flow/Register.vue
@@ -104,8 +104,7 @@ import { ElMessage } from 'element-plus'
import 'element-plus/es/components/message/style/css'
import type { FormInstance, FormRules } from 'element-plus'
import { User, Message, Lock } from '@element-plus/icons-vue'
-import { register } from '@/api/flow'
-
+import * as UserApi from '@/api/system/user'
const router = useRouter()
const formRef = ref()
const loading = ref(false)
@@ -171,11 +170,24 @@ const submitForm = (formEl: FormInstance | undefined): Promise => {
}
loading.value = true
- register({
+ const data ={
username: form.username,
email: form.email,
- password: form.password
- })
+ sex: 1,
+ nickname: form.username,
+ deptId: 115,
+ postIds: [],
+ password: form.password,
+ status: 1,
+ remark: '',
+ loginDate: new Date(),
+ createTime: new Date(),
+ id: undefined,
+ mobile: '',
+ avatar: '',
+ loginIp: '',
+ } as UserApi.UserVO
+ UserApi.createUser(data)
.then(() => {
ElMessage({
message: '注册成功！正在跳转到登录页面...',
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 5e47846b0..4db260ecc 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -60,6 +60,7 @@
v-if="refreshTable"
>
+
{{ userList.find((user) => user.id === scope.row.leaderUserId)?.nickname }}