diff --git a/src/app/admin/recharge-order/order-list/order-list.component.html b/src/app/admin/recharge-order/order-list/order-list.component.html index 4223931..cfe29ce 100644 --- a/src/app/admin/recharge-order/order-list/order-list.component.html +++ b/src/app/admin/recharge-order/order-list/order-list.component.html @@ -27,38 +27,50 @@ 充值类型 - - - + + +
- 充值内容 + 支付方式 - + + + + +
- 订单号 + 充值号码 - +
-
- 用户电话 + 订单号 - +
+ + + + + + + + +
支付时间 @@ -67,14 +79,14 @@
-
- - 创建时间 - - - - -
+ + + + + + + +
@@ -117,6 +129,7 @@ 充值金额 支付金额 生成时间 + 支付方式 状态 操作 @@ -132,11 +145,12 @@ {{data.orderPrice}} {{data.payPrice}} {{data.createTimed | date: 'yyyy-MM-dd HH:mm:ss'}} + {{data.payType | rechargePayType}} {{data.status | rechargeStatus}} 详情 完成充值 - 退款 + 退款 diff --git a/src/app/admin/recharge-order/order-list/order-list.component.ts b/src/app/admin/recharge-order/order-list/order-list.component.ts index e052a5b..1952074 100644 --- a/src/app/admin/recharge-order/order-list/order-list.component.ts +++ b/src/app/admin/recharge-order/order-list/order-list.component.ts @@ -77,6 +77,7 @@ export class OrderListComponent implements OnInit , OnDestroy { rechargeContent: [null], userPhone: [null], payTime: [null], + payType: [null], createTime: [null], }); this.validateForm = this.form.group({ @@ -163,8 +164,8 @@ export class OrderListComponent implements OnInit , OnDestroy { if (item) { this.recharge.orderToRefund(id, data => { if (data['return_code'] === '000000') { - this.getRequest(false, this.searchForm.value); this.message.success('退款成功'); + this.getRequest(false, this.searchForm.value); } else { this.message.error(data['return_msg']); } diff --git a/src/app/app-common.module.ts b/src/app/app-common.module.ts index 4792be4..1c01c4b 100644 --- a/src/app/app-common.module.ts +++ b/src/app/app-common.module.ts @@ -28,7 +28,8 @@ import { RechargeStatusPipe, ChannelMarkPipe, TypePipe, - StatusPipe + StatusPipe, + RechargePayTypePipe } from './pipes'; @@ -53,6 +54,7 @@ const PIPES = [ ChannelMarkPipe, TypePipe, StatusPipe, + RechargePayTypePipe, ]; diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts index cee07d9..699ae4a 100644 --- a/src/app/pipes/index.ts +++ b/src/app/pipes/index.ts @@ -17,3 +17,4 @@ export * from './recharge-status.pipe'; export * from './channel-mark.pipe'; export * from './activate/type.pipe'; export * from './activate/status.pipe'; +export * from './recharge-pay-type.pipe';