Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into...

fengxiang

2018-01-16 09e95982e57f1a26be4249d11091a935544df684

Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop

 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',
@@ -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;
    });