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 767bfb1..4223931 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 @@ -108,7 +108,7 @@ (nzPageSizeChange)="getRequest(false , searchForm.value)"> - 编号 + 编号 订单名称 订单类型 订单号 @@ -118,7 +118,7 @@ 支付金额 生成时间 状态 - 操作 + 操作 @@ -135,6 +135,7 @@ {{data.status | rechargeStatus}} 详情 + 完成充值 退款 @@ -162,7 +163,7 @@
- +
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 bedb2be..e052a5b 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 @@ -59,7 +59,7 @@ export class OrderListComponent implements OnInit , OnDestroy { }); } }); - }, 5000); + }, 10000); } // 销毁 @@ -140,10 +140,11 @@ export class OrderListComponent implements OnInit , OnDestroy { this.isVisible = false; } - handleOk(): void { + + public finishOrder(id: number): void { this.common.showConfirm('确认订单是否完成充值', item => { if (item) { - this.recharge.finishOrder(this.id, data => { + this.recharge.finishOrder(id, data => { if (data['return_code'] === '000000') { this.getRequest(false, this.searchForm.value); this.isVisible = false; diff --git a/src/app/admin/recharge-order/user/user.component.html b/src/app/admin/recharge-order/user/user.component.html index bef91e7..afe5475 100644 --- a/src/app/admin/recharge-order/user/user.component.html +++ b/src/app/admin/recharge-order/user/user.component.html @@ -85,7 +85,7 @@ {{i + 1}} - {{KEY + data.agentKey}} + {{KEY + data.agentKey}} {{data.agentName}} {{data.agentAddress}} {{data.agentUser}} diff --git a/src/environments/environment.prod.ts b/src/environments/environment.prod.ts index 2e60ec0..186a848 100644 --- a/src/environments/environment.prod.ts +++ b/src/environments/environment.prod.ts @@ -2,4 +2,5 @@ export const environment = { production: true, baseUrl: 'https://hsg.dctpay.com/brest/', // 正式环境服务器地址(请求数据地址) imageUrl: 'https://hsg.dctpay.com/filesystem/', + key: 'https://hsg.dctpay.com/phone-recharge-H5/index.html?codeValue=', }; diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index cee7c78..8b919a7 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -2,4 +2,5 @@ export const environment = { production: true, baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址) imageUrl: 'https://hsgcs.dctpay.com/filesystem/', + key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=', };