From b5ce833799753acd0944e6901b8101f03263e1fa Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Wed, 20 Dec 2017 14:44:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/routes/users/installer/edit/edit.component.ts | 38 ++++++++++++++++++++++++++++----------
1 files changed, 28 insertions(+), 10 deletions(-)
diff --git a/src/app/routes/users/installer/edit/edit.component.ts b/src/app/routes/users/installer/edit/edit.component.ts
index 09ed0b9..71e0c3b 100644
--- a/src/app/routes/users/installer/edit/edit.component.ts
+++ b/src/app/routes/users/installer/edit/edit.component.ts
@@ -1,8 +1,9 @@
import { NzModalSubject, NzMessageService } from 'ng-zorro-antd';
-import { HttpClient } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
-import { _HttpClient } from '@delon/theme';
import { ModalHelper } from '@delon/theme';
+import { HttpClient } from '@angular/common/http';
+import { environment } from '../../../../../environments/environment';
+import { DateService } from '../../../../core/services/date.service';
@Component({
selector: 'app-edit',
@@ -12,26 +13,43 @@
export class UserInstallerEditComponent implements OnInit {
user: any;
- gender: string[] = [ '���', '���' ];
constructor(
private modalHelper: ModalHelper,
private subject: NzModalSubject,
+ public dateSrv: DateService,
public msgSrv: NzMessageService,
- public http: _HttpClient) { }
+ public http: HttpClient) { }
ngOnInit() {
if (this.user.id > 0) {
- this.http.get('./assets/pois.json').subscribe(res => this.user = res.data[0]);
+ this.http.get(environment.SERVER_BASH_URL + '/user/operate_user/' + this.user.id).subscribe((res: any) => {
+ this.user = res;
+ this.user.createTime = this.dateSrv.date_format(this.user.createTime, 'YYYY-MM-DD');
+ this.user.expireTime = this.dateSrv.date_format(this.user.expireTime, 'YYYY-MM-DD');
+ });
+ } else {
+ this.user.createTime = this.dateSrv.today('YYYY-MM-DD');
+ this.user.expireTime = this.dateSrv.today('YYYY-MM-DD');
}
}
save() {
- this.http.get('./assets/pois.json').subscribe(() => {
- this.msgSrv.success('���������������������������������������������');
- this.subject.next('true');
- this.close();
- });
+ console.log(this.user);
+ if (this.user.name == null || this.user.name === '') {
+ this.msgSrv.error('���������������');
+ } else if (this.user.mobile == null || this.user.mobile === '') {
+ this.msgSrv.error('���������������');
+ } else if (this.user.email == null || this.user.email === '') {
+ this.msgSrv.error('���������������������');
+ } else if (this.user.password == null || this.user.password === '') {
+ this.msgSrv.error('���������������');
+ } else {
+ this.http.post(environment.SERVER_BASH_URL + '/user/operate_user/save', this.user).subscribe(() => {
+ this.subject.next('true');
+ this.close();
+ });
+ }
}
close() {
--
Gitblit v1.8.0