1

src/app/admin/recharge-order/order-list/order-list.component.html

@@ -108,7 +108,7 @@
             (nzPageSizeChange)="getRequest(false , searchForm.value)">
         <thead nzSingleSort>
         <tr>
-            <th nzWidth="50px">编号</th>
+            <th nzWidth="80px">编号</th>
             <th nzWidth="180px">订单名称</th>
             <th nzWidth="180px">订单类型</th>
             <th nzWidth="180px">订单号</th>
@@ -118,7 +118,7 @@
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="140px">生成时间</th>
             <th nzWidth="100px" nzRight>状态</th>
-            <th nzWidth="150px" nzRight>操作</th>
+            <th nzWidth="200px" nzRight>操作</th>
         </tr>
         </thead>
         <tbody>
@@ -135,6 +135,7 @@
             <td nzRight>{{data.status | rechargeStatus}}</td>
             <td nzRight class="table-td-operation">
                 <a  (click)="getDetail(data.id)">详情</a>
+                <a *ngIf="data.status === 2" (click)="finishOrder(data.id)">完成充值</a>
                 <a *ngIf="data.status === 2" (click)="orderToRefund(data.id)">退款</a>
             </td>
         </tbody>
@@ -162,7 +163,7 @@
     </nz-descriptions>
     <div *nzModalFooter>
         <button nz-button nzType="default" (click)="handleCancel()">取消</button>
-        <button nz-button nzType="primary" (click)="handleOk()">完成充值</button>
+        <button nz-button *ngIf="data['status'] === 2" nzType="primary" (click)="finishOrder(id)">完成充值</button>
     </div>
 </nz-modal>
 

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;

src/app/admin/recharge-order/user/user.component.html

@@ -85,7 +85,7 @@
         <tbody>
         <tr *ngFor="let data of ajaxTable.data; let i = index">
             <td>{{i + 1}}</td>
-            <td>{{KEY + data.agentKey}}</td>
+            <td nzBreakWord>{{KEY + data.agentKey}}</td>
             <td>{{data.agentName}}</td>
             <td>{{data.agentAddress}}</td>
             <td>{{data.agentUser}}</td>

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=',
 };

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=',
 };