From 6bc3b4a6cc320233b38d4535fd93756de76f80d9 Mon Sep 17 00:00:00 2001 From: hurui <177768073@qq.com> Date: Wed, 26 Jun 2024 16:52:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/extensions.json | 4 - .vscode/launch.json | 20 - .vscode/tasks.json | 42 -- README.md | 2 - angular.json | 10 +- package-lock.json | 4 +- package.json | 4 +- src/app/app.routes.ts | 16 - src/app/data/goods/goods.namespace.ts | 13 - src/app/pages/account/account.routes.ts | 2 - .../pages/account/user/user.component.html | 81 --- .../pages/account/user/user.component.less | 6 - src/app/pages/account/user/user.component.ts | 173 ------- .../audit-list/audit-list.component.html | 192 ------- .../audit-list/audit-list.component.less | 15 - .../audit/audit-list/audit-list.component.ts | 197 -------- src/app/pages/audit/audit.module.ts | 12 - src/app/pages/audit/audit.routes.ts | 6 - src/app/pages/body/index/index.component.html | 2 +- .../goods-brand/goods-brand.component.html | 98 ---- .../goods-brand/goods-brand.component.less | 12 - .../goods-brand/goods-brand.component.ts | 206 -------- .../goods-list/goods-list.component.html | 464 ----------------- .../goods-list/goods-list.component.less | 12 - .../goods/goods-list/goods-list.component.ts | 470 ------------------ .../goods-type/goods-type.component.html | 111 ----- .../goods-type/goods-type.component.less | 12 - .../goods/goods-type/goods-type.component.ts | 255 ---------- src/app/pages/goods/goods.module.ts | 12 - src/app/pages/goods/goods.routes.ts | 12 - .../pages/index/index/index.component.html | 64 --- .../pages/login/login/login.component.html | 2 +- .../coupon-discount-list.component.html | 166 ------- .../coupon-discount-list.component.less | 12 - .../coupon-discount-list.component.ts | 308 ------------ .../discount-list.component.html | 241 --------- .../discount-list.component.less | 15 - .../discount-list/discount-list.component.ts | 334 ------------- src/app/pages/marketing/marketing.module.ts | 12 - src/app/pages/marketing/marketing.routes.ts | 11 - .../comp-order/comp-order.component.html | 241 --------- .../comp-order/comp-order.component.less | 6 - .../trade/comp-order/comp-order.component.ts | 212 -------- .../goods-list/goods-list.component.html | 225 --------- .../goods-list/goods-list.component.less | 12 - .../trade/goods-list/goods-list.component.ts | 244 --------- .../order-after-sales.component.html | 219 -------- .../order-after-sales.component.less | 9 - .../order-after-sales.component.ts | 298 ----------- src/app/pages/trade/trade.routes.ts | 6 - src/app/services/account/user.service.ts | 48 -- src/app/services/audit/audit.service.ts | 45 -- src/app/services/goods/goods.service.ts | 174 ------- src/app/services/login/login.service.ts | 4 +- .../services/marketing/discount.service.ts | 141 ------ .../trade/order-after-sales.service.ts | 64 --- .../services/trade/order-coupon.service.ts | 39 -- src/app/services/trade/order-goods.service.ts | 35 -- .../services/trade/order-refund.service.ts | 4 +- src/environments/environment.ts | 9 +- src/favicon.ico | Bin 3954 -> 3533 bytes src/index.html | 2 +- 62 files changed, 17 insertions(+), 5650 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/launch.json delete mode 100644 .vscode/tasks.json delete mode 100644 src/app/data/goods/goods.namespace.ts delete mode 100644 src/app/pages/account/user/user.component.html delete mode 100644 src/app/pages/account/user/user.component.less delete mode 100644 src/app/pages/account/user/user.component.ts delete mode 100644 src/app/pages/audit/audit-list/audit-list.component.html delete mode 100644 src/app/pages/audit/audit-list/audit-list.component.less delete mode 100644 src/app/pages/audit/audit-list/audit-list.component.ts delete mode 100644 src/app/pages/audit/audit.module.ts delete mode 100644 src/app/pages/audit/audit.routes.ts delete mode 100644 src/app/pages/goods/goods-brand/goods-brand.component.html delete mode 100644 src/app/pages/goods/goods-brand/goods-brand.component.less delete mode 100644 src/app/pages/goods/goods-brand/goods-brand.component.ts delete mode 100644 src/app/pages/goods/goods-list/goods-list.component.html delete mode 100644 src/app/pages/goods/goods-list/goods-list.component.less delete mode 100644 src/app/pages/goods/goods-list/goods-list.component.ts delete mode 100644 src/app/pages/goods/goods-type/goods-type.component.html delete mode 100644 src/app/pages/goods/goods-type/goods-type.component.less delete mode 100644 src/app/pages/goods/goods-type/goods-type.component.ts delete mode 100644 src/app/pages/goods/goods.module.ts delete mode 100644 src/app/pages/goods/goods.routes.ts delete mode 100644 src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.html delete mode 100644 src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.less delete mode 100644 src/app/pages/marketing/coupon-discount-list/coupon-discount-list.component.ts delete mode 100644 src/app/pages/marketing/discount-list/discount-list.component.html delete mode 100644 src/app/pages/marketing/discount-list/discount-list.component.less delete mode 100644 src/app/pages/marketing/discount-list/discount-list.component.ts delete mode 100644 src/app/pages/marketing/marketing.module.ts delete mode 100644 src/app/pages/marketing/marketing.routes.ts delete mode 100644 src/app/pages/trade/comp-order/comp-order.component.html delete mode 100644 src/app/pages/trade/comp-order/comp-order.component.less delete mode 100644 src/app/pages/trade/comp-order/comp-order.component.ts delete mode 100644 src/app/pages/trade/goods-list/goods-list.component.html delete mode 100644 src/app/pages/trade/goods-list/goods-list.component.less delete mode 100644 src/app/pages/trade/goods-list/goods-list.component.ts delete mode 100644 src/app/pages/trade/order-after-sales/order-after-sales.component.html delete mode 100644 src/app/pages/trade/order-after-sales/order-after-sales.component.less delete mode 100644 src/app/pages/trade/order-after-sales/order-after-sales.component.ts delete mode 100644 src/app/services/account/user.service.ts delete mode 100644 src/app/services/audit/audit.service.ts delete mode 100644 src/app/services/goods/goods.service.ts delete mode 100644 src/app/services/marketing/discount.service.ts delete mode 100644 src/app/services/trade/order-after-sales.service.ts delete mode 100644 src/app/services/trade/order-coupon.service.ts delete mode 100644 src/app/services/trade/order-goods.service.ts diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index 77b3745..0000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=827846 - "recommendations": ["angular.ng-template"] -} diff --git a/.vscode/launch.json b/.vscode/launch.json deleted file mode 100644 index 925af83..0000000 --- a/.vscode/launch.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 - "version": "0.2.0", - "configurations": [ - { - "name": "ng serve", - "type": "chrome", - "request": "launch", - "preLaunchTask": "npm: start", - "url": "http://localhost:4200/" - }, - { - "name": "ng test", - "type": "chrome", - "request": "launch", - "preLaunchTask": "npm: test", - "url": "http://localhost:9876/debug.html" - } - ] -} diff --git a/.vscode/tasks.json b/.vscode/tasks.json deleted file mode 100644 index a298b5b..0000000 --- a/.vscode/tasks.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - // For more information, visit: https://go.microsoft.com/fwlink/?LinkId=733558 - "version": "2.0.0", - "tasks": [ - { - "type": "npm", - "script": "start", - "isBackground": true, - "problemMatcher": { - "owner": "typescript", - "pattern": "$tsc", - "background": { - "activeOnStart": true, - "beginsPattern": { - "regexp": "(.*?)" - }, - "endsPattern": { - "regexp": "bundle generation complete" - } - } - } - }, - { - "type": "npm", - "script": "test", - "isBackground": true, - "problemMatcher": { - "owner": "typescript", - "pattern": "$tsc", - "background": { - "activeOnStart": true, - "beginsPattern": { - "regexp": "(.*?)" - }, - "endsPattern": { - "regexp": "bundle generation complete" - } - } - } - } - ] -} diff --git a/README.md b/README.md index bcc6bb3..e69de29 100644 --- a/README.md +++ b/README.md @@ -1,2 +0,0 @@ -# puhui-go-web - diff --git a/angular.json b/angular.json index 63142cd..f4a693e 100644 --- a/angular.json +++ b/angular.json @@ -3,7 +3,7 @@ "version": 1, "newProjectRoot": "projects", "projects": { - "phg-web": { + "hai-oil-web": { "projectType": "application", "schematics": { "@schematics/angular:component": { @@ -17,7 +17,7 @@ "build": { "builder": "@angular-devkit/build-angular:application", "options": { - "outputPath": "dist/phg-web", + "outputPath": "dist/hai-oil-web", "index": "src/index.html", "browser": "src/main.ts", "polyfills": [ @@ -99,10 +99,10 @@ "builder": "@angular-devkit/build-angular:dev-server", "configurations": { "production": { - "buildTarget": "phg-web:build:production" + "buildTarget": "hai-oil-web:build:production" }, "development": { - "buildTarget": "phg-web:build:development" + "buildTarget": "hai-oil-web:build:development" } }, "defaultConfiguration": "development" @@ -110,7 +110,7 @@ "extract-i18n": { "builder": "@angular-devkit/build-angular:extract-i18n", "options": { - "buildTarget": "phg-web:build" + "buildTarget": "hai-oil-web:build" } }, "test": { diff --git a/package-lock.json b/package-lock.json index 0fdf534..7c21d41 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "phg-web", + "name": "hai-oil-web", "version": "0.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "phg-web", + "name": "hai-oil-web", "version": "0.0.0", "dependencies": { "@angular/animations": "^17.0.0", diff --git a/package.json b/package.json index 3ee62e8..c95d193 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "phg-web", + "name": "hai-oil-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:phg-web": "node dist/phg-web/server/server.mjs" + "serve:ssr:hai-oil-web": "node dist/hai-oil-web/server/server.mjs" }, "private": true, "dependencies": { diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index bd87b7f..d2a9070 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -36,27 +36,11 @@ export const routes: Routes = [ loadChildren: () => import('./pages/trade/trade.routes').then(m => m.TRADE_ROUTES), canActivate: [InitGuardService] }, - { - path: 'goods', - loadChildren: () => import('./pages/goods/goods.routes').then(m => m.GOODS_ROUTES), - canActivate: [InitGuardService] - }, { path: 'system', 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] - }, - { - path: 'audit', - loadChildren: () => import('./pages/audit/audit.routes').then(m => m.AUDIT_ROUTES), - canActivate: [InitGuardService] - }, - ] }, { diff --git a/src/app/data/goods/goods.namespace.ts b/src/app/data/goods/goods.namespace.ts deleted file mode 100644 index 74b6a34..0000000 --- a/src/app/data/goods/goods.namespace.ts +++ /dev/null @@ -1,13 +0,0 @@ - -export const fallbackImg = 'data:image/png;base64,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'; - -export const orderGoodsStatus = [ - {name: "待发货" , key: 1} , - {name: "已发货" , key: 2}, - {name: "配送中" , key: 3}, - {name: "已送达" , key: 4}, - {name: "已取消" , key: 5}, - {name: "退货中" , key: 6}, - {name: "已退货" , key: 7}, - {name: "待支付" , key: 8} -]; diff --git a/src/app/pages/account/account.routes.ts b/src/app/pages/account/account.routes.ts index b5c3b24..a988e79 100644 --- a/src/app/pages/account/account.routes.ts +++ b/src/app/pages/account/account.routes.ts @@ -1,10 +1,8 @@ import { Routes } from '@angular/router'; import {SysAccountComponent} from "./sys-account/sys-account.component"; import {SysRoleComponent} from "./sys-role/sys-role.component"; -import {UserComponent} from "./user/user.component"; export const ACCOUNT_ROUTES: Routes = [ { path: 'sys_account', component: SysAccountComponent}, { path: 'sys_role', component: SysRoleComponent}, - { path: 'user_list', component: UserComponent}, ]; diff --git a/src/app/pages/account/user/user.component.html b/src/app/pages/account/user/user.component.html deleted file mode 100644 index a5ca496..0000000 --- a/src/app/pages/account/user/user.component.html +++ /dev/null @@ -1,81 +0,0 @@ -
-
-
- - 用户名 - - - - -
- -
- - 手机号 - - - - -
- -
- - 状态 - - - - - - -
-
- - -
-
-
- - - - - 用户名 - 手机号 - 积分数量 - 状态 - 注册时间 - 操作 - - - - - {{data.name}} - {{data.phone}} - {{data.integral}} - {{data.status | dictionary: 'USER_STATUS'}} - {{data.createTime | date: 'yyyy-MM-dd HH:mm'}} - - 禁用账户 - 恢复账户 - - - - - 总计 {{ total }} 条 - diff --git a/src/app/pages/account/user/user.component.less b/src/app/pages/account/user/user.component.less deleted file mode 100644 index 3d2cd3b..0000000 --- a/src/app/pages/account/user/user.component.less +++ /dev/null @@ -1,6 +0,0 @@ -.search-area { - margin-top: 30px; -} -button { - margin-left: 8px; -} diff --git a/src/app/pages/account/user/user.component.ts b/src/app/pages/account/user/user.component.ts deleted file mode 100644 index 5ab2b8a..0000000 --- a/src/app/pages/account/user/user.component.ts +++ /dev/null @@ -1,173 +0,0 @@ -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 {DatePipe, NgForOf, NgIf} from "@angular/common"; -import {NzButtonComponent} from "ng-zorro-antd/button"; -import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; -import {NzDividerComponent} from "ng-zorro-antd/divider"; -import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; -import {NzInputDirective} from "ng-zorro-antd/input"; -import { - NzTableCellDirective, - NzTableComponent, - NzTbodyComponent, - NzTheadComponent, - NzThMeasureDirective, NzTrDirective -} from "ng-zorro-antd/table"; -import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe"; -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', - standalone: true, - imports: [ - DatePipe, - NgForOf, - NzButtonComponent, - NzColDirective, - NzDividerComponent, - NzFormControlComponent, - NzFormDirective, - NzFormItemComponent, - NzFormLabelComponent, - NzInputDirective, - NzRowDirective, - NzTableCellDirective, - NzTableComponent, - NzTbodyComponent, - NzThMeasureDirective, - NzTheadComponent, - NzTrDirective, - ReactiveFormsModule, - DictionaryPipe, - NzSelectComponent, - NzOptionComponent, - NzModalModule, - NgIf, - NzDropDownADirective, - NzDropDownDirective, - NzDropdownMenuComponent, - NzIconDirective, - NzMenuDirective, - NzMenuItemComponent, - ], - templateUrl: './user.component.html', - styleUrl: './user.component.less' -}) -export class UserComponent { -// 表单页数 - tablePageNum = 1; - // 表单数据 - tableData: any = { - total: 0, - list: [], - }; - // 搜索表单 - searchForm: FormGroup; - - // 用户状态 - userStatusArray = new DictionaryPipe().getDictionaryList("USER_STATUS"); - constructor(private fb: NonNullableFormBuilder, - private userService: UserService, - private message: NzMessageService, - private modal: NzModalService) { - // 初始化搜索框 - this.searchForm = this.fb.group({ - name: [''], - phone: [''], - status: [''], - }); - - - this.queryData(); - } - - queryData() { - this.searchForm.value.pageNum = this.tablePageNum; - this.searchForm.value.pageSize = 10; - this.searchForm.value.time = new Date().getTime(); - this.userService.queryUserList(this.searchForm.value, (data: any) => { - if (data['return_code'] == '000000') { - this.tableData = data['return_data']; - } - }); - } - - /** - * 搜索表单提交 - */ - searchFormSubmit(): void { - this.tablePageNum = 1; - this.queryData(); - } - - /** - * 搜索表单重置 - */ - searchFormReset(): void { - this.searchForm.reset(); - } - - /** - * 打开恢复账户确认框 - */ - showRestore(dataId: number) { - this.modal.confirm({ - nzTitle: '提示', - nzContent: '确定恢复账户状态？', - nzOnOk: () => this.restore(dataId) - }); - } - - /** - * 恢复 - */ - restore(dataId: number) { - const param = { - userId: dataId - } - this.userService.restore(param, (data: any) => { - if (data['return_code'] == '000000') { - // 刷新数据 - this.queryData(); - this.message.success("操作成功"); - } else { - this.message.create('error', data['return_msg']); - } - }); - } - - /** - * 打开禁用账户确认框 - */ - showDisable(dataId: number) { - this.modal.confirm({ - nzTitle: '提示', - nzContent: '确定禁用账户吗？禁用后无法登录、交易！', - nzOnOk: () => this.disable(dataId) - }); - } - - /** - * 禁用 - */ - disable(dataId: number) { - const param = { - userId: dataId - } - this.userService.disable(param, (data: any) => { - if (data['return_code'] == '000000') { - // 刷新数据 - this.queryData(); - this.message.success("操作成功"); - } else { - this.message.create('error', data['return_msg']); - } - }); - } -} diff --git a/src/app/pages/audit/audit-list/audit-list.component.html b/src/app/pages/audit/audit-list/audit-list.component.html deleted file mode 100644 index 171770e..0000000 --- a/src/app/pages/audit/audit-list/audit-list.component.html +++ /dev/null @@ -1,192 +0,0 @@ -
-
-
- - 审核内容名称 - - - - -
-
- - 审核提交人 - - - - -
- -
- - 审核状态 - - - - - - - - -
-
- - -
-
-
- - - - - 审核对象 - 提交人名称 - 审核流水号 - 创建时间 - 更新时间 - 状态 - 操作 - - - - - {{data.submitObjectName}} - {{data.submitOpName}} - {{data.auditSerialNo}} - {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} - {{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.status | auditStatus}} - - 详情 - - - 更多 - - - - - - - - - 总计 {{ total }} 条 - - - - - - {{ auditDetail.auditSerialNo }} - {{ auditDetail.submitOpName }} - {{ auditDetail.auditOpName }} - {{ auditDetail.submitObjectName }} - {{ auditDetail['goodsModel'].goodsTypeName + "/" + auditDetail['goodsModel'].goodsTypeParentName}} - {{ auditDetail['goodsModel'].goodsBrandName }} - {{ auditDetail['goodsModel'].type == 1 ? '实物商品' : '虚拟商品' }} - {{ auditDetail['goodsModel'].goodsExplain}} - {{ auditDetail.createTime | date: 'yyyy-MM-dd HH:mm' }} - {{ auditDetail['goodsModel'].goodsLabel}} - {{ auditDetail.updateTime | date: 'yyyy-MM-dd HH:mm' }} - {{ auditDetail.remarks}} - - - - - - - - - - - - - - - - - - - - - -

规格列表

- - - - 规格名称 - 价格（RMB） - 图片 - - 库存（个） - 时间 - 虚拟产品 - - - 售价 - 原价 - 销售截止时间 - 创建时间 - 卡密 - 归库天数 - 类型 - 产品来源 - 跳转类型 - 跳转地址 - 应用ID - - - - - - {{data.name}} - - ￥{{data.salePrice}} - - - ￥{{data.originalPrice}} - - - - - - {{data.stock}} - {{ data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}} - {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.key}} - {{data.validDay}} - {{data.type == 1 ? '内部虚拟商品' : '外部虚拟产品'}} - {{data.source | dictionary: 'GOODS_VPD_SOURCE'}} - {{data.jumpType == 1 ? '小程序' : 'H5'}} - {{data.jumpUrl}} - {{data.appid}} - - - - - -
- - -
- - - - - - - diff --git a/src/app/pages/audit/audit-list/audit-list.component.less b/src/app/pages/audit/audit-list/audit-list.component.less deleted file mode 100644 index de21fc1..0000000 --- a/src/app/pages/audit/audit-list/audit-list.component.less +++ /dev/null @@ -1,15 +0,0 @@ -[nz-form-label] { - overflow: visible; -} -button { - margin-left: 8px; -} -.submit-btn { - width: 150px; -} -.search-area { - margin-top: 30px; -} -nz-select { - width: 100%; -} diff --git a/src/app/pages/audit/audit-list/audit-list.component.ts b/src/app/pages/audit/audit-list/audit-list.component.ts deleted file mode 100644 index 5fd8098..0000000 --- a/src/app/pages/audit/audit-list/audit-list.component.ts +++ /dev/null @@ -1,197 +0,0 @@ -import { Component } from '@angular/core'; -import {DatePipe, NgForOf, NgIf} from "@angular/common"; -import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe"; -import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms"; -import {NzButtonComponent} from "ng-zorro-antd/button"; -import { - NzCellFixedDirective, - NzTableCellDirective, - NzTableComponent, - NzTbodyComponent, NzTheadComponent, - NzThMeasureDirective, NzTrDirective -} from "ng-zorro-antd/table"; -import {NzColDirective, NzRowDirective} from "ng-zorro-antd/grid"; -import {NzDatePickerComponent} from "ng-zorro-antd/date-picker"; -import {NzDividerComponent} from "ng-zorro-antd/divider"; -import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown"; -import {NzFormControlComponent, NzFormDirective, NzFormItemComponent, NzFormLabelComponent} from "ng-zorro-antd/form"; -import {NzIconDirective} from "ng-zorro-antd/icon"; -import {NzImageDirective, NzImageGroupComponent, NzImageModule} from "ng-zorro-antd/image"; -import {NzInputDirective} from "ng-zorro-antd/input"; -import { - NzInputNumberComponent, - NzInputNumberGroupComponent, - NzInputNumberGroupWhitSuffixOrPrefixDirective -} from "ng-zorro-antd/input-number"; -import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu"; -import {NzModalComponent, NzModalContentDirective, NzModalFooterDirective, NzModalModule} from "ng-zorro-antd/modal"; -import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; -import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm"; -import {NzUploadComponent} from "ng-zorro-antd/upload"; -import {environment} from "../../../../environments/environment"; -import {NzMessageService} from "ng-zorro-antd/message"; -import {DiscountService} from "../../../services/marketing/discount.service"; -import { fallbackImg } from '../../../data/goods/goods.namespace'; -import {AuditService} from "../../../services/audit/audit.service"; -import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select"; -import {NzDescriptionsComponent, NzDescriptionsItemComponent} from "ng-zorro-antd/descriptions"; -import {NzBadgeComponent} from "ng-zorro-antd/badge"; -import {AuditStatusPipe} from "../../../pipes/audit/audit-status.pipe"; -import {NzTypographyComponent} from "ng-zorro-antd/typography"; - -@Component({ - selector: 'app-audit-list', - standalone: true, - imports: [ - DatePipe, - DictionaryPipe, - FormsModule, - NgForOf, - NgIf, - NzButtonComponent, - NzCellFixedDirective, - NzColDirective, - NzDatePickerComponent, - NzDividerComponent, - NzDropDownADirective, - NzDropDownDirective, - NzDropdownMenuComponent, - NzFormControlComponent, - NzFormDirective, - NzFormItemComponent, - NzFormLabelComponent, - NzIconDirective, - NzImageDirective, - NzInputDirective, - NzInputNumberComponent, - NzInputNumberGroupComponent, - NzInputNumberGroupWhitSuffixOrPrefixDirective, - NzMenuDirective, - NzMenuItemComponent, - NzModalComponent, - NzOptionComponent, - NzPopconfirmDirective, - NzRowDirective, - NzModalModule, - NzImageModule, - NzSelectComponent, - NzTableCellDirective, - NzTableComponent, - NzTbodyComponent, - NzThMeasureDirective, - NzTheadComponent, - NzTrDirective, - NzUploadComponent, - ReactiveFormsModule, - NzTreeSelectComponent, - NzDescriptionsItemComponent, - NzBadgeComponent, - NzDescriptionsComponent, - NzModalFooterDirective, - NzModalContentDirective, - AuditStatusPipe, - NzImageGroupComponent, - NzTypographyComponent - ], - templateUrl: './audit-list.component.html', - styleUrl: './audit-list.component.less' -}) -export class AuditListComponent { - // 表单页数 - tablePageNum = 1; - // 表单数据 - tableData: any = { - total: 0, - loading: false, - list: [], - }; - // 搜索表单 - searchForm: FormGroup; - auditDetail: any = { - goodsModel: {} - }; - - baseUrl = environment.baseUrl; - imageUrl = environment.imageUrl; - isVisibleDetail = false; - isVisibleAudit = false; - postAudit:any; - remarks: string | undefined; - - protected readonly fallbackImg = fallbackImg; - - constructor(private fb: NonNullableFormBuilder, - private msg: NzMessageService, - private auditService: AuditService, - private discountService: DiscountService) { - - // 初始化搜索框 - this.searchForm = this.fb.group({ - submitObjectName: [''], - submitOpName: [''], - status: [''], - }); - - this.getRequest(); - - - } - - showDetail(id: number): void { - this.isVisibleDetail = true; - let params = { - id: id, - time: new Date().getTime() - } - this.auditService.auditDetail(params , (data: any) => { - if (data['return_code'] == '000000') { - this.auditDetail = data['return_data']; - } - }) - } - - // 查询列表 - 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.auditService.getListGoodsAudit(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; - }); - } - - passOrOverrule(id: number , auditStatus: number): void { - this.postAudit = { - id: id, - time: new Date().getTime(), - status: auditStatus - } - - this.isVisibleAudit = true; - - } - - postAuditMsg(): void { - this.postAudit.remarks = this.remarks; - this.auditService.auditMsg(this.postAudit , (data: any) => { - if (data['return_code'] == '000000') { - this.getRequest(true); - this.msg.success("操作成功") - } else { - this.msg.error(data['return_msg']); - } - this.isVisibleAudit = false; - }); - } - -} diff --git a/src/app/pages/audit/audit.module.ts b/src/app/pages/audit/audit.module.ts deleted file mode 100644 index 096c3ce..0000000 --- a/src/app/pages/audit/audit.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - - - -@NgModule({ - declarations: [], - imports: [ - CommonModule - ] -}) -export class AuditModule { } diff --git a/src/app/pages/audit/audit.routes.ts b/src/app/pages/audit/audit.routes.ts deleted file mode 100644 index 599ebd1..0000000 --- a/src/app/pages/audit/audit.routes.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { Routes } from '@angular/router'; -import {AuditListComponent} from "./audit-list/audit-list.component"; - -export const AUDIT_ROUTES: Routes = [ - { path: 'audit-goods-list', component: AuditListComponent}, -]; diff --git a/src/app/pages/body/index/index.component.html b/src/app/pages/body/index/index.component.html index c17ef31..da1c346 100644 --- a/src/app/pages/body/index/index.component.html +++ b/src/app/pages/body/index/index.component.html @@ -4,7 +4,7 @@
diff --git a/src/app/pages/goods/goods-brand/goods-brand.component.html b/src/app/pages/goods/goods-brand/goods-brand.component.html deleted file mode 100644 index 6c04244..0000000 --- a/src/app/pages/goods/goods-brand/goods-brand.component.html +++ /dev/null @@ -1,98 +0,0 @@ -
-
-
- - 品牌名称 - - - - -
- -
- - - -
-
-
- - - - - 品牌名称 - 品牌图片 - 创建时间 - 更新时间 - 操作 - - - - - {{data.title}} - - - - {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} - {{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} - - 修改 - - 删除 - - - - 总计 {{ total }} 条 - - - - - -
- - 标题 - - - - - - - 上传图片 - - -
- -
上传图片
-
- - - - - - - - - -
- - diff --git a/src/app/pages/goods/goods-brand/goods-brand.component.less b/src/app/pages/goods/goods-brand/goods-brand.component.less deleted file mode 100644 index 6d5c351..0000000 --- a/src/app/pages/goods/goods-brand/goods-brand.component.less +++ /dev/null @@ -1,12 +0,0 @@ -[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-brand/goods-brand.component.ts b/src/app/pages/goods/goods-brand/goods-brand.component.ts deleted file mode 100644 index 47d555e..0000000 --- a/src/app/pages/goods/goods-brand/goods-brand.component.ts +++ /dev/null @@ -1,206 +0,0 @@ -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 {FormGroup, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms"; -import {NzMessageService} from "ng-zorro-antd/message"; -import {NzModalComponent, NzModalContentDirective, NzModalModule} from "ng-zorro-antd/modal"; -import {GoodsService} from "../../../services/goods/goods.service"; -import {NzIconDirective} from "ng-zorro-antd/icon"; -import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select"; -import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload"; -import {environment} from "../../../../environments/environment"; -import {GoodsTypeData} from "../../../model/goods.interface"; -import {CommonService} from "../../../services/common/common.service"; -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 {fallbackImg} from "../../../data/goods/goods.namespace"; -import {NzImageModule} from "ng-zorro-antd/image"; - -const getBase64 = (file: File): Promise => - new Promise((resolve, reject) => { - const reader = new FileReader(); - reader.readAsDataURL(file); - reader.onload = () => resolve(reader.result); - reader.onerror = error => reject(error); - }); - -@Component({ - selector: 'app-goods-brand', - 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: './goods-brand.component.html', - styleUrl: './goods-brand.component.less' -}) -export class GoodsBrandComponent { - // 表单页数 - 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); - } - } else { - this.editForm.reset(); - } - 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 => { - 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.deleteBrand(id , (data: any) => { - if (data['return_code'] === '000000') { - this.msg.success("成功！"); - this.getRequest(); - } else { - this.msg.error(data['return_msg']); - } - }); - } - -} diff --git a/src/app/pages/goods/goods-list/goods-list.component.html b/src/app/pages/goods/goods-list/goods-list.component.html deleted file mode 100644 index d285820..0000000 --- a/src/app/pages/goods/goods-list/goods-list.component.html +++ /dev/null @@ -1,464 +0,0 @@ -
-
-
- - 商品名称 - - - - -
-
- - 商品分类 - - - - -
-
- - 商品品牌 - - - - - - -
-
- - 商品类型 - - - - - - - -
-
- - 商品状态 - - - - - - - - -
- -
- - - -
-
-
- - - - - 商品名称 - 商品图片 - 商品类型 - 商品分类 - 商品品牌 - 创建时间 - 更新时间 - 状态 - 操作 - - - - - {{data.title}} - - - - {{data.type == 1 ? '实物商品' : '虚拟商品'}} - {{data.goodsTypeName}} - {{data.goodsBrandName}} - {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} - {{ data.updateTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.status | goodsStatus}} - - 修改 - - - 更多 - - - - - - - - - 总计 {{ total }} 条 - - - - -
- - 标题 - - - - - - - 商品分类 - - - - - - 商品类型 - - - - - - - - - 商品品牌 - - - - - - - - 商品标签 - - - - - - 商品说明 - - - - - - 列表图片 - - -
- -
上传图片
-
- - - - - - - - - - 轮播图片 - - -
- -
上传图片
-
- - - - - - - - - - 详情图片 - - -
- -
上传图片
-
- - - - - - - - - -
- - - - - - - - -
-
- - - - 规格名称 - 价格（RMB） - 图片 - - 库存（个） - 时间 - 虚拟产品 - 操作 - - - 售价 - 原价 - 销售截止时间 - 创建时间 - 卡密 - 归库天数 - 类型 - 产品来源 - 跳转类型 - 跳转地址 - 应用ID - - - - - - {{data.name}} - - ￥{{data.salePrice}} - - - ￥{{data.originalPrice}} - - - - - - {{data.stock}} - {{ data.salesEndTime | date: 'yyyy-MM-dd HH:mm'}} - {{ data.createTime | date: 'yyyy-MM-dd HH:mm'}} - {{data.key}} - {{data.validDay}} - {{data.type == 1 ? '内部虚拟商品' : '外部虚拟产品'}} - {{data.source | dictionary: 'GOODS_VPD_SOURCE'}} - {{data.jumpType == 1 ? '小程序' : 'H5'}} - {{data.jumpUrl}} - {{data.appid}} - - - 修改 - - 删除 - - - - - - - - - - -
- - 规格名称 - - - - - - - - - - - - 售卖价格 - - - - - - - - 原价 - - - - - - - - 库存 - - - - - - 有效天数 - - - - - - 售卖最终时间 - - - - - - 虚拟来源 - - - - - - - - 类型 - - - - - - - - - 卡密 - - - - - - 跳转类型 - - - - - - - - - 跳转地址 - - - - - - 应用ID - - - - - - 展示图片 - - -
- -
上传图片
-
- - - - - - - - - -
- - diff --git a/src/app/pages/goods/goods-list/goods-list.component.less b/src/app/pages/goods/goods-list/goods-list.component.less deleted file mode 100644 index 6d5c351..0000000 --- a/src/app/pages/goods/goods-list/goods-list.component.less +++ /dev/null @@ -1,12 +0,0 @@ -[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-list/goods-list.component.ts b/src/app/pages/goods/goods-list/goods-list.component.ts deleted file mode 100644 index c5304c1..0000000 --- a/src/app/pages/goods/goods-list/goods-list.component.ts +++ /dev/null @@ -1,470 +0,0 @@ -import { Component } from '@angular/core'; -import {DatePipe, NgForOf, NgIf, 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 {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms"; -import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload"; -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 { fallbackImg } from '../../../data/goods/goods.namespace'; -import {GoodsMsgData, GoodsTypeData, SpecsData} from "../../../model/goods.interface"; -import {NzDividerComponent} from "ng-zorro-antd/divider"; -import {NzIconDirective} from "ng-zorro-antd/icon"; -import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image"; -import {NzModalModule} from "ng-zorro-antd/modal"; -import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm"; -import { - NzTableComponent, NzTableModule, - NzTdAddOnComponent, -} from "ng-zorro-antd/table"; -import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select"; -import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe"; -import {GoodsStatusPipe} from "../../../pipes/goods/goods-status.pipe"; -import {NzConfigService} from "ng-zorro-antd/core/config"; -import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown"; -import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu"; -import { - NzInputNumberComponent, - NzInputNumberGroupComponent, - NzInputNumberGroupWhitSuffixOrPrefixDirective -} from "ng-zorro-antd/input-number"; -import {NzSpaceItemDirective} from "ng-zorro-antd/space"; -import {NzDatePickerComponent} from "ng-zorro-antd/date-picker"; -import {NzTypographyComponent} from "ng-zorro-antd/typography"; - -const getBase64 = (file: File): Promise => - new Promise((resolve, reject) => { - const reader = new FileReader(); - reader.readAsDataURL(file); - reader.onload = () => resolve(reader.result); - reader.onerror = error => reject(error); - }); - -@Component({ - selector: 'app-goods-list', - standalone: true, - imports: [ - FormsModule, - NzButtonComponent, - NzColDirective, - NzFormControlComponent, - NzFormDirective, - NzFormItemComponent, - NzFormLabelComponent, - NzInputDirective, - NzRowDirective, - ReactiveFormsModule, - NgForOf, - NzOptionComponent, - NzSelectComponent, - NzModalModule, - NgIf, - NzUploadComponent, - NzIconDirective, - NzImageModule, - NgStyle, - NzTableComponent, - NzTdAddOnComponent, - NzTableModule, - DictionaryPipe, - DatePipe, - NzImageDirective, - NzTreeSelectComponent, - NzDividerComponent, - NzPopconfirmDirective, - GoodsStatusPipe, - NzDropDownADirective, - NzDropDownDirective, - NzDropdownMenuComponent, - NzMenuDirective, - NzMenuItemComponent, - NzInputNumberComponent, - NzInputNumberGroupWhitSuffixOrPrefixDirective, - NzSpaceItemDirective, - NzInputNumberGroupComponent, - NzDatePickerComponent, - NzTypographyComponent - ], - templateUrl: './goods-list.component.html', - styleUrl: './goods-list.component.less' -}) -export class GoodsListComponent { - // 表单页数 - tablePageNum = 1; - // 表单数据 - tableData: any = { - total: 0, - loading: false, - list: [], - }; - // 搜索表单 - searchForm: FormGroup; - - // 图片 - listImg: NzUploadFile[] = [] - bannerImg: NzUploadFile[] = [] - detailImg: NzUploadFile[] = [] - showImg: NzUploadFile[] = [] - baseUrl = environment.baseUrl; - imageUrl = environment.imageUrl; - - // 展示图片 - previewImage: string | undefined = ''; - // 上传是否展示 - previewVisible = false; - - // 编辑产品类型表单 - editForm: FormGroup; - editSpecsForm: FormGroup; - // 编辑弹出框 - isVisibleEdit = false; - // 编辑商品规格弹出框 - isVisibleSpecs = false; - editSpecs = false; - loadingSpecs = false; - // 商品类型数据 - nodes = []; - nodesBrand = []; - nodesSpecs:SpecsData[] = []; - nodesVpdSource; - goodsMsg?: GoodsMsgData; - - - protected readonly fallbackImg = fallbackImg; - - constructor(private fb: NonNullableFormBuilder, - private msg: NzMessageService, - - private commonService: CommonService, - private goodsService: GoodsService) { - - this.nodesVpdSource = new DictionaryPipe().getDictionaryList('GOODS_VPD_SOURCE'); - - // 初始化搜索框 - this.searchForm = this.fb.group({ - title: [''], - goodsType: [''], - goodsBrand: [''], - type: [''], - status: [''], - }); - - // 初始化 - this.editForm = this.fb.group({ - title: ['' , [Validators.required]], - goodsType: ['' , [Validators.required]], - type: ['' , [Validators.required]], - goodsBrand: ['' , [Validators.required]], - id: [null], - goodsLabel: [''], - goodsExplain: [''], - }); - // 初始化 - this.editSpecsForm = this.fb.group({ - name: ['' , [Validators.required]], - // purLimit: ['' , [Validators.required]], - salePrice: ['' , [Validators.required]], - originalPrice: ['' , [Validators.required]], - stock: ['' , [Validators.required]], - validDay: ['' , [Validators.required]], - salesEndTime: ['' , [Validators.required]], - type: [''], - source: [''], - id: [null], - specsId: [null], - jumpType: [null], - jumpUrl: [null], - goodsId: [null], - appid: [null], - key: [''], - }); - this.getRequest(); - this.getGoodsTypeNode(); - this.getGoodsBrandNode(); - - } - - // 查询列表 - 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.getListGoods(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?: any) { - if (item != null) { - item.goodsBrand = String(item.goodsBrand); - item.type = String(item.type); - this.editForm.patchValue(item); - if (!this.commonService.whetherStringIsNull(item.listImg)) { - this.listImg = this.commonService.stitchImg(item.listImg); - } - if (!this.commonService.whetherStringIsNull(item.bannerImg)) { - this.bannerImg = this.commonService.stitchImg(item.bannerImg); - } - if (!this.commonService.whetherStringIsNull(item.detailImg)) { - this.detailImg = this.commonService.stitchImg(item.detailImg); - } - } else { - this.editForm.reset() - this.listImg = []; - this.bannerImg = []; - this.detailImg = []; - } - this.isVisibleEdit = true; - } - // 编辑表单提交 - handleEdit(): void { - - if (this.editForm.valid) { - - if (this.listImg.length === 0 || this.bannerImg.length === 0 || this.detailImg.length === 0) { - this.msg.error('相关图片未上传!'); - return; - } - - this.editForm.value.listImg = this.commonService.postImg(this.listImg); - this.editForm.value.bannerImg = this.commonService.postImg(this.bannerImg); - this.editForm.value.detailImg = this.commonService.postImg(this.detailImg); - - this.goodsService.editGoodsMsg(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 => { - 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.deleteGoodsMsg(id , (data: any) => { - if (data['return_code'] === '000000') { - this.msg.success("成功！"); - this.getRequest(); - } else { - this.msg.error(data['return_msg']); - } - }); - } - - // 删除 - deleteGoodsSpecs(id: number): void { - this.goodsService.deleteGoodsSpecs(id , (data: any) => { - if (data['return_code'] === '000000') { - this.msg.success("成功！"); - this.getSpecsList(); - } else { - this.msg.error(data['return_msg']); - } - }); - } - - // 获取商品分类 - getGoodsTypeNode() { - this.goodsService.getList({time: new Date().getTime()}, (data: any) => { - if (data['return_code'] === '000000') { - this.getNode(data['return_data']); - } - }); - } - - // 配置数据 - getNode(array: any): any { - array.forEach((item: any) => { - if (item.children) { - this.getNode(item.children); - }else { - item["isLeaf"] = true; - } - item["key"] = item.id; - - }); - this.nodes = array; - } - - // 获取商品品牌 - getGoodsBrandNode() { - this.goodsService.getListBrandAll( (data: any) => { - if (data['return_code'] == '000000') { - this.nodesBrand = data['return_data']; - } - }); - } - - // 弹出 - showSpecsList(data: any): void { - this.goodsMsg = data; - this.isVisibleSpecs = true; - - if (data.type == "1") { - this.editSpecsForm.controls['type'].clearValidators(); - this.editSpecsForm.controls['type'].markAsPristine(); - - this.editSpecsForm.controls['source'].clearValidators(); - this.editSpecsForm.controls['source'].markAsPristine(); - - this.editSpecsForm.controls['validDay'].clearValidators(); - this.editSpecsForm.controls['validDay'].markAsPristine(); - } else { - this.editSpecsForm.controls['type'].setValidators(Validators.required); - this.editSpecsForm.controls['type'].markAsDirty(); - - this.editSpecsForm.controls['source'].setValidators(Validators.required); - this.editSpecsForm.controls['source'].markAsDirty(); - - this.editSpecsForm.controls['validDay'].setValidators(Validators.required); - this.editSpecsForm.controls['validDay'].markAsDirty(); - } - this.editSpecsForm.controls['type'].updateValueAndValidity(); - this.editSpecsForm.controls['validDay'].updateValueAndValidity(); - this.editSpecsForm.controls['source'].updateValueAndValidity(); - - this.getSpecsList(); - } - - // 查询规格列表 - getSpecsList(): void { - this.loadingSpecs = true; - let params = { - id: this.goodsMsg?.id, - time: new Date().getTime() - } - this.goodsService.getGoodsSpecsList(params , (data: any) => { - this.loadingSpecs = false; - if (data['return_code'] == '000000') { - this.nodesSpecs = data['return_data']; - } - }); - } - // 添加规格 - showEditSpecs(item?: any): void { - - if (item != null) { - item.source = String(item.source); - item.type = String(item.type); - item.jumpType = String(item.jumpType); - this.editSpecsForm.patchValue(item); - if (!this.commonService.whetherStringIsNull(item.showImg)) { - this.showImg = this.commonService.stitchImg(item.showImg); - } - } else { - this.editSpecsForm.reset() - } - this.editSpecs = true; - } - - handleEditSpecs(): void { - if (this.editSpecsForm.valid) { - if (this.showImg.length !== 0) { - this.editSpecsForm.value.showImg = this.commonService.imgList(this.showImg); - } else { - this.msg.error("请上传展示图片"); - return; - } - this.editSpecsForm.value.goodsId = this.goodsMsg?.id; - this.goodsService.editGoodsSpecs(this.editSpecsForm.value , (data: any) => { - if (data['return_code'] === '000000') { - this.msg.success("成功！"); - this.editSpecs = false; - this.getSpecsList(); - } else { - this.msg.error(data['return_msg']); - } - }); - } else { - Object.values(this.editSpecsForm.controls).forEach(control => { - if (control.invalid) { - control.markAsDirty(); - control.updateValueAndValidity({ onlySelf: true }); - } - }); - } - } - - typeChange(type: string): void { - if (type == "1") { - this.editSpecsForm.controls['jumpType'].clearValidators(); - this.editSpecsForm.controls['jumpType'].markAsPristine(); - - - } else { - this.editSpecsForm.controls['jumpType'].setValidators(Validators.required); - this.editSpecsForm.controls['jumpType'].markAsDirty(); - - - } - this.editSpecsForm.controls['jumpType'].updateValueAndValidity(); - } - - jumpTypeChange(type: string): void { - console.log("type" , type); - if (type == "2") { - this.editSpecsForm.controls['appid'].clearValidators(); - this.editSpecsForm.controls['appid'].markAsPristine(); - } else { - this.editSpecsForm.controls['appid'].setValidators(Validators.required); - this.editSpecsForm.controls['appid'].markAsDirty(); - } - this.editSpecsForm.controls['appid'].updateValueAndValidity(); - } - - // 上下线 - goodsAudit(id: number): void { - let params = { - id: id, - time: new Date().getTime() - } - this.goodsService.goodsAudit(params , (data: any) => { - if (data['return_code'] === '000000') { - this.msg.success("成功！"); - this.getRequest(); - } else { - this.msg.error(data['return_msg']); - } - }); - } - - - -} diff --git a/src/app/pages/goods/goods-type/goods-type.component.html b/src/app/pages/goods/goods-type/goods-type.component.html deleted file mode 100644 index 6766bc9..0000000 --- a/src/app/pages/goods/goods-type/goods-type.component.html +++ /dev/null @@ -1,111 +0,0 @@ - - -
-
- - - - - 标题 - 业务类型 - 图片 - 创建时间 - 更新时间 - 操作 - - - - - - - - {{ item.title }} - - {{ item.businessType | dictionary: 'GOODS_TYPE' }} - - - - {{ item.createTime | date: 'yyyy-MM-dd HH:mm'}} - {{ item.updateTime | date: 'yyyy-MM-dd HH:mm'}} - - 编辑 - - 删除 - - - - - - - - - - - - - - -
- - 标题 - - - - - - 业务类型 - - - - - - - - 上级类型 - - - - - - 上传图片 - - -
- -
上传图片
-
- - - - - - - - - -
- - diff --git a/src/app/pages/goods/goods-type/goods-type.component.less b/src/app/pages/goods/goods-type/goods-type.component.less deleted file mode 100644 index 6d5c351..0000000 --- a/src/app/pages/goods/goods-type/goods-type.component.less +++ /dev/null @@ -1,12 +0,0 @@ -[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 deleted file mode 100644 index cfc94c3..0000000 --- a/src/app/pages/goods/goods-type/goods-type.component.ts +++ /dev/null @@ -1,255 +0,0 @@ -import { Component } from '@angular/core'; -import {FormGroup, FormsModule, NonNullableFormBuilder, ReactiveFormsModule, Validators} from "@angular/forms"; -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 {DatePipe, NgForOf, NgIf, NgStyle} from "@angular/common"; -import {NzOptionComponent, NzSelectComponent} from "ng-zorro-antd/select"; -import {GoodsTypeData} from "../../../model/goods.interface"; -import {NzModalModule} from "ng-zorro-antd/modal"; -import {DictionaryPipe} from "../../../pipes/common/dictionary.pipe"; -import {NzUploadComponent, NzUploadFile} from "ng-zorro-antd/upload"; -import {NzIconDirective} from "ng-zorro-antd/icon"; -import {NzMessageService} from "ng-zorro-antd/message"; -import {environment} from "../../../../environments/environment"; -import {CommonService} from "../../../services/common/common.service"; -import {GoodsService} from "../../../services/goods/goods.service"; -import {NzTableComponent, NzTableModule, NzTdAddOnComponent} from "ng-zorro-antd/table"; -import {NzImageDirective , NzImageModule} from "ng-zorro-antd/image"; -import {fallbackImg} from "../../../data/goods/goods.namespace"; -import {NzTreeSelectComponent} from "ng-zorro-antd/tree-select"; -import {NzDividerComponent} from "ng-zorro-antd/divider"; -import {it} from "node:test"; -import {NzPopconfirmDirective} from "ng-zorro-antd/popconfirm"; - -const getBase64 = (file: File): Promise => - new Promise((resolve, reject) => { - const reader = new FileReader(); - reader.readAsDataURL(file); - reader.onload = () => resolve(reader.result); - reader.onerror = error => reject(error); - }); - -@Component({ - selector: 'app-goods-type', - standalone: true, - imports: [ - FormsModule, - NzButtonComponent, - NzColDirective, - NzFormControlComponent, - NzFormDirective, - NzFormItemComponent, - NzFormLabelComponent, - NzInputDirective, - NzRowDirective, - ReactiveFormsModule, - NgForOf, - NzOptionComponent, - NzSelectComponent, - NzModalModule, - NgIf, - NzUploadComponent, - NzIconDirective, - NzImageModule, - NgStyle, - NzTableComponent, - NzTdAddOnComponent, - NzTableModule, - DictionaryPipe, - DatePipe, - NzImageDirective, - NzTreeSelectComponent, - NzDividerComponent, - NzPopconfirmDirective - ], - templateUrl: './goods-type.component.html', - styleUrl: './goods-type.component.less' -}) -export class GoodsTypeComponent { - - // 编辑产品类型表单 - editGoodSTypeForm: FormGroup; - // 列表数据 - listOfMapData: GoodsTypeData[] = []; - // 列表展示数据 - mapOfExpandedData: { [id: string]: GoodsTypeData[] } = {}; - - // 编辑弹出框 - isVisibleEdit = false; - // 商品類型數據字典 - goodsTypeArray; - // 上传等待 - loading = false; - // 图片 - imgUrl: NzUploadFile[] = [] - baseUrl = environment.baseUrl; - imageUrl = environment.imageUrl; - - // 展示图片 - previewImage: string | undefined = ''; - // 上传是否展示 - previewVisible = false; - nodes = []; - - constructor( - private fb: NonNullableFormBuilder, - private commonService: CommonService, - private goodsType: GoodsService, - private msg: NzMessageService - ) { - - this.getRequest(); - // 菜单类型 - this.goodsTypeArray = new DictionaryPipe().getDictionaryList('GOODS_TYPE'); - // 初始化 - this.editGoodSTypeForm = this.fb.group({ - title: ['' , [Validators.required]], - parentId: [''], - id: [null], - businessType: ['' ,[Validators.required]], - imgUrl: [''], - }); - - } - - getNode(array: any): any { - array.forEach((item: any) => { - if (item.children) { - this.getNode(item.children); - }else { - item["isLeaf"] = true; - } - item["key"] = item.id; - - }); - this.nodes = array; - } - - // 关闭 - collapse(array: GoodsTypeData[], data: GoodsTypeData, $event: boolean): void { - if (!$event) { - if (data.children) { - data.children.forEach(d => { - const target = array.find(a => a.id === d.id)!; - target.expand = false; - this.collapse(array, target, false); - }); - } else { - return; - } - } - } - - // 配置数据 - convertTreeToList(root: GoodsTypeData): GoodsTypeData[] { - const stack: GoodsTypeData[] = []; - const array: GoodsTypeData[] = []; - const hashMap = {}; - stack.push({ ...root, level: 0, expand: false }); - while (stack.length !== 0) { - const node = stack.pop()!; - this.visitNode(node, hashMap, array); - if (node.children) { - for (let i = node.children.length - 1; i >= 0; i--) { - stack.push({ ...node.children[i], level: node.level! + 1, expand: false, parent: node }); - } - } - } - return array; - } - - - - // 插入数据 - visitNode(node: GoodsTypeData, hashMap: { [key: string]: boolean }, array: GoodsTypeData[]): void { - if (!hashMap[node.id]) { - hashMap[node.id] = true; - array.push(node); - } - } - - - // 搜索表单提交 - getRequest(): void { - this.loading = true; - this.goodsType.getList({time: new Date().getTime()}, (data: any) => { - if (data['return_code'] === '000000') { - this.listOfMapData = data['return_data']; - this.getNode(this.listOfMapData); - this.listOfMapData.forEach(item => { - this.mapOfExpandedData[item.id] = this.convertTreeToList(item); - }); - } else { - this.msg.error(data['return_msg']); - } - this.loading = false; - }); - } - - // 唤醒编辑表单 - 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; - } - // 编辑表单提交 - handleEdit(): void { - if (this.editGoodSTypeForm.valid) { - if (this.imgUrl.length !== 0) { - this.editGoodSTypeForm.value.imgUrl = this.commonService.imgList(this.imgUrl); - } - this.goodsType.editGoodsType(this.editGoodSTypeForm.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.editGoodSTypeForm.controls).forEach(control => { - if (control.invalid) { - control.markAsDirty(); - control.updateValueAndValidity({ onlySelf: true }); - } - }); - } - - } - - // 删除 - delete(id: number): void { - this.goodsType.delete(id , (data: any) => { - if (data['return_code'] === '000000') { - this.msg.success("成功！"); - this.getRequest(); - } else { - this.msg.error(data['return_msg']); - } - }); - } - - // 上传操作 - handlePreview = async (file: NzUploadFile): Promise => { - console.log("数据" , file); - if (!file.url && !file['preview']) { - file['preview'] = await getBase64(file.originFileObj!); - } - this.previewImage = file.url || file['preview']; - this.previewVisible = true; - }; - - - protected readonly fallbackImg = fallbackImg; -} diff --git a/src/app/pages/goods/goods.module.ts b/src/app/pages/goods/goods.module.ts deleted file mode 100644 index 5abd5d7..0000000 --- a/src/app/pages/goods/goods.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - - - -@NgModule({ - declarations: [], - imports: [ - CommonModule - ] -}) -export class GoodsModule { } diff --git a/src/app/pages/goods/goods.routes.ts b/src/app/pages/goods/goods.routes.ts deleted file mode 100644 index 5fe8d36..0000000 --- a/src/app/pages/goods/goods.routes.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { Routes } from '@angular/router'; -import {GoodsTypeComponent} from "./goods-type/goods-type.component"; -import {GoodsBrandComponent} from "./goods-brand/goods-brand.component"; -import {GoodsListComponent} from "./goods-list/goods-list.component"; - - -export const GOODS_ROUTES: Routes = [ - { path: 'goods_type', component: GoodsTypeComponent}, - { path: 'goods_brand', component: GoodsBrandComponent}, - { path: 'goods-list', component: GoodsListComponent}, - -]; diff --git a/src/app/pages/index/index/index.component.html b/src/app/pages/index/index/index.component.html index 54c2e44..e69de29 100644 --- a/src/app/pages/index/index/index.component.html +++ b/src/app/pages/index/index/index.component.html @@ -1,64 +0,0 @@ -

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

-

首页

diff --git a/src/app/pages/login/login/login.component.html b/src/app/pages/login/login/login.component.html index 40003d9..ffc91d8 100644 --- a/src/app/pages/login/login/login.component.html +++ b/src/app/pages/login/login/login.component.html @@ -11,7 +11,7 @@
-

普惠GO 后台登录

+

嗨加油管理端