注册时间
@@ -65,7 +76,7 @@
| 性别 |
金币数量 |
注册时间 |
- 状态 |
+ 状态 |
操作 |
@@ -82,12 +93,15 @@
{{data.regTime | date: 'yyyy-MM-dd HH:mm'}} |
{{data.status ===1 ? '正常' : '禁用'}} |
-
+
+
-
+
|
-
+
+
+
diff --git a/src/app/admin/user/user-list/user-list.component.ts b/src/app/admin/user/user-list/user-list.component.ts
index 8008eb1..914625d 100644
--- a/src/app/admin/user/user-list/user-list.component.ts
+++ b/src/app/admin/user/user-list/user-list.component.ts
@@ -1,68 +1,89 @@
-import { Component, OnInit } from '@angular/core';
+import {Component, OnInit} from '@angular/core';
import {FormBuilder, FormGroup} from '@angular/forms';
import {UserService} from '../../../services/user.service';
import {NzMessageService} from 'ng-zorro-antd';
+import {IconService} from '../../../services/icon.service';
+import {CommonsService} from '../../../services/commons.service';
@Component({
- selector: 'app-user-list',
- templateUrl: './user-list.component.html',
- styleUrls: ['./user-list.component.scss']
+ selector: 'app-user-list',
+ templateUrl: './user-list.component.html',
+ styleUrls: ['./user-list.component.scss']
})
export class UserListComponent implements OnInit {
- searchForm: FormGroup; // 搜索框
- requestData = []; // 列表数据
- total: number; // 页码
- pageNum = 1; // 页码
- pageSize = 10; // 条码
- loading = true;
- regTime;
- constructor(
- private form: FormBuilder,
- private user: UserService,
- private message: NzMessageService
- ) { }
+ searchForm: FormGroup; // 搜索框
+ requestData = []; // 列表数据
+ total: number; // 页码
+ pageNum = 1; // 页码
+ pageSize = 10; // 条码
+ loading = true;
+ regTime;
- ngOnInit(): void {
- this.init();
- }
+ constructor(
+ private form: FormBuilder,
+ private user: UserService,
+ private iconService: IconService,
+ private message: NzMessageService,
+ private common: CommonsService
+ ) {
+ }
+
+ ngOnInit(): void {
+ this.init();
+ }
+
+ public init(): void {
+ this.searchForm = this.form.group({
+ name: [null],
+ status: [null],
+ phone: [null],
+ regTime: [null],
+ });
+ this.getRequest(true, this.searchForm.value);
+ }
- public init(): void {
- this.searchForm = this.form.group({
- name: [null],
- phone: [null],
- regTime: [null],
- });
- this.getRequest(true , this.searchForm.value);
- }
+ // 查询列表
+ public getRequest(reset: boolean = false, whereObject: object) {
- // 查询列表
- public getRequest(reset: boolean = false , whereObject: object) {
+ if (whereObject['regTime'] != null && whereObject['regTime'].length !== 0) {
+ whereObject['regTimeStart'] = whereObject['regTime'][0].getTime();
+ whereObject['regTimeEnd'] = whereObject['regTime'][1].getTime();
+ }
+ this.loading = false;
+ if (reset) {
+ this.pageNum = 1;
+ }
+ whereObject['pageNum'] = this.pageNum;
+ whereObject['pageSize'] = this.pageSize;
+ this.user.getListUser(whereObject, data => {
+ console.log(data);
+ if (data['return_code'] === '000000') {
+ this.requestData = data['return_data'].list;
+ this.total = data['return_data'].total;
+ } else {
+ this.message.error(data['return_msg']);
+ }
+ });
+ }
- if (whereObject['regTime'] != null && whereObject['regTime'].length !== 0) {
- whereObject['regTimeStart'] = whereObject['regTime'][0];
- whereObject['regTimeEnd'] = whereObject['regTime'][1];
+ // 重置
+ public resetForm(): void {
+ this.searchForm.reset();
}
- this.loading = false;
- if (reset) {
- this.pageNum = 1;
+
+ public getForbiddenUser(id, status: any): void {
+ const message = (status === 1 ? '是否禁用当前用户' : '是否启用当前用户');
+
+ this.common.showConfirm(message, data => {
+ if (data) {
+ this.user.forbiddenUser(id, dataUser => {
+ console.log(dataUser);
+ this.getRequest(false , this.searchForm.value);
+ });
+ }
+ });
}
- whereObject['pageNum'] = this.pageNum;
- whereObject['pageSize'] = this.pageSize;
- this.user.getListUser( whereObject, data => {
- console.log(data);
- if (data['return_code'] === '000000') {
- this.requestData = data['return_data'].list;
- this.total = data['return_data'].total;
- } else {
- this.message.error(data['return_msg']);
- }
- });
- }
- // 重置
- public resetForm(): void {
- this.searchForm.reset();
- }
}
diff --git a/src/app/services/icon.service.ts b/src/app/services/icon.service.ts
index 0ee2b85..d5e0a2d 100644
--- a/src/app/services/icon.service.ts
+++ b/src/app/services/icon.service.ts
@@ -12,7 +12,7 @@ export class IconService {
constructor(private iconService: NzIconService) {
this.iconService.fetchFromIconfont({
- scriptUrl: 'https://at.alicdn.com/t/font_2413274_o08racrjdz.js'
+ scriptUrl: 'https://at.alicdn.com/t/font_2413274_zk7ae4qcrvg.js'
});
}
}
diff --git a/src/app/services/user.service.ts b/src/app/services/user.service.ts
index 4901d18..6321d17 100644
--- a/src/app/services/user.service.ts
+++ b/src/app/services/user.service.ts
@@ -48,4 +48,16 @@ export class UserService {
});
}
+ /**
+ * 禁用启用当前用户
+ *
+ * @param userId 用户id
+ * @param callBack 返回参数
+ */
+ public forbiddenUser(userId: number, callBack) {
+ this.http.get(environment.baseUrl + 'highUser/forbiddenUser?userId=' + userId).subscribe(data => {
+ callBack(data);
+ });
+ }
+
}