提交代码

master
胡锐 7 months ago
parent 6282e44829
commit b703a36969
  1. 2
      src/app/pages/goods/goods-type/goods-type.component.ts
  2. 7
      src/app/pages/merchant/mer-list/mer-list.component.ts

@ -4,8 +4,6 @@ import {NzButtonComponent} from "ng-zorro-antd/button";
import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
import {NzInputDirective} from "ng-zorro-antd/input"; import {NzInputDirective} from "ng-zorro-antd/input";
import {RoleService} from "../../../servies/role/role.service";
import {MenuService} from "../../../servies/menu/menu.service";
import {NzMessageService} from "ng-zorro-antd/message"; import {NzMessageService} from "ng-zorro-antd/message";
import {NzModalService} from "ng-zorro-antd/modal"; import {NzModalService} from "ng-zorro-antd/modal";
import {NgForOf} from "@angular/common"; import {NgForOf} from "@angular/common";

@ -18,17 +18,16 @@ import {NzIconDirective} from "ng-zorro-antd/icon";
import {NzInputDirective} from "ng-zorro-antd/input"; import {NzInputDirective} from "ng-zorro-antd/input";
import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu"; import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu";
import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
import {SysAccountService} from "../../../servies/account/sys-account.service";
import {RoleService} from "../../../servies/role/role.service";
import {NzMessageService} from "ng-zorro-antd/message"; import {NzMessageService} from "ng-zorro-antd/message";
import {NzModalModule, NzModalService} from "ng-zorro-antd/modal"; import {NzModalModule, NzModalService} from "ng-zorro-antd/modal";
import {MerService} from "../../../servies/merchant/mer.service";
import {NzFlexDirective} from "ng-zorro-antd/flex"; import {NzFlexDirective} from "ng-zorro-antd/flex";
import {NzDescriptionsModule} from "ng-zorro-antd/descriptions"; import {NzDescriptionsModule} from "ng-zorro-antd/descriptions";
import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload"; import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload";
import {environment} from "../../../../environments/environment"; import {environment} from "../../../../environments/environment";
import {Observable, Observer} from "rxjs"; import {Observable, Observer} from "rxjs";
import {NzAvatarComponent, NzAvatarModule} from "ng-zorro-antd/avatar"; import {NzAvatarModule} from "ng-zorro-antd/avatar";
import {MerService} from "../../../services/merchant/mer.service";
import {RoleService} from "../../../services/role/role.service";
@Component({ @Component({
selector: 'app-mer-list', selector: 'app-mer-list',

Loading…
Cancel
Save