diff --git a/index/src/app/api/api.service.ts b/index/src/app/api/api.service.ts
index 485fa0c..d37f8a8 100644
--- a/index/src/app/api/api.service.ts
+++ b/index/src/app/api/api.service.ts
@@ -429,7 +429,7 @@ export class ApiService extends HttpService {
 
     deleteUser(id: number) {
         return super.Service<boolean>({
-            path: `/admin/user/del/${id}`,
+            path: `/admin/user/delete/${id}`,
             method: 'DELETE',
         });
     }
diff --git a/index/src/app/view/admin/admin-user/admin-user.component.html b/index/src/app/view/admin/admin-user/admin-user.component.html
index d7514d9..10fb3a6 100644
--- a/index/src/app/view/admin/admin-user/admin-user.component.html
+++ b/index/src/app/view/admin/admin-user/admin-user.component.html
@@ -1 +1,117 @@
-<p>admin-user works!</p>
+<div class="inner-content">
+    <nz-card nzTitle="文章管理" nzSize="small">
+        <nz-table #table [nzData]="pageList.list" [nzTotal]="pageList.total" [(nzPageIndex)]="pageIndex"
+                  [nzPageSize]="pageSize" [nzLoading]="loading"
+                  (nzPageIndexChange)="getUser()" nzFrontPagination="false">
+            <thead>
+            <th>邮箱</th>
+            <th>昵称</th>
+            <th>角色</th>
+            <th>邮箱验证状态</th>
+            <th>操作</th>
+            </thead>
+            <tbody>
+            <tr *ngFor="let data of pageList.list">
+                <td>{{data.email}}</td>
+                <td>{{data.displayName}}</td>
+                <td>
+                    <nz-tag [nzColor]="'blue'" *ngIf="data.role == 'admin'">{{data.role}}</nz-tag>
+                    <nz-tag [nzColor]="'purple'" *ngIf="data.role == 'user'">{{data.role}}</nz-tag>
+                </td>
+                <td>
+                    <nz-tag [nzColor]="'green'" *ngIf="data.emailStatus">已验证</nz-tag>
+                    <nz-tag [nzColor]="'red'" *ngIf="!data.emailStatus">未验证</nz-tag>
+                </td>
+                <td>
+                    <a (click)="showModal(true, data)" class="edit-opr">编辑</a>
+                    <nz-divider nzType="vertical"></nz-divider>
+                    <a (click)="showModal(false, data)" class="show-opr">查看</a>
+                    <nz-divider nzType="vertical"></nz-divider>
+                    <a nz-popconfirm nzPopconfirmTitle="确定要删除这个用户吗?" nzOkText="删除" nzCancelText="点错了"
+                       (nzOnConfirm)="deleteUser(data.id)" class="del-opr">删除</a>
+                </td>
+            </tr>
+            </tbody>
+        </nz-table>
+    </nz-card>
+</div>
+
+<nz-modal [(nzVisible)]="modalData.visible" [nzClosable]="true" [nzTitle]="modalData.title"
+          (nzOnCancel)="modalData.visible = false" (nzOnOk)="modalConfirm()"
+          [nzFooter]="modalData.isEdit?editContentFooter:showContentFooter"
+          [nzContent]="showContent">
+    <ng-template #showContent>
+        <form nz-form [formGroup]="formGroup" (ngSubmit)="modalConfirm()">
+            <nz-form-item>
+                <nz-form-label nzSpan="4" nzRequired>邮箱</nz-form-label>
+                <nz-form-control nzSpan="18">
+                    <input type="email" nz-input formControlName="email"
+                           [disabled]="!modalData.isEdit">
+                </nz-form-control>
+            </nz-form-item>
+
+            <nz-form-item>
+                <nz-form-label nzSpan="4" nzRequired>昵称</nz-form-label>
+                <nz-form-control nzSpan="18">
+                    <input type="text" nz-input formControlName="displayName" [disabled]="!modalData.isEdit">
+                </nz-form-control>
+            </nz-form-item>
+
+
+            <nz-form-item>
+                <nz-form-label nzSpan="4" nzRequired>角色</nz-form-label>
+                <nz-form-control nzSpan="18">
+                    <nz-select formControlName="role" [nzDisabled]="!modalData.isEdit||formGroup.value.id==user.id">
+                        <nz-option nzValue="admin" nzLabel="admin"></nz-option>
+                        <nz-option nzValue="user" nzLabel="user"></nz-option>
+                    </nz-select>
+                </nz-form-control>
+            </nz-form-item>
+
+            <nz-form-item>
+                <nz-form-label nzSpan="4" nzRequired>状态</nz-form-label>
+                <nz-form-control nzSpan="18">
+                    <nz-radio-group formControlName="emailStatus" [nzDisabled]="!modalData.isEdit">
+                        <label nz-radio [nzValue]="true">邮箱已验证</label>
+                        <label nz-radio [nzValue]="false">邮箱未验证</label>
+                    </nz-radio-group>
+                </nz-form-control>
+            </nz-form-item>
+
+            <nz-form-item *ngIf="modalData.isEdit">
+                <nz-form-label nzSpan="4">密码</nz-form-label>
+                <nz-form-control nzSpan="18">
+                    <a *ngIf="!modalData.resetPwd" (click)="modalData.resetPwd = true">
+                        重设密码<i nz-icon nzType="edit" nzTheme="twotone" style="margin-left: 10px;"></i>
+                    </a>
+                    <nz-input-group *ngIf="modalData.resetPwd" [nzSuffix]="cancelBtn" nzSize="small">
+                        <input type="password" nz-input formControlName="pwd" autocomplete="new-password"
+                               [disabled]="!modalData.isEdit">
+                        <ng-template #cancelBtn>
+                            <button nz-button (click)="modalData.resetPwd = false" nzSize="small" nzType="link">取消
+                            </button>
+                        </ng-template>
+                    </nz-input-group>
+                </nz-form-control>
+            </nz-form-item>
+
+            <nz-form-item>
+                <nz-form-label nzSpan="4">描述</nz-form-label>
+                <nz-form-control nzSpan="18">
+                    <textarea nz-input [nzAutosize]="{ minRows: 2, maxRows: 4 }" formControlName="desc"
+                              [disabled]="!modalData.isEdit"></textarea>
+                </nz-form-control>
+            </nz-form-item>
+        </form>
+    </ng-template>
+
+    <ng-template #showContentFooter>
+        <button nz-button (click)="modalData.visible = false">关闭</button>
+    </ng-template>
+
+    <ng-template #editContentFooter>
+        <button nz-button (click)="modalData.visible = false">取消</button>
+        <button nz-button (click)="modalConfirm()" nzType="primary">提交</button>
+    </ng-template>
+
+</nz-modal>
diff --git a/index/src/app/view/admin/admin-user/admin-user.component.ts b/index/src/app/view/admin/admin-user/admin-user.component.ts
index 6c03f9d..134ea13 100644
--- a/index/src/app/view/admin/admin-user/admin-user.component.ts
+++ b/index/src/app/view/admin/admin-user/admin-user.component.ts
@@ -1,15 +1,92 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
+import {NzMessageService} from 'ng-zorro-antd';
+import {Title} from '@angular/platform-browser';
+import {FormControl, FormGroup} from '@angular/forms';
+import {PageList} from '../../../class/HttpReqAndResp';
+import {ApiService} from '../../../api/api.service';
+import {User} from '../../../class/User';
+import {GlobalUserService} from '../../../services/global-user.service';
 
 @Component({
-  selector: 'app-admin-user',
-  templateUrl: './admin-user.component.html',
-  styleUrls: ['./admin-user.component.less']
+    selector: 'app-admin-user',
+    templateUrl: './admin-user.component.html',
+    styleUrls: ['./admin-user.component.less']
 })
 export class AdminUserComponent implements OnInit {
 
-  constructor() { }
+    constructor(private apiService: ApiService, private title: Title, private messageService: NzMessageService, private userService: GlobalUserService) {
+        this.formGroup = new FormGroup({
+            id: new FormControl(null),
+            email: new FormControl(''),
+            displayName: new FormControl(''),
+            emailStatus: new FormControl(null),
+            desc: new FormControl(null),
+            role: new FormControl(null),
+            pwd: new FormControl(''),
+        });
+        this.userService.watchUserInfo({
+            next: data => this.user = data.result,
+            error: null,
+            complete: null
+        })
+    }
 
-  ngOnInit(): void {
-  }
+    pageIndex: number = 1;
+    pageSize: number = 10;
 
+    pageList: PageList<User> = new PageList<User>();
+    user: User;
+    loading: boolean = true;
+    modalData = {
+        visible: false,
+        title: null,
+        isEdit: false,
+        resetPwd: false
+    }
+    formGroup: FormGroup;
+
+    ngOnInit(): void {
+        this.title.setTitle('小海博客 | 用户管理')
+        this.getUser();
+    }
+
+    getUser = () => this.apiService.adminUsers(this.pageSize, this.pageIndex).subscribe({
+        next: data => this.pageList = data.result,
+        complete: () => this.loading = false,
+        error: err => this.loading = false
+    })
+
+    deleteUser(id) {
+        this.loading = true;
+        this.apiService.deleteUser(id).subscribe({
+            next: data => {
+                this.messageService.success('删除成功')
+                this.loading = false;
+                this.getUser();
+            },
+            error: err => {
+                this.messageService.error(err.msg)
+                this.loading = false
+            }
+        })
+    }
+
+    showModal(isEdit: boolean, data: User) {
+        this.modalData.visible = true;
+        this.modalData.isEdit = isEdit;
+        this.modalData.title = isEdit ? '编辑用户' : '查看用户'
+        this.formGroup.reset();
+        this.formGroup.patchValue(data);
+    }
+
+    modalConfirm() {
+        this.modalData.visible = false
+        this.apiService.adminUpdateUser(this.formGroup.value).subscribe({
+            next: data => {
+                this.getUser();
+                this.messageService.success('修改用户信息成功');
+                this.userService.refreshUserInfo();
+            }
+        })
+    }
 }
diff --git a/index/src/app/view/admin/admin-user/admin-user.module.ts b/index/src/app/view/admin/admin-user/admin-user.module.ts
index febeefe..e3d9344 100644
--- a/index/src/app/view/admin/admin-user/admin-user.module.ts
+++ b/index/src/app/view/admin/admin-user/admin-user.module.ts
@@ -2,6 +2,16 @@ import {NgModule} from '@angular/core';
 import {CommonModule} from '@angular/common';
 import {RouterModule} from '@angular/router';
 import {AdminUserComponent} from './admin-user.component';
+import {
+    NzButtonModule,
+    NzCardModule,
+    NzDividerModule, NzFormModule, NzIconModule, NzInputModule,
+    NzModalModule,
+    NzPopconfirmModule, NzRadioModule, NzSelectModule,
+    NzTableModule,
+    NzTagModule
+} from 'ng-zorro-antd';
+import {ReactiveFormsModule} from '@angular/forms';
 
 
 @NgModule({
@@ -10,7 +20,20 @@ import {AdminUserComponent} from './admin-user.component';
     ],
     imports: [
         CommonModule,
-        RouterModule.forChild([{path: '', component: AdminUserComponent}])
+        RouterModule.forChild([{path: '', component: AdminUserComponent}]),
+        NzCardModule,
+        NzTableModule,
+        NzPopconfirmModule,
+        NzDividerModule,
+        NzTagModule,
+        NzModalModule,
+        NzButtonModule,
+        NzFormModule,
+        ReactiveFormsModule,
+        NzInputModule,
+        NzSelectModule,
+        NzRadioModule,
+        NzIconModule
 
     ]
 })