diff --git a/src/app/admin/recharge-order/price-list/price-list.component.html b/src/app/admin/recharge-order/price-list/price-list.component.html index cd5b651..58ee89c 100644 --- a/src/app/admin/recharge-order/price-list/price-list.component.html +++ b/src/app/admin/recharge-order/price-list/price-list.component.html @@ -68,6 +68,7 @@ 编号 金额类型 充值类型 + 展示区域 充值金额 @@ -81,7 +82,7 @@ {{i + 1}} {{data.type | rechargePrice}} {{data.rechargeType== 1? '快充':'慢充'}} - + {{data.showType | showType}} {{data.price}} {{data.realPrice}} @@ -107,6 +108,16 @@ + + 展示区域 + + + + + + + + 充值类型 diff --git a/src/app/admin/recharge-order/price-list/price-list.component.ts b/src/app/admin/recharge-order/price-list/price-list.component.ts index 0f7cd55..997e4ae 100644 --- a/src/app/admin/recharge-order/price-list/price-list.component.ts +++ b/src/app/admin/recharge-order/price-list/price-list.component.ts @@ -57,7 +57,7 @@ export class PriceListComponent implements OnInit { price: [null, [Validators.required]], rechargeType: [null, [Validators.required]], realPrice: [{value: null, disabled: true}, [Validators.required]], - // goodsId: [null, [Validators.required]], + showType: [null, [Validators.required]], discount: [null, [Validators.required]], sort: [null, [Validators.required]], // channel: [null, [Validators.required]], diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts index 24cc92b..a2862fd 100644 --- a/src/app/app-common.module.ts +++ b/src/app/app-common.module.ts @@ -36,6 +36,7 @@ import { import { PreOrderStatusPipe } from './pipes/order/pre-order-status.pipe'; import { ButtonPipe } from './pipes/commons/button.pipe'; import { DiscountPackageStatusPipe } from './pipes/discount-package-status.pipe'; +import { ShowTypePipe } from './pipes/show-type.pipe'; @@ -66,6 +67,7 @@ const PIPES = [ PreOrderStatusPipe, ButtonPipe, DiscountPackageStatusPipe, + ShowTypePipe, ]; @@ -79,6 +81,7 @@ const PIPES = [ ], declarations: [ ...PIPES, + ], exports: [ diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts index 59570c6..fe1666b 100644 --- a/src/app/pipes/index.ts +++ b/src/app/pipes/index.ts @@ -23,3 +23,4 @@ export * from './audit/refund-status.pipe'; export * from './order/pre-order-status.pipe'; export * from './commons/button.pipe'; export * from './discount-package-status.pipe'; +export * from './show-type.pipe';