合并为一个项目 #14

Merged
xiaohai2271 merged 56 commits from issue11 into master 2020-05-16 22:35:08 +08:00
2 changed files with 3 additions and 2 deletions
Showing only changes of commit dd6f85dc62 - Show all commits

View File

@@ -37,7 +37,7 @@ export class AdminComponent implements OnInit {
this.editInfoFormGroup = new FormGroup({ this.editInfoFormGroup = new FormGroup({
desc: new FormControl(), desc: new FormControl(),
displayName: new FormControl(), displayName: new FormControl(),
email: new FormControl() email: new FormControl({value: null, disabled: true})
}); });
this.initHelloWords() this.initHelloWords()
} }
@@ -74,6 +74,7 @@ export class AdminComponent implements OnInit {
}, },
error: err => { error: err => {
this.messageService.error(err.msg); this.messageService.error(err.msg);
this.gUserService.refreshUserInfo();
}, },
complete: null complete: null
}); });

View File

@@ -5,7 +5,7 @@ import {AdminComponent} from './admin.component';
import {NgZorroAntdModule} from 'ng-zorro-antd'; import {NgZorroAntdModule} from 'ng-zorro-antd';
import {NzSpaceModule} from 'ng-zorro-antd/space'; import {NzSpaceModule} from 'ng-zorro-antd/space';
import {AdminHeaderComponent} from '../../components/admin-header/admin-header.component'; import {AdminHeaderComponent} from '../../components/admin-header/admin-header.component';
import {ReactiveFormsModule} from "@angular/forms"; import {ReactiveFormsModule} from '@angular/forms';
@NgModule({ @NgModule({