1

angular.json

@@ -3,7 +3,7 @@
   "version": 1,
   "newProjectRoot": "projects",
   "projects": {
-    "high-web": {
+    "phg-web": {
       "projectType": "application",
       "schematics": {
         "@schematics/angular:component": {
@@ -17,7 +17,7 @@
         "build": {
           "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "dist/high-web",
+            "outputPath": "dist/phg-web",
             "index": "src/index.html",
             "browser": "src/main.ts",
             "polyfills": [
@@ -50,7 +50,7 @@
                 {
                   "type": "initial",
                   "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumError": "2mb"
                 },
                 {
                   "type": "anyComponentStyle",
@@ -71,7 +71,7 @@
                 {
                   "type": "initial",
                   "maximumWarning": "500kb",
-                  "maximumError": "1mb"
+                  "maximumError": "2mb"
                 },
                 {
                   "type": "anyComponentStyle",
@@ -99,10 +99,10 @@
           "builder": "@angular-devkit/build-angular:dev-server",
           "configurations": {
             "production": {
-              "buildTarget": "high-web:build:production"
+              "buildTarget": "phg-web:build:production"
             },
             "development": {
-              "buildTarget": "high-web:build:development"
+              "buildTarget": "phg-web:build:development"
             }
           },
           "defaultConfiguration": "development"
@@ -110,7 +110,7 @@
         "extract-i18n": {
           "builder": "@angular-devkit/build-angular:extract-i18n",
           "options": {
-            "buildTarget": "high-web:build"
+            "buildTarget": "phg-web:build"
           }
         },
         "test": {

package-lock.json

@@ -1,11 +1,11 @@
 {
-  "name": "high-web",
+  "name": "phg-web",
   "version": "0.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "high-web",
+      "name": "phg-web",
       "version": "0.0.0",
       "dependencies": {
         "@angular/animations": "^17.0.0",

package.json

@@ -1,5 +1,5 @@
 {
-  "name": "high-web",
+  "name": "phg-web",
   "version": "0.0.0",
   "scripts": {
     "ng": "ng",
@@ -7,7 +7,7 @@
     "build": "ng build",
     "watch": "ng build --watch --configuration development",
     "test": "ng test",
-    "serve:ssr:high-web": "node dist/high-web/server/server.mjs"
+    "serve:ssr:phg-web": "node dist/phg-web/server/server.mjs"
   },
   "private": true,
   "dependencies": {
@@ -42,4 +42,4 @@
     "karma-jasmine-html-reporter": "~2.1.0",
     "typescript": "~5.2.2"
   }
-}
+}

src/app/app.routes.ts

@@ -1,7 +1,6 @@
 import { Routes } from '@angular/router';
 import {IndexComponent} from "./pages/body/index/index.component";
 import {InitGuardService} from "./utils/initGuard.service";
-import {TRADE_ROUTES} from "./pages/trade/trade.routes";
 export const routes: Routes = [
   {path: '', pathMatch: 'full', redirectTo: 'admin/index'},
   {
@@ -45,6 +44,11 @@ export const routes: Routes = [
         loadChildren: () => import('./pages/system/system.routes').then(m => m.SYSTEM_ROUTES),
         canActivate: [InitGuardService]
       },
+      {
+        path: 'marketing',
+        loadChildren: () => import('./pages/marketing/marketing.routes').then(m => m.MARKETING_ROUTES),
+        canActivate: [InitGuardService]
+      },
       ]
   }
 ];

src/app/data/login/login.namespace.ts

@@ -1,5 +1,5 @@
 export const backgroundImage =  [
-  "./assets/login/图片整理.png",
+  "./assets/login/1.png",
-  "./assets/login/多端协同.png",
+  "./assets/login/2.png",
-  "./assets/login/达成合作.png"];
+  "./assets/login/3.png"];
 

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

@@ -204,7 +204,7 @@
               nzAction="{{baseUrl}}fileUpload/fileUpload"
               nzListType="picture-card"
               [(nzFileList)]="bannerImg"
-              [nzShowButton]="bannerImg.length < 1"
+              [nzShowButton]="bannerImg.length < 20"
               [nzPreview]="handlePreview"
               nzAccept="image/*"
             >
@@ -223,7 +223,6 @@
                 <img [src]="previewImage" [ngStyle]="{ width: '100%' }"  alt=""/>
               </ng-template>
             </nz-modal>
-
           </nz-form-control>
         </nz-form-item>
         <nz-form-item >
@@ -233,7 +232,7 @@
               nzAction="{{baseUrl}}fileUpload/fileUpload"
               nzListType="picture-card"
               [(nzFileList)]="detailImg"
-              [nzShowButton]="detailImg.length < 1"
+              [nzShowButton]="detailImg.length < 20"
               [nzPreview]="handlePreview"
               nzAccept="image/*"
             >

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

@@ -189,13 +189,15 @@ export class GoodsTypeComponent {
   }
 
   // 唤醒编辑表单
-  showEditGoodsType(item?: GoodsTypeData) {
+  showEditGoodsType(item?: GoodsTypeData): void {
     if (item != null) {
       item.businessType = String(item.businessType);
       this.editGoodSTypeForm.patchValue(item);
       if (!this.commonService.whetherStringIsNull(item.imgUrl)) {
         this.imgUrl = this.commonService.stitchImg(item.imgUrl);
       }
+    } else {
+      this.editGoodSTypeForm.reset();
     }
     this.isVisibleEdit = true;
   }

src/app/pages/marketing/discount-list/discount-list.component.html

@@ -0,0 +1,98 @@
+<form nz-form [formGroup]="searchForm" class="search_form" [nzLayout]="'vertical'">
+  <div nz-row [nzGutter]="24">
+    <div nz-col [nzSpan]="6">
+      <nz-form-item>
+        <nz-form-label>品牌名称</nz-form-label>
+        <nz-form-control>
+          <input  nzSize="large"  nz-input formControlName="title" placeholder="请输入" />
+        </nz-form-control>
+      </nz-form-item>
+    </div>
+
+    <div nz-col [nzSpan]="6" class="search-area">
+      <button nz-button [nzType]="'primary'" (click)="getRequest(true)">查询</button>
+      <button nz-button (click)="searchForm.reset()">重置</button>
+      <button nz-button [nzType]="'primary'" (click)="showEdit()">创建</button>
+    </div>
+  </div>
+</form>
+
+<nz-table #basicTable
+          [nzBordered]="true"
+          [nzFrontPagination]="false"
+          [nzShowQuickJumper]="true"
+          [nzShowTotal]="totalTemplate"
+          [(nzPageIndex)]="tablePageNum"
+          (nzPageIndexChange)="getRequest(false)"
+          [nzTotal]="tableData.total"
+          [nzData]="tableData.list" >
+  <thead>
+  <tr>
+    <th nzWidth="80px">品牌名称</th>
+    <th nzWidth="100px">品牌图片</th>
+    <th nzWidth="50px">创建时间</th>
+    <th nzWidth="50px">更新时间</th>
+    <th nzWidth="70px">操作</th>
+  </tr>
+  </thead>
+  <tbody>
+  <tr *ngFor="let data of basicTable.data">
+    <td>{{data.title}}</td>
+    <td>
+      <img nz-image width="60px" height="60px" nzSrc="{{imageUrl + data.imgUrl }}" [nzFallback]="fallbackImg" alt="" />
+    </td>
+    <td>{{ data.createTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+    <td>{{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+    <td>
+      <a (click)="showEdit(data)">修改</a>
+      <nz-divider nzType="vertical"></nz-divider>
+      <a  nz-popconfirm nzPopconfirmTitle="是否确认删除?" (nzOnConfirm)="delete(data.id)">删除</a>
+    </td>
+  </tr>
+  </tbody>
+  <ng-template #totalTemplate let-total>总计 {{ total }} 条</ng-template>
+
+
+  <!--添加弹出框-->
+  <nz-modal [(nzVisible)]="isVisibleEdit" [nzMaskClosable] = false  nzTitle="编辑类目" (nzOnCancel)="isVisibleEdit = false" (nzOnOk)="handleEdit()">
+    <ng-container *nzModalContent>
+      <form nz-form [formGroup]="editForm">
+        <nz-form-item >
+          <nz-form-label [nzSm]="6" [nzXs]="24" nzRequired>标题</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24" nzErrorTip="请输入标题!">
+            <input  nzSize="large"  nz-input formControlName="title"  placeholder="请输入" />
+          </nz-form-control>
+        </nz-form-item>
+
+        <nz-form-item >
+          <nz-form-label [nzSm]="6" [nzXs]="24" >上传图片</nz-form-label>
+          <nz-form-control [nzSm]="14" [nzXs]="24">
+            <nz-upload
+              nzAction="{{baseUrl}}fileUpload/fileUpload"
+              nzListType="picture-card"
+              [(nzFileList)]="imgUrl"
+              [nzShowButton]="imgUrl.length < 1"
+              [nzPreview]="handlePreview"
+              nzAccept="image/*"
+            >
+              <div>
+                <span nz-icon nzType="plus"></span>
+                <div style="margin-top: 8px">上传图片</div>
+              </div>
+            </nz-upload>
+            <nz-modal
+              [nzVisible]="previewVisible"
+              [nzContent]="modalContent"
+              [nzFooter]="null"
+              (nzOnCancel)="previewVisible = false"
+            >
+              <ng-template #modalContent>
+                <img [src]="previewImage" [ngStyle]="{ width: '100%' }"  alt=""/>
+              </ng-template>
+            </nz-modal>
+
+          </nz-form-control>
+        </nz-form-item>
+      </form>
+    </ng-container>
+  </nz-modal>

src/app/pages/marketing/discount-list/discount-list.component.less

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

src/app/pages/marketing/discount-list/discount-list.component.ts

@@ -0,0 +1,203 @@
+import { Component } from '@angular/core';
+import {DatePipe, NgForOf, NgOptimizedImage, NgStyle} from "@angular/common";
+import {NzButtonComponent} from "ng-zorro-antd/button";
+import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid";
+import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form";
+import {NzInputDirective} from "ng-zorro-antd/input";
+import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select";
+import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal";
+import {FormGroup, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms";
+import {NzIconDirective} from "ng-zorro-antd/icon";
+import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select";
+import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload";
+import {NzDividerComponent} from "ng-zorro-antd/divider";
+import {
+  NzTableCellDirective,
+  NzTableComponent,
+  NzTbodyComponent,
+  NzTheadComponent,
+  NzThMeasureDirective, NzTrDirective
+} from "ng-zorro-antd/table";
+import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm";
+import {NzImageModule} from "ng-zorro-antd/image";
+import {environment} from "../../../../environments/environment";
+import {NzMessageService} from "ng-zorro-antd/message";
+import {CommonService} from "../../../services/common/common.service";
+import {GoodsService} from "../../../services/goods/goods.service";
+import {GoodsTypeData} from "../../../model/goods.interface";
+import { fallbackImg } from '../../../data/goods/goods.namespace';
+
+const getBase64 = (file: File): Promise<string | ArrayBuffer | null> =>
+  new Promise((resolve, reject) => {
+    const reader = new FileReader();
+    reader.readAsDataURL(file);
+    reader.onload = () => resolve(reader.result);
+    reader.onerror = error => reject(error);
+  });
+
+@Component({
+  selector: 'app-discount-list',
+  standalone: true,
+  imports: [
+    NgForOf,
+    NzButtonComponent,
+    NzColDirective,
+    NzFormControlComponent,
+    NzFormDirective,
+    NzFormItemComponent,
+    NzFormLabelComponent,
+    NzInputDirective,
+    NzOptionComponent,
+    NzRowDirective,
+    NzModalModule,
+    NzSelectComponent,
+    ReactiveFormsModule,
+    NzIconDirective,
+    NzModalComponent,
+    NzTreeSelectComponent,
+    NzUploadComponent,
+    NzModalContentDirective,
+    NgStyle,
+    DatePipe,
+    NzDividerComponent,
+    NzTableCellDirective,
+    NzTableComponent,
+    NzTbodyComponent,
+    NzThMeasureDirective,
+    NzTheadComponent,
+    NzTrDirective,
+    NzPopconfirmDirective,
+    NzImageModule,
+    NgOptimizedImage
+  ],
+  templateUrl: './discount-list.component.html',
+  styleUrl: './discount-list.component.less'
+})
+export class DiscountListComponent {
+  // 表单页数
+  tablePageNum = 1;
+  // 表单数据
+  tableData: any = {
+    total: 0,
+    loading: false,
+    list: [],
+  };
+  // 搜索表单
+  searchForm: FormGroup;
+
+  // 图片
+  imgUrl: NzUploadFile[] = []
+  baseUrl = environment.baseUrl;
+  imageUrl = environment.imageUrl;
+
+  // 展示图片
+  previewImage: string | undefined = '';
+  // 上传是否展示
+  previewVisible = false;
+
+  // 编辑产品类型表单
+  editForm: FormGroup;
+  // 编辑弹出框
+  isVisibleEdit = false;
+
+  protected readonly fallbackImg = fallbackImg;
+
+  constructor(private fb: NonNullableFormBuilder,
+              private msg: NzMessageService,
+              private commonService: CommonService,
+              private goodsService: GoodsService) {
+    // 初始化搜索框
+    this.searchForm = this.fb.group({
+      title: [''],
+    });
+
+    // 初始化
+    this.editForm = this.fb.group({
+      title: ['' , [Validators.required]],
+      id: [null],
+      imgUrl: [''],
+    });
+    this.getRequest();
+
+  }
+
+  // 查询列表
+  public getRequest(reset: boolean = false) {
+    this.tableData.loading  = true;
+    if (reset) {
+      this.tablePageNum = 1;
+    }
+    this.searchForm.value.pageNum = this.tablePageNum;
+    this.searchForm.value.pageSize = 10;
+    this.searchForm.value.time = new Date().getTime();
+
+    this.goodsService.getListBrand(this.searchForm.value , (data: any) => {
+      if (data['return_code'] == '000000') {
+        this.tableData = data['return_data'];
+      } else {
+        this.msg.error(data['return_msg']);
+      }
+      this.tableData.loading  = false;
+    });
+  }
+
+
+  // 唤醒编辑表单
+  showEdit(item?: GoodsTypeData) {
+    if (item != null) {
+      item.businessType = String(item.businessType);
+      this.editForm.patchValue(item);
+      if (!this.commonService.whetherStringIsNull(item.imgUrl)) {
+        this.imgUrl = this.commonService.stitchImg(item.imgUrl);
+      }
+    }
+    this.isVisibleEdit = true;
+  }
+  // 编辑表单提交
+  handleEdit(): void {
+
+    if (this.editForm.valid) {
+      if (this.imgUrl.length !== 0) {
+        this.editForm.value.imgUrl = this.commonService.imgList(this.imgUrl);
+      }
+      this.goodsService.editGoodsBrand(this.editForm.value , (data: any) => {
+        if (data['return_code'] === '000000') {
+          this.msg.success("成功！");
+          this.isVisibleEdit = false;
+          this.getRequest();
+        } else {
+          this.msg.error(data['return_msg']);
+        }
+      });
+    } else {
+      Object.values(this.editForm.controls).forEach(control => {
+        if (control.invalid) {
+          control.markAsDirty();
+          control.updateValueAndValidity({ onlySelf: true });
+        }
+      });
+    }
+
+  }
+
+  // 上传操作
+  handlePreview = async (file: NzUploadFile): Promise<void> => {
+    if (!file.url && !file['preview']) {
+      file['preview'] = await getBase64(file.originFileObj!);
+    }
+    this.previewImage = file.url || file['preview'];
+    this.previewVisible = true;
+  };
+
+  // 删除
+  delete(id: number): void {
+    this.goodsService.deleteBran(id , (data: any) => {
+      if (data['return_code'] === '000000') {
+        this.msg.success("成功！");
+        this.getRequest();
+      } else {
+        this.msg.error(data['return_msg']);
+      }
+    });
+  }
+}

src/app/pages/marketing/marketing.module.ts

@@ -0,0 +1,12 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+
+
+
+@NgModule({
+  declarations: [],
+  imports: [
+    CommonModule
+  ]
+})
+export class MarketingModule { }

src/app/pages/marketing/marketing.routes.ts

@@ -0,0 +1,9 @@
+import { Routes } from '@angular/router';
+import {DiscountListComponent} from "./discount-list/discount-list.component";
+
+
+
+export const MARKETING_ROUTES: Routes = [
+  { path: 'discount-list', component: DiscountListComponent},
+
+];

src/environments/environment.dev.ts

@@ -1,7 +1,7 @@
 export const environment = {
   production: true,
-  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  baseUrl: 'https://phgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',
+  orderUrl: 'https://phgcs.dctpay.com/order/', // 测试环境服务器地址(请求数据地址)
-  orderUrl: 'https://hsgcs.dctpay.com/order/',
+  userUrl: 'https://phgcs.dctpay.com/user/', // 测试环境服务器地址(请求数据地址)
-  userUrl: 'https://hsgcs.dctpay.com/User/',
+  imageUrl: 'https://phgcs.dctpay.com/filesystem/',
 };