From 18df46f1bbdf5f3aa29aedb828ae2bc9d33e0f90 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Fri, 02 Feb 2018 11:22:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/systems/account/account.component.ts | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/app/routes/systems/account/account.component.ts b/src/app/routes/systems/account/account.component.ts
index 74a47ba..9eeb426 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 '@business/services/util/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 {
- private isDeleteOptions = [
+ public 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;
});
@@ -138,5 +141,4 @@
return this.dateSrv.date_format(date, 'YYYY-MM-DD');
}
}
-
}
--
Gitblit v1.8.0