From f0c2c6cfa46e565f11179d798dadd61c3d734813 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 24 Jan 2022 23:46:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../price-list/price-list.component.html            | 13 ++++++++++++-
 .../price-list/price-list.component.ts              |  2 +-
 src/app/app-common.module.ts                        |  3 +++
 src/app/pipes/index.ts                              |  1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

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 @@
             <th>编号</th>
             <th>金额类型</th>
             <th>充值类型</th>
+            <th>展示区域</th>
 <!--            <th>供货商编号</th>-->
 <!--            <th>商品ID</th>-->
             <th>充值金额</th>
@@ -81,7 +82,7 @@
             <td>{{i + 1}}</td>
             <td>{{data.type | rechargePrice}}</td>
             <td>{{data.rechargeType== 1? '快充':'慢充'}}</td>
-<!--            <td>{{data.channel}}</td>-->
+            <td>{{data.showType | showType}}</td>
 <!--            <td>{{data.goodsId}}</td>-->
             <td>{{data.price}}</td>
             <td>{{data.realPrice}}</td>
@@ -107,6 +108,16 @@
                 </nz-select>
             </nz-form-control>
         </nz-form-item>
+        <nz-form-item >
+            <nz-form-label [nzSpan]="6" nzRequired>展示区域</nz-form-label>
+            <nz-form-control [nzSpan]="16" nzErrorTip="请选择展示区域!">
+                <nz-select nzShowSearch nzAllowClear formControlName="showType" nzPlaceHolder="请选择展示区域">
+                    <nz-option nzLabel="小程序" [nzValue] ="1"></nz-option>
+                    <nz-option nzLabel="H5" [nzValue] ="2"></nz-option>
+                    <nz-option nzLabel="银联" [nzValue] ="3"></nz-option>
+                </nz-select>
+            </nz-form-control>
+        </nz-form-item>
         <nz-form-item >
             <nz-form-label [nzSpan]="6" nzRequired>充值类型</nz-form-label>
             <nz-form-control [nzSpan]="16" nzErrorTip="请选择充值类型!">
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';