From ff8c72397a5212996c6881823c9622b780577387 Mon Sep 17 00:00:00 2001
From: youmengting <2080639302@qq.com>
Date: Wed, 1 Nov 2023 18:05:21 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BF=AE=E6=94=B9=E6=B4=BB?=
 =?UTF-8?q?=E5=8A=A8=E9=87=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../merchant-allocation/merchant-allocation.component.html  | 2 +-
 .../prize-pool-detail/prize-pool-detail.component.ts        | 2 +-
 .../activity-money/prize-pool/prize-pool.component.html     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.html b/src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.html
index 7b2172b..85e3e57 100644
--- a/src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.html
+++ b/src/app/admin/activity-money/merchant-allocation/merchant-allocation.component.html
@@ -41,7 +41,7 @@
                 <nz-form-label [nzSpan]="8">状态</nz-form-label>
                 <nz-form-control [nzSpan]="14">
                     <nz-select nzAllowClear formControlName="status">
-                        <nz-option nzLabel="不可用" nzValue="0"></nz-option>
+                        <!-- <nz-option nzLabel="不可用" nzValue="0"></nz-option> -->
                         <nz-option nzLabel="正常" nzValue="1"></nz-option>
                         <nz-option nzLabel="冻结" nzValue="2"></nz-option>
                     </nz-select>
diff --git a/src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.ts b/src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.ts
index 497b02f..eaeebfb 100644
--- a/src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.ts
+++ b/src/app/admin/activity-money/prize-pool-detail/prize-pool-detail.component.ts
@@ -59,7 +59,7 @@ export class PrizePoolDetailComponent implements OnInit {
     this.activityMoneyService.exportRewardRoster(params, data => {
       if (data['return_code'] === '000000') {
         // window.location.href = this.FILE_URL + data['return_data'];
-        window.open(this.FILE_URL + data['return_data']);
+        window.open(data['return_data']);
       } else {
         this.message.error(data['return_msg']);
       }
diff --git a/src/app/admin/activity-money/prize-pool/prize-pool.component.html b/src/app/admin/activity-money/prize-pool/prize-pool.component.html
index 69be025..f1857cc 100644
--- a/src/app/admin/activity-money/prize-pool/prize-pool.component.html
+++ b/src/app/admin/activity-money/prize-pool/prize-pool.component.html
@@ -20,7 +20,7 @@
                   <nz-form-label [nzSpan]="8">奖池状态</nz-form-label>
                   <nz-form-control [nzSpan]="14">
                       <nz-select nzAllowClear formControlName="status">
-                          <nz-option nzLabel="不可用" nzValue="0"></nz-option>
+                          <!-- <nz-option nzLabel="不可用" nzValue="0"></nz-option> -->
                           <nz-option nzLabel="未发放" nzValue="1"></nz-option>
                           <nz-option nzLabel="已发放" nzValue="2"></nz-option>
                       </nz-select>
@@ -83,8 +83,8 @@
            
             <td nzRight="0px" class="table-td-operation">
                 <a [routerLink]="['/admin/activity-money/prize-pool-detail']" [queryParams]="{batchIdentifier: data.batchIdentifier}">详情</a>
-                <nz-divider nzType="vertical"></nz-divider>
-                <a (click)="disbursementAmount(data.batchIdentifier)">发放</a>
+                <nz-divider *ngIf="data.status==1" nzType="vertical"></nz-divider>
+                <a *ngIf="data.status==1" (click)="disbursementAmount(data.batchIdentifier)">发放</a>
             </td>
         </tr>
         </tbody>