+
{{item.title}}
-
+
-
-
-
-
-
-
+
+
+
+
diff --git a/src/app/pages/goods/goods-type/goods-type.component.less b/src/app/pages/goods/goods-type/goods-type.component.less
index 5cbaf43..6d5c351 100644
--- a/src/app/pages/goods/goods-type/goods-type.component.less
+++ b/src/app/pages/goods/goods-type/goods-type.component.less
@@ -1,6 +1,12 @@
-.search-area {
- text-align: center;
+[nz-form-label] {
+ overflow: visible;
}
button {
margin-left: 8px;
}
+.submit-btn {
+ width: 150px;
+}
+.search-area {
+ margin-top: 30px;
+}
diff --git a/src/app/pages/goods/goods-type/goods-type.component.ts b/src/app/pages/goods/goods-type/goods-type.component.ts
index fd060f0..95c16f6 100644
--- a/src/app/pages/goods/goods-type/goods-type.component.ts
+++ b/src/app/pages/goods/goods-type/goods-type.component.ts
@@ -10,23 +10,26 @@ 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',
standalone: true,
- imports: [
- FormsModule,
- NzButtonComponent,
- NzColDirective,
- NzFormControlComponent,
- NzFormDirective,
- NzFormItemComponent,
- NzFormLabelComponent,
- NzInputDirective,
- NzRowDirective,
- ReactiveFormsModule,
- NgForOf
- ],
+ imports: [
+ FormsModule,
+ NzButtonComponent,
+ NzColDirective,
+ NzFormControlComponent,
+ NzFormDirective,
+ NzFormItemComponent,
+ NzFormLabelComponent,
+ NzInputDirective,
+ NzRowDirective,
+ ReactiveFormsModule,
+ 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;
}
From 1923371f10e86820e3c787571925f342dbbcff5d Mon Sep 17 00:00:00 2001
From: yuanye <418471657@qq.com>
Date: Thu, 25 Apr 2024 18:11:08 +0800
Subject: [PATCH 2/2] 1
---
.../pages/account/sys-account/sys-account.component.ts | 4 ++--
src/app/pages/account/sys-role/sys-role.component.ts | 4 ++--
src/app/pages/body/index/index.component.ts | 4 ++--
src/app/pages/login/login/login.component.ts | 6 ++----
src/app/pages/merchant/mer-add/mer-add.component.ts | 2 +-
src/app/pages/system/menu/menu.component.ts | 6 +++---
.../{servies => services}/account/sys-account.service.ts | 0
src/app/{servies => services}/common/common.service.ts | 0
src/app/services/goods/goods.service.ts | 9 +++++++++
src/app/{servies => services}/login/login.service.ts | 0
src/app/{servies => services}/menu/menu.service.ts | 0
src/app/{servies => services}/merchant/mer.service.ts | 0
src/app/{servies => services}/role/role.service.ts | 0
13 files changed, 21 insertions(+), 14 deletions(-)
rename src/app/{servies => services}/account/sys-account.service.ts (100%)
rename src/app/{servies => services}/common/common.service.ts (100%)
create mode 100644 src/app/services/goods/goods.service.ts
rename src/app/{servies => services}/login/login.service.ts (100%)
rename src/app/{servies => services}/menu/menu.service.ts (100%)
rename src/app/{servies => services}/merchant/mer.service.ts (100%)
rename src/app/{servies => services}/role/role.service.ts (100%)
diff --git a/src/app/pages/account/sys-account/sys-account.component.ts b/src/app/pages/account/sys-account/sys-account.component.ts
index 1fb178c..231577d 100644
--- a/src/app/pages/account/sys-account/sys-account.component.ts
+++ b/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',
diff --git a/src/app/pages/account/sys-role/sys-role.component.ts b/src/app/pages/account/sys-role/sys-role.component.ts
index 20cc556..669944b 100644
--- a/src/app/pages/account/sys-role/sys-role.component.ts
+++ b/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',
diff --git a/src/app/pages/body/index/index.component.ts b/src/app/pages/body/index/index.component.ts
index a81a079..b6a30c3 100644
--- a/src/app/pages/body/index/index.component.ts
+++ b/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',
diff --git a/src/app/pages/login/login/login.component.ts b/src/app/pages/login/login/login.component.ts
index fe2f231..d8f4c4b 100644
--- a/src/app/pages/login/login/login.component.ts
+++ b/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, NzFormLabelComponent} from "ng-zorro-antd/form";
+import {NzFormControlComponent, NzFormDirective, NzFormItemComponent} 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";
diff --git a/src/app/pages/merchant/mer-add/mer-add.component.ts b/src/app/pages/merchant/mer-add/mer-add.component.ts
index 991a48c..db478df 100644
--- a/src/app/pages/merchant/mer-add/mer-add.component.ts
+++ b/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,6 +18,7 @@ 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 {MerService} from "../../../services/merchant/mer.service";
@Component({
selector: 'app-mer-add',
diff --git a/src/app/pages/system/menu/menu.component.ts b/src/app/pages/system/menu/menu.component.ts
index 24c34c0..c21b44e 100644
--- a/src/app/pages/system/menu/menu.component.ts
+++ b/src/app/pages/system/menu/menu.component.ts
@@ -1,9 +1,8 @@
-import {ChangeDetectorRef, Component, ViewChild} from '@angular/core';
-import {NzFormatEmitEvent, NzTreeComponent, NzTreeNode, NzTreeService} from "ng-zorro-antd/tree";
+import {Component} from '@angular/core';
+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',
diff --git a/src/app/servies/account/sys-account.service.ts b/src/app/services/account/sys-account.service.ts
similarity index 100%
rename from src/app/servies/account/sys-account.service.ts
rename to src/app/services/account/sys-account.service.ts
diff --git a/src/app/servies/common/common.service.ts b/src/app/services/common/common.service.ts
similarity index 100%
rename from src/app/servies/common/common.service.ts
rename to src/app/services/common/common.service.ts
diff --git a/src/app/services/goods/goods.service.ts b/src/app/services/goods/goods.service.ts
new file mode 100644
index 0000000..07cc805
--- /dev/null
+++ b/src/app/services/goods/goods.service.ts
@@ -0,0 +1,9 @@
+import { Injectable } from '@angular/core';
+
+@Injectable({
+ providedIn: 'root'
+})
+export class GoodsService {
+
+ constructor() { }
+}
diff --git a/src/app/servies/login/login.service.ts b/src/app/services/login/login.service.ts
similarity index 100%
rename from src/app/servies/login/login.service.ts
rename to src/app/services/login/login.service.ts
diff --git a/src/app/servies/menu/menu.service.ts b/src/app/services/menu/menu.service.ts
similarity index 100%
rename from src/app/servies/menu/menu.service.ts
rename to src/app/services/menu/menu.service.ts
diff --git a/src/app/servies/merchant/mer.service.ts b/src/app/services/merchant/mer.service.ts
similarity index 100%
rename from src/app/servies/merchant/mer.service.ts
rename to src/app/services/merchant/mer.service.ts
diff --git a/src/app/servies/role/role.service.ts b/src/app/services/role/role.service.ts
similarity index 100%
rename from src/app/servies/role/role.service.ts
rename to src/app/services/role/role.service.ts