From 09e95982e57f1a26be4249d11091a935544df684 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Tue, 16 Jan 2018 16:57:25 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/systems/account/account.component.ts | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 053d41d..4524daa 100644
--- a/src/app/routes/systems/account/account.component.ts
+++ b/src/app/routes/systems/account/account.component.ts
@@ -3,7 +3,7 @@
import {ModalHelper} from '@delon/theme';
import {HttpClient} from '@angular/common/http';
import {environment} from '../../../../environments/environment';
-import {DateService} from '../../../core/services/date.service';
+import { DateService } from '../../../business/services/util/date.service';
import {AccountEditComponent} from './account-edit/account-edit.component';
@Component({
selector: 'app-account',
@@ -13,7 +13,7 @@
export class AccountComponent implements OnInit {
- isDeleteOptions = [
+ private isDeleteOptions = [
{value: '1', label: '���'},
{value: '0', label: '���'}
];
@@ -47,9 +47,12 @@
this.query.pageIndex = 1;
}
this.http.get(environment.SERVER_BASH_URL + '/account/list', {params: this.query}).subscribe((res: any) => {
- this.data = res.data.data;
- this.total = res.data.total;
-
+ if (res.code == 0) {
+ this.msgSrv.error(res.message);
+ } else {
+ this.data = res.data.data;
+ this.total = res.data.total;
+ }
this.refreshStatus();
this.loading = false;
});
@@ -98,7 +101,7 @@
}
});
}
-
+
checkAll(value: boolean) {
this.data.forEach(i => {
if (i.isDelete == '1') {
--
Gitblit v1.8.0