提交代码

src/app/pages/account/sys-account/sys-account.component.ts

@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms";
 import {NzMessageService} from "ng-zorro-antd/message";
 import {NzModalComponent, NzModalModule, NzModalService} from "ng-zorro-antd/modal";
-import {SysAccountService} from "../../../servies/account/sys-account.service";
 import {DatePipe, NgForOf, NgIf} from "@angular/common";
 import {NzButtonComponent} from "ng-zorro-antd/button";
 import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
@@ -21,9 +20,10 @@ import {NzTreeComponent} from "ng-zorro-antd/tree";
 import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
 import {NzDropDownModule} from "ng-zorro-antd/dropdown";
 import {NzIconDirective} from "ng-zorro-antd/icon";
-import {RoleService} from "../../../servies/role/role.service";
 import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe";
 import {Dictionary} from "../../../data/common/dictionary.namespace";
+import {SysAccountService} from "../../../services/account/sys-account.service";
+import {RoleService} from "../../../services/role/role.service";
 
 @Component({
   selector: 'app-sys-account',

src/app/pages/account/sys-role/sys-role.component.ts

@@ -19,13 +19,13 @@ import {NzIconDirective} from "ng-zorro-antd/icon";
 import {NzInputDirective} from "ng-zorro-antd/input";
 import {NzFlexDirective} from "ng-zorro-antd/flex";
 import {DatePipe, NgForOf, NgIf} from "@angular/common";
-import {RoleService} from "../../../servies/role/role.service";
 import {NzModalComponent, NzModalModule, NzModalService} from "ng-zorro-antd/modal";
 import {NzMessageService} from "ng-zorro-antd/message";
 import {NzInputNumberComponent} from "ng-zorro-antd/input-number";
 import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
-import {MenuService} from "../../../servies/menu/menu.service";
 import {NzTreeComponent, NzTreeNodeOptions} from "ng-zorro-antd/tree";
+import {RoleService} from "../../../services/role/role.service";
+import {MenuService} from "../../../services/menu/menu.service";
 
 @Component({
   selector: 'app-sys-role',

src/app/pages/account/user/user.component.ts

@@ -2,7 +2,6 @@ import { Component } from '@angular/core';
 import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule} from "@angular/forms";
 import {NzMessageService} from "ng-zorro-antd/message";
 import {NzModalModule, NzModalService} from "ng-zorro-antd/modal";
-import {UserService} from "../../../servies/account/user.service";
 import {DatePipe, NgForOf, NgIf} from "@angular/common";
 import {NzButtonComponent} from "ng-zorro-antd/button";
 import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
@@ -21,6 +20,7 @@ import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
 import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
 import {NzIconDirective} from "ng-zorro-antd/icon";
 import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu";
+import {UserService} from "../../../services/account/user.service";
 
 @Component({
   selector: 'app-user',

src/app/pages/body/index/index.component.ts

@@ -17,10 +17,10 @@ import {TabComponent} from "../tab/tab.component";
 import {BrowserStorageService} from "../../../utils/localStorage.service";
 import {DATA, INIT_FLAG, LOGIN_DATA, USER_TOKEN} from "../../../data/login/localStorage.namespace";
 import {NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
-import {LoginService} from "../../../servies/login/login.service";
 import {NzMessageService} from "ng-zorro-antd/message";
-import {CommonService} from "../../../servies/common/common.service";
 import {dictionaryData} from "../../../data/common/dictionary.namespace";
+import {CommonService} from "../../../services/common/common.service";
+import {LoginService} from "../../../services/login/login.service";
 
 @Component({
   selector: 'app-index',

src/app/pages/goods/goods-type/goods-type.component.html

@@ -1,20 +1,19 @@
-<form nz-form [formGroup]="searchForm">
+
+<form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'">
   <div nz-row [nzGutter]="24">
-    <div nz-col [nzSpan]="8" *ngFor="let item of goodsTypeSearch">
+    <div nz-col [nzSpan]="6"  *ngFor="let item of goodsTypeSearch">
       <nz-form-item>
         <nz-form-label>{{item.title}}</nz-form-label>
         <nz-form-control>
-          <input nz-input formControlName="{{item.formControlName}}" />
+          <input nz-input formControlName="{{item.formControlName}}" placeholder="请输入" />
         </nz-form-control>
       </nz-form-item>
     </div>
 
-    <div nz-col [nzSpan]="8">
+    <div nz-col [nzSpan]="6" class="search-area">
-      <div class="search-area">
+      <button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">查询</button>
-        <button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">搜索</button>
+      <button nz-button (click)="searchForm.reset()">重置</button>
-        <button nz-button (click)="searchFormReset()">重置</button>
+      <button nz-button [nzType]="'primary'" (click)="searchFormSubmit()">创建</button>
-<!--        <button nz-button [nzType]="'primary'" (click)="showEdit(true, null)">创建</button>-->
-      </div>
     </div>
   </div>
 </form>

src/app/pages/goods/goods-type/goods-type.component.less

@@ -1,6 +1,12 @@
-.search-area {
+[nz-form-label] {
-  text-align: center;
+  overflow: visible;
 }
 button {
   margin-left: 8px;
 }
+.submit-btn {
+  width: 150px;
+}
+.search-area {
+  margin-top: 30px;
+}

src/app/pages/goods/goods-type/goods-type.component.ts

@@ -10,6 +10,7 @@ import {NzMessageService} from "ng-zorro-antd/message";
 import {NzModalService} from "ng-zorro-antd/modal";
 import {NgForOf} from "@angular/common";
 import {goodsTypeSearch} from "../../../data/goods/goods.namespace";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
 
 @Component({
   selector: 'app-goods-type',
@@ -25,7 +26,9 @@ import {goodsTypeSearch} from "../../../data/goods/goods.namespace";
         NzInputDirective,
         NzRowDirective,
         ReactiveFormsModule,
-    NgForOf
+        NgForOf,
+        NzOptionComponent,
+        NzSelectComponent
     ],
   templateUrl: './goods-type.component.html',
   styleUrl: './goods-type.component.less'
@@ -48,10 +51,5 @@ export class GoodsTypeComponent {
   searchFormSubmit(): void {
   }
 
-  // 搜索表单重置
-  searchFormReset(): void {
-    this.searchForm.reset();
-  }
-
   protected readonly goodsTypeSearch = goodsTypeSearch;
 }

src/app/pages/login/login/login.component.ts

@@ -1,12 +1,10 @@
 import {Component} from '@angular/core';
 import {NzCarouselComponent, NzCarouselContentDirective} from "ng-zorro-antd/carousel";
 import {NgForOf, NgOptimizedImage} from "@angular/common";
-import {fork} from "child_process";
+import {NzFormControlComponent, NzFormDirective, NzFormItemComponent} from "ng-zorro-antd/form";
-import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
 import {
   FormControl,
   FormGroup,
-  FormsModule,
   NonNullableFormBuilder,
   ReactiveFormsModule,
   Validators
@@ -19,10 +17,10 @@ import {backgroundImage} from "../../../data/login/login.namespace";
 import {NzSliderComponent} from "ng-zorro-antd/slider";
 import {MathUtils} from "../../../utils/mathUtils.service";
 import {NzMessageService} from "ng-zorro-antd/message";
-import {LoginService} from "../../../servies/login/login.service";
 import {DATA, INIT_FLAG, LOGIN_DATA, USER_TOKEN} from "../../../data/login/localStorage.namespace";
 import {Router} from "@angular/router";
 import {BrowserStorageService} from "../../../utils/localStorage.service";
+import {LoginService} from "../../../services/login/login.service";
 
 
 

src/app/pages/merchant/mer-add/mer-add.component.ts

@@ -1,5 +1,4 @@
 import { Component } from '@angular/core';
-import {MerService} from "../../../servies/merchant/mer.service";
 import {NzModalModule, NzModalService} from "ng-zorro-antd/modal";
 import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms";
 import {NgForOf, NgIf} from "@angular/common";
@@ -19,8 +18,9 @@ import {NzUploadFile, NzUploadModule} from "ng-zorro-antd/upload";
 import {NzIconDirective} from "ng-zorro-antd/icon";
 import {Observable, Observer} from "rxjs";
 import {NzMessageService} from "ng-zorro-antd/message";
-import {RoleService} from "../../../servies/role/role.service";
 import {environment} from "../../../../environments/environment";
+import {MerService} from "../../../services/merchant/mer.service";
+import {RoleService} from "../../../services/role/role.service";
 
 @Component({
   selector: 'app-mer-add',

src/app/pages/system/menu/menu.component.ts

@@ -1,9 +1,8 @@
-import {ChangeDetectorRef, Component, ViewChild} from '@angular/core';
+import {Component} from '@angular/core';
-import {NzFormatEmitEvent, NzTreeComponent, NzTreeNode, NzTreeService} from "ng-zorro-antd/tree";
+import {NzTreeComponent} from "ng-zorro-antd/tree";
 import {NgForOf, NgIf} from "@angular/common";
 import {NzIconDirective} from "ng-zorro-antd/icon";
 import {NzDropdownMenuComponent} from "ng-zorro-antd/dropdown";
-import {MenuService} from "../../../servies/menu/menu.service";
 import {
   NzTreeNodeCheckboxComponent,
   NzTreeNodeComponent,
@@ -26,6 +25,7 @@ import {NzSpinComponent} from "ng-zorro-antd/spin";
 import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
 import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe";
 import {Dictionary} from "../../../data/common/dictionary.namespace";
+import {MenuService} from "../../../services/menu/menu.service";
 
 @Component({
   selector: 'app-menu',

src/app/services/goods/goods.service.ts

@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class GoodsService {
+
+  constructor() { }
+}