From 09ec482cd9e8507f3c370cb755a4ce4e181c2169 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Thu, 27 Feb 2025 16:06:06 +0800 Subject: [PATCH] 1 --- .../jd-goods-list.component.html | 12 +++ .../jd-goods-list/jd-goods-list.component.ts | 1 + .../goods-list/goods-list.component.html | 93 ++++++++++--------- .../trade/goods-list/goods-list.component.ts | 1 + .../goods-logistics-list.component.html | 79 ++++++++++------ .../goods-logistics-list.component.ts | 4 +- 6 files changed, 119 insertions(+), 71 deletions(-) diff --git a/src/app/pages/goods/jd-goods-list/jd-goods-list.component.html b/src/app/pages/goods/jd-goods-list/jd-goods-list.component.html index 70a6cbc..b853069 100644 --- a/src/app/pages/goods/jd-goods-list/jd-goods-list.component.html +++ b/src/app/pages/goods/jd-goods-list/jd-goods-list.component.html @@ -8,6 +8,14 @@ +
+ + 商品规格编码 + + + + +
商品分类 @@ -74,12 +82,14 @@ [nzData]="tableData.list" > + 商品规格编码 一级分类 二级分类 品牌名称 商品名称 列表图 售卖价格 + 成本价 京东价 原价 sku编码 @@ -87,6 +97,7 @@ + {{data.id}} {{data.goodsTypeParentName}} {{data.goodsTypeName}} {{data.goodsBrandName}} @@ -95,6 +106,7 @@ ¥{{data.salePrice}} + ¥{{data.costPrice}} ¥{{data.thirdPrice}} ¥{{data.originalPrice}} {{data.thirdId}} diff --git a/src/app/pages/goods/jd-goods-list/jd-goods-list.component.ts b/src/app/pages/goods/jd-goods-list/jd-goods-list.component.ts index f6351ca..39690dd 100644 --- a/src/app/pages/goods/jd-goods-list/jd-goods-list.component.ts +++ b/src/app/pages/goods/jd-goods-list/jd-goods-list.component.ts @@ -127,6 +127,7 @@ export class JdGoodsListComponent { title: [''], goodsType: [''], goodsBrand: [''], + id: [''], salePriceS: [''], salePriceE: [''], }); diff --git a/src/app/pages/trade/goods-list/goods-list.component.html b/src/app/pages/trade/goods-list/goods-list.component.html index 3bb9324..cdcd1b2 100644 --- a/src/app/pages/trade/goods-list/goods-list.component.html +++ b/src/app/pages/trade/goods-list/goods-list.component.html @@ -1,6 +1,13 @@
- +
+ + 商品名称 + + + + +
物流订单号 @@ -29,71 +36,67 @@
- 完成时间 - - - - -
-
- - 创建时间 + 子订单号 - +
-
+
- 商户 + 支付状态 - - + +
-
+
- 商品名称 + 用户手机号 - +
- -
+
- 子订单号 + 商品分类 - +
+
- 用户手机号 + 商品规格编码 - +
-
+
- 商品分类 + 商户 - + + +
+ +
商品品牌 @@ -104,8 +107,6 @@
- -
支付类型 @@ -118,25 +119,29 @@
- 支付状态 + 完成时间 - - - +
- @@ -155,6 +160,7 @@ 商品名称 商户名称 + 商品规格编码 商品图片 商品分类 商品品牌 @@ -175,6 +181,7 @@ {{data.goodsName}} - {{data.goodsSpecsName}} {{data.merName}} + {{data.goodsSpecsId}} diff --git a/src/app/pages/trade/goods-list/goods-list.component.ts b/src/app/pages/trade/goods-list/goods-list.component.ts index 328870a..a6cf43b 100644 --- a/src/app/pages/trade/goods-list/goods-list.component.ts +++ b/src/app/pages/trade/goods-list/goods-list.component.ts @@ -157,6 +157,7 @@ export class GoodsListComponent { goodsType: [''], goodsBrand: [''], merId: [''], + goodsSpecsId: [''], userPhone: [''], goodsSpecsName: [''], createTimeArray: [[]], diff --git a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html index b2d784f..49fff68 100644 --- a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html +++ b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.html @@ -1,23 +1,22 @@
-
+
- 物流订单号 + 商品名称 - +
- 订单号 + 物流订单号 - +
-
物流状态 @@ -30,39 +29,32 @@
- 创建时间 - - - - -
-
- - 商户 + 订单号 - - - +
-
+
- 商品名称 + 子订单号 - +
-
+ +
- 子订单号 + 支付状态 - + + +
-
+
用户手机号 @@ -71,7 +63,7 @@
-
+
商品分类 @@ -84,6 +76,28 @@
+ +
+ + 商品规格编码 + + + + +
+ +
+ + 商户 + + + + + + +
+ +
商品品牌 @@ -94,7 +108,6 @@
-
支付类型 @@ -106,6 +119,16 @@
+
+ + 创建时间 + + + + +
+ +
@@ -132,6 +155,7 @@ 商品名称 商户名称 + 商品规格编码 商品图片 商品分类 商品品牌 @@ -151,6 +175,7 @@ {{data.goodsName}} - {{data.goodsSpecsName}} {{data.merName}} + {{data.goodsSpecsId}} diff --git a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts index 8eea57e..485e47c 100644 --- a/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts +++ b/src/app/pages/trade/goods-logistics-list/goods-logistics-list.component.ts @@ -17,7 +17,7 @@ import {NzImageDirective, NzImageModule} from "ng-zorro-antd/image"; import {NzIconDirective} from "ng-zorro-antd/icon"; import {NzBadgeComponent} from "ng-zorro-antd/badge"; -import {fallbackImg, logisticsStatus, orderPayType} from '../../../data/goods/goods.namespace'; +import {fallbackImg, logisticsStatus, orderGoodsChild, orderPayType} from '../../../data/goods/goods.namespace'; import {NzDividerComponent} from "ng-zorro-antd/divider"; import {NzDropDownADirective, NzDropDownDirective, NzDropdownMenuComponent} from "ng-zorro-antd/dropdown"; import {NzMenuDirective, NzMenuItemComponent} from "ng-zorro-antd/menu"; @@ -147,6 +147,7 @@ export class GoodsLogisticsListComponent { goodsBrand: [''], merId: [''], userPhone: [''], + goodsSpecsId: [''], goodsSpecsName: [''], createTimeArray: [[]], createTimeSelect: ['1'], @@ -322,4 +323,5 @@ export class GoodsLogisticsListComponent { } + protected readonly orderGoodsChild = orderGoodsChild; }