From 6157d97f0483d48b024ba50e617c6cefd0c8eff2 Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Fri, 19 May 2023 11:35:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=95=86=E5=93=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile-recharge-order-list.component.html          | 10 +++++++++-
 .../mobile-recharge-order-list.component.ts            |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html
index d7aee1f..52e119c 100644
--- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html
+++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.html
@@ -195,8 +195,9 @@
                     <nz-dropdown-menu #menu="nzDropdownMenu">
                         <ul nz-menu nzSelectable>
                             <li nz-menu-item (click)="showOrderDetail(data.orderNo)"><a>详情</a></li>
-                            <li nz-menu-item *ngIf="data.exceptionStatus === true && data.orderStatus=== 2" (click)="refundOrder(data.orderNo)"><a>订单退款</a></li>
                             <li nz-menu-item *ngIf="data.exceptionStatus === true" (click)="orderNormal(data.orderNo)"><a>异常转正常</a></li>
+                            <li nz-menu-item *ngIf="data.exceptionStatus === true && data.orderStatus=== 2" (click)="refundOrder(data.orderNo)"><a>订单退款</a></li>
+
                         </ul>
                     </nz-dropdown-menu>
                 </td>
@@ -275,6 +276,8 @@
                         <th nzWidth="200px">充值内容</th>
                         <th nzWidth="200px">查询内容</th>
                         <th nzWidth="100px">创建时间</th>
+                        <th nzRight nzWidth="100px">更新时间</th>
+
                     </tr>
                     </thead>
                     <tbody>
@@ -285,10 +288,15 @@
                         <td>{{data.ext1}}</td>
                         <td>{{data.ext3}}</td>
                         <td>{{data['createTime'] | date: 'yyyy-MM-dd HH:mm'}}</td>
+                        <td nzRight>{{data['updateTime'] | date: 'yyyy-MM-dd HH:mm:ss'}}</td>
                     </tr>
                     </tbody>
                 </nz-table>
             </nz-tab>
         </nz-tabset>
     </nz-spin>
+    <div *nzModalFooter>
+
+        <button *ngIf="orderDetailObject.tradeOrder.exceptionStatus === true" nz-button nzType="primary" (click)="orderNormal(orderDetailObject.tradeOrder.orderNo)">异常转正常</button>
+    </div>
 </nz-modal>
diff --git a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
index e9287d1..f49c1a3 100644
--- a/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
+++ b/src/app/admin/order-manage/mobile-recharge-order-list/mobile-recharge-order-list.component.ts
@@ -200,6 +200,10 @@ export class MobileRechargeOrderListComponent implements OnInit {
 
     public orderNormal(orderNo: string): void {
 
+        if (this.orderDetailModal) {
+            this.orderDetailModal = false;
+        }
+
         this.loadingObject.status = true;
         this.loadingObject.title = '修改中...';
         this.orderMobileRechargeService.orderNormal(orderNo , data => {