From 893465522844d143fa0d2f8d697be3b75920dc8a Mon Sep 17 00:00:00 2001
From: Sum1Dream <418471657@qq.com>
Date: Mon, 30 May 2022 11:38:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=87=AA=E5=BB=BA=E7=AB=99?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=B0=E8=AF=9D=E8=B4=B9=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../recharge-order/order-list/order-list.component.html   | 4 ++--
 src/app/pipes/recharge-status.pipe.ts                     | 4 ++--
 src/environments/environment.ts                           | 8 ++++----
 3 files changed, 8 insertions(+), 8 deletions(-)

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 6d700a0..56890d9 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
@@ -163,7 +163,7 @@
             <th nzWidth="100px">支付金额</th>
             <th nzWidth="140px">生成时间</th>
             <th nzWidth="100px" nzRight>支付方式</th>
-            <th nzWidth="300px" nzRight>充值状态</th>
+            <th nzWidth="90px" nzRight>充值状态</th>
             <th nzWidth="100px" nzRight>订单状态</th>
             <th nzWidth="200px" nzRight>操作</th>
         </tr>
@@ -196,7 +196,7 @@
     </nz-table>
 </div>
 
-<nz-modal [(nzVisible)]="isVisible" nzTitle="订单详情" nzWidth="1200">
+<nz-modal [(nzVisible)]="isVisible" nzTitle="订单详情" nzWidth="1200" (nzOnOk)="isVisible = false" (nzOnCancel)="isVisible = false">
     <nz-descriptions nzBordered [nzColumn]="{ xxl: 4, xl: 3, lg: 3, md: 3, sm: 2, xs: 1 }">
         <nz-descriptions-item nzTitle="订单名称">{{data['remarks']}}</nz-descriptions-item>
         <nz-descriptions-item nzTitle="订单类型">{{data['rechargeModel'] | rechargePrice}}</nz-descriptions-item>
diff --git a/src/app/pipes/recharge-status.pipe.ts b/src/app/pipes/recharge-status.pipe.ts
index e659165..9a832e2 100644
--- a/src/app/pipes/recharge-status.pipe.ts
+++ b/src/app/pipes/recharge-status.pipe.ts
@@ -14,9 +14,9 @@ export class RechargeStatusPipe implements PipeTransform {
       case 3:
         return '已完成';
       case 4:
-        return '已退款';
-      case 5:
         return '已取消';
+      case 5:
+        return '已退款';
       case 6:
         return '退款中';
     }
diff --git a/src/environments/environment.ts b/src/environments/environment.ts
index 0f97376..5a795b3 100644
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@@ -4,10 +4,10 @@
 
 export const environment = {
   production: false,
-  baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'http://localhost:9302/filesystem/',
-/*  baseUrl: 'https://hsgcs.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
-  imageUrl: 'https://hsgcs.dctpay.com/filesystem/',*/
+  // baseUrl: 'http://localhost:9302/brest/', // 测试环境服务器地址(请求数据地址)
+  // imageUrl: 'http://localhost:9302/filesystem/',
+  baseUrl: 'https://hsg.dctpay.com/brest/', // 测试环境服务器地址(请求数据地址)
+  imageUrl: 'https://hsg.dctpay.com/filesystem/',
   key: 'https://hsgcs.dctpay.com/phone-recharge-H5/index.html?codeValue=',
   inviteUrl: 'https://hsgcs.dctpay.com/wx/?action=ic&id=',
 };