Rainie/bbq
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
Lingzi
2022-04-02 15:55:28 +08:00
parent 6007b0b727
commit ab9b88046d
122 changed files with 155 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/routes/usercenter/components/driver/captain/captain-detail/captain-detail.component.html
View File

@ -6,7 +6,7 @@
</button>
</ng-template>
<ng-template #content>
<nz-skeleton [nzLoading]="false">
<nz-skeleton [nzLoading]="service.http.loading">
<div class="user-info">
<img [src]="userDetail?.avatar" />
<div style="flex: 1">
@ -16,11 +16,11 @@
<nz-badge nzStatus="warning" nzText="冻结" *ngIf="userDetail?.stateLocked" class="ml-xs"> </nz-badge>
</p>
<div style="margin-right: 24px">
<button *ngIf="userDetail?.stateLocked" [nzLoading]="false" nz-button nzType="primary"
<button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary"
nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-DRIVER-CAPTAIN-DETAIL-lock']">
启用
</button>
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="false" nz-button nzDanger nzGhost
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-DRIVER-CAPTAIN-DETAIL-lock']">
冻结
</button>
@ -36,7 +36,7 @@
</ng-template>
</page-header-wrapper>
<nz-card [nzLoading]="false">
<nz-card [nzLoading]="service.http.loading">
<div [class]="isEditUser ? 'edit-box' : 'readOnly-box'">
<sv-container col="2">
<sv-title>个人信息
@ -48,8 +48,8 @@
</label>
<div style="float: right">
<ng-container *ngIf="isEditUser; else elseTemplate">
<button [nzLoading]="false" nz-button (click)="reset()"> 取消 </button>
<button [nzLoading]="false" nz-button nzDanger (click)="saveUser()"> 保存 </button>
<button [nzLoading]="service.http.loading" nz-button (click)="reset()"> 取消 </button>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="saveUser()"> 保存 </button>
</ng-container>
<ng-template #elseTemplate>
<button nz-button nzType="default" nzDanger (click)="approveUser()"

2
src/app/routes/usercenter/components/driver/captain/captain.component.html
View File

@ -19,7 +19,7 @@
<button
nz-button
nzType="primary"
[nzLoading]="false"
[nzLoading]="service.http.loading"
(click)="st?.load(1)"
acl
[acl-ability]="['USERCENTER-DRIVER-CAPTAIN-list']"

4
src/app/routes/usercenter/components/driver/detail/detail.component.html
View File

@ -6,7 +6,7 @@
</button>
</ng-template>
<ng-template #content>
<nz-skeleton [nzLoading]="false">
<nz-skeleton [nzLoading]="service.http.loading">
<div class="user-info">
<img [src]="userDetail?.avatar" />
<div style="flex: 1">
@ -39,7 +39,7 @@
</page-header-wrapper>
<nz-card [nzLoading]="false">
<nz-card [nzLoading]="service.http.loading">
<div [class]="isEditUser?'edit-box':'readOnly-box'">
<sv-container col="2">
<sv-title>个人信息

2
src/app/routes/usercenter/components/driver/driver-config/driver-config.component.html
View File

@ -16,7 +16,7 @@
<sf #sf [schema]="schema" [ui]="{ '*': { spanLabelFixed: 120, grid: { lg: 8, md: 12, sm: 12, xs: 24 } } }" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]=" 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)" acl
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
[acl-ability]="['USERCENTER-DRIVER-CONFIG-search']">查询</button>
<button nz-button nzType="primary" [disabled]="false" (click)="exportList()" acl
[acl-ability]="['USERCENTER-DRIVER-CONFIG-export']">导出</button>

2
src/app/routes/usercenter/components/driver/driver.component.html
View File

@ -18,7 +18,7 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-list']">查询</button>
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-list']">查询</button>
<button nz-button nzType="primary" (click)="exportList()" [disabled]="false" acl [acl-ability]="['USERCENTER-DRIVER-LIST-export']">导出</button>
<button nz-button (click)="resetSF()" [disabled]="false">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">

2
src/app/routes/usercenter/components/freight/enterprise-audit/enterprise-audit.component.html
View File

@ -23,7 +23,7 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 8" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right"
[class.expend-options]="_$expand">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)" acl
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
[acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-list']">查询</button>
<button *ngIf="tabType == 1" nz-button nzType="primary" [disabled]="false" (click)="exportList()"
acl [acl-ability]="['USERCENTER-FREIGHT-ENTERPRISE-export']">导出</button>

10
src/app/routes/usercenter/components/freight/enterprise-audit/view/view.component.html
View File

@ -27,21 +27,21 @@
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex" style="justify-content: flex-end;">
<ng-container *ngIf="isEdit;else editButton">
<button [nzLoading]="false" nz-button (click)="reset()">
<button [nzLoading]="service.http.loading" nz-button (click)="reset()">
取消
</button>
<button [nzLoading]="false" nz-button nzDanger (click)="save()">
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="save()">
保存
</button>
</ng-container>
<ng-template #editButton>
<button [nzLoading]="false" nz-button nzDanger (click)="auditPass()">
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditPass()">
通过
</button>
<button [nzLoading]="false" nz-button nzDanger (click)="auditNo()">
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="auditNo()">
驳回
</button>
<button [nzLoading]="false" nz-button nzDanger (click)="ratify()">
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="ratify()">
修改
</button>
</ng-template>

2
src/app/routes/usercenter/components/freight/freight-config/freight-config.component.html
View File

@ -19,7 +19,7 @@
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" [class.expend-options]="_$expand"
class="text-right">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)" acl
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
[acl-ability]="['USERCENTER-FREIGHT-LIST-list']">查询</button>
<button nz-button nzType="primary" [disabled]="false" acl (click)="exportList()"
[acl-ability]="['USERCENTER-FREIGHT-LIST-export']">导出</button>

2
src/app/routes/usercenter/components/freight/list/detail/detail.component.html
View File

@ -6,7 +6,7 @@
</button>
</ng-template>
<ng-template #content>
<nz-skeleton [nzLoading]="false">
<nz-skeleton [nzLoading]="service.http.loading">
<div class="user-info" nz-row>
<div nz-col [nzXl]="18" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="d-flex">
<img [src]="detailData?.enterpriseLogo" />

2
src/app/routes/usercenter/components/freight/list/new/new.component.html
View File

@ -89,7 +89,7 @@
<div style="padding-left: 379px">
<button nz-button type="button" nzType="primary" (click)="submitForm()"
[nzLoading]="false">确认新增</button>
[nzLoading]="service.http.loading">确认新增</button>
<button nz-button (click)="goBack()">返回</button>
</div>
</nz-card>

16
src/app/routes/usercenter/components/freight/user/detail/detail.component.html
View File

@ -7,7 +7,7 @@
</button>
</ng-template>
<ng-template #content>
<nz-skeleton [nzLoading]="false">
<nz-skeleton [nzLoading]="service.http.loading">
<div class="user-info" nz-row>
<div nz-col nzSpan="24" class="d-flex">
<img [src]="userDetail?.avatar" />
@ -29,11 +29,11 @@
</div>
<div nz-col [nzXl]="8" [nzLg]="8" [nzSm]="24" [nzXs]="24" class="d-flex"
style="justify-content: flex-end;padding-right: 24px;">
<button *ngIf="userDetail?.stateLocked" [nzLoading]="false" nz-button nzType="primary"
<button *ngIf="userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzType="primary"
nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
启用
</button>
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="false" nz-button nzDanger nzGhost
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-lock']">
冻结
</button>
@ -46,7 +46,7 @@
</ng-template>
</page-header-wrapper>
<nz-card [nzLoading]="false">
<nz-card [nzLoading]="service.http.loading">
<sv-container col="2">
<sv-title>个人信息
<label *ngIf="userIdentityDetail?.certificationStatus===1" style="color: #52c41a;"><i nz-icon
@ -57,17 +57,17 @@
</label>
<div style="float: right;">
<ng-container *ngIf="isEditUser; else elseTemplate">
<button [nzLoading]="false" nz-button (click)="reset()">
<button [nzLoading]="service.http.loading" nz-button (click)="reset()">
取消
</button>
<button [nzLoading]="false" nz-button nzDanger (click)="saveUser()">
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="saveUser()">
保存
</button>
</ng-container>
<ng-template #elseTemplate>
<button nz-button nzType="default" nzDanger (click)="auditPass()" *ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="false" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">审核通过</button>
<button nz-button nzType="default" nzDanger (click)="auditPass()" *ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">审核通过</button>
<button nz-button nzType="default" nzDanger (click)="auditNo()"
*ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="false" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">驳回审核</button>
*ngIf="userIdentityDetail.certificationStatus===0" [nzLoading]="service.http.loading" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-audit']">驳回审核</button>
<button nz-button nzType="default" nzDanger (click)="ratify()" acl [acl-ability]="['USERCENTER-FREIGHT-USER-D-edit']" >修改</button>
</ng-template>
</div>

2
src/app/routes/usercenter/components/freight/user/user.component.html
View File

@ -16,7 +16,7 @@
<sf #sf [schema]="schema" [ui]="ui" [compact]="true" [button]="'none'"></sf>
</div>
<div nz-col [nzXl]="_$expand ? 24 : 6" [nzLg]="24" [nzSm]="24" [nzXs]="24" class="text-right">
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)" acl
<button nz-button nzType="primary" [nzLoading]="service.http.loading" (click)="st?.load(1)" acl
[acl-ability]="['USERCENTER-FREIGHT-USER-list']">查询</button>
<button nz-button nzType="primary" [disabled]="false" (click)="st?.load(1)">导出</button>
<button nz-button (click)="resetSF()" [disabled]="false">重置</button>