From 94c249c0624144a0ec2314d255ab469942a45360 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 17 Jul 2024 17:08:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pages/trade/order-oil-list/order-oil-list.component.html    | 2 +-
 src/app/pages/trade/order-oil-list/order-oil-list.component.ts  | 2 +-
 src/app/pipes/common/date-minutes-diff.pipe.ts                  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.html b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
index b776ff3..98f8289 100644
--- a/src/app/pages/trade/order-oil-list/order-oil-list.component.html
+++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.html
@@ -228,7 +228,7 @@
       <nz-dropdown-menu #menu="nzDropdownMenu">
         <ul nz-menu nzSelectable>
           <li nz-menu-item (click)="showOrderDetail(data.orderNo)">交易详情</li>
-          <li *ngIf="data.status == 2 && GAS_REFUND_BTN && (accountType == 2 || accountType == 3)?(data.payTime | dateMinutesDiff: data.payTime) <= 30:true" (click)="showRefund(data.orderNo, data.orderChildNo)" nz-menu-item>交易退款</li>
+          <li *ngIf="data.status == 2 && GAS_REFUND_BTN && (accountType == 2 || accountType == 3?(data.payTime | dateMinutesDiff: data.payTime) <=30:true)" (click)="showRefund(data.orderNo, data.orderChildNo)" nz-menu-item>交易退款</li>
           <li *ngIf="data.channelType == 1 && data.status == 2 && GAS_ORDER_PRINT_BTN" (click)="showOrderPrint(data.orderNo);" nz-menu-item>打印小票</li>
         </ul>
       </nz-dropdown-menu>
diff --git a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
index e4168fa..52810bf 100644
--- a/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
+++ b/src/app/pages/trade/order-oil-list/order-oil-list.component.ts
@@ -146,7 +146,6 @@ export class OrderOilListComponent {
   refundForm: FormGroup;
   GAS_REFUND_BTN = new ButtonPipe().isButton("GAS_REFUND");
   GAS_ORDER_PRINT_BTN = new ButtonPipe().isButton("GAS_ORDER_PRINT_BTN");
-
   constructor(private fb: NonNullableFormBuilder,
               private orderOilService : OrderOilService,
               private agentService : AgentService,
@@ -156,6 +155,7 @@ export class OrderOilListComponent {
               private message: NzMessageService,
               private modal: NzModalService) {
     this.accountType = this.storage.get(DATA)['account']['objectType'];
+    console.log(this.GAS_REFUND_BTN);
 
     // 退款提示模态框
     this.refundForm = this.fb.group({
diff --git a/src/app/pipes/common/date-minutes-diff.pipe.ts b/src/app/pipes/common/date-minutes-diff.pipe.ts
index f3f4e84..e61d38a 100644
--- a/src/app/pipes/common/date-minutes-diff.pipe.ts
+++ b/src/app/pipes/common/date-minutes-diff.pipe.ts
@@ -11,6 +11,7 @@ export class DateMinutesDiffPipe implements PipeTransform {
 
 
   transform(newTime: number | Date, olbTime: number | Date): number {
+    console.log('123');
     var diffTimeStamp = new Date().getTime() - new Date(olbTime).getTime();
     return parseInt(String(diffTimeStamp / (1000 * 60)));
   }