调整修改活动金

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>

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']);
       }

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>
+                <nz-divider *ngIf="data.status==1" nzType="vertical"></nz-divider>
-                <a (click)="disbursementAmount(data.batchIdentifier)">发放</a>
+                <a *ngIf="data.status==1" (click)="disbursementAmount(data.batchIdentifier)">发放</a>
             </td>
         </tr>
         </tbody>