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-03-14 14:09:03 +08:00
parent 8805564acc
commit 98281b6b3a
124 changed files with 417 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
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]="service.http.loading">
<nz-skeleton [nzLoading]="false">
<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]="service.http.loading" nz-button nzType="primary"
<button *ngIf="userDetail?.stateLocked" [nzLoading]="false" nz-button nzType="primary"
nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-DRIVER-CAPTAIN-DETAIL-lock']">
启用
</button>
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="service.http.loading" nz-button nzDanger nzGhost
<button *ngIf="!userDetail?.stateLocked" [nzLoading]="false" 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]="service.http.loading">
<nz-card [nzLoading]="false">
<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]="service.http.loading" nz-button (click)="reset()"> 取消 </button>
<button [nzLoading]="service.http.loading" nz-button nzDanger (click)="saveUser()"> 保存 </button>
<button [nzLoading]="false" nz-button (click)="reset()"> 取消 </button>
<button [nzLoading]="false" nz-button nzDanger (click)="saveUser()"> 保存 </button>
</ng-container>
<ng-template #elseTemplate>
<button nz-button nzType="default" nzDanger (click)="approveUser()"
@ -132,7 +132,7 @@
[nzShowUploadList]="false" nzFileType="image/png,image/jpeg,image/jpg,image/gif"
[nzDisabled]="!status || disabledUpload" (nzChange)="changeUpload($event, data, key, key2)">
<ng-container *ngIf="!data[key] && status">
<i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
<i class="upload-icon" nz-icon [nzType]="false ? 'loading' : 'plus'"></i>
<div class="ant-upload-text">上传</div>
</ng-container>
<div *ngIf="data[key]" (mouseover)="data[hover] = true" (mouseleave)="data[hover] = false"

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

@ -19,7 +19,7 @@
<button
nz-button
nzType="primary"
[nzLoading]="service.http.loading"
[nzLoading]="false"
(click)="st?.load(1)"
acl
[acl-ability]="['USERCENTER-DRIVER-CAPTAIN-list']"
@ -28,13 +28,13 @@
<button
nz-button
nzType="primary"
[disabled]="service.http.loading"
[disabled]="false"
(click)="exportList()"
acl
[acl-ability]="['USERCENTER-DRIVER-CAPTAIN-export']"
>导出</button
>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button (click)="resetSF()" [disabled]="false">重置</button>
<button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -56,7 +56,7 @@
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' }, process: dataProcess }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading"
[loading]="false"
>
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-DRIVER-CAPTAIN-promoter']">

18
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]="service.http.loading">
<nz-skeleton [nzLoading]="false">
<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" [disabled]="service.http.loading" nz-button nzType="primary"
<button *ngIf="userDetail?.stateLocked" [disabled]="false" nz-button nzType="primary"
nzGhost (click)="userAction(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
启用
</button>
<button *ngIf="!userDetail?.stateLocked" [disabled]="service.http.loading" nz-button nzDanger nzGhost
<button *ngIf="!userDetail?.stateLocked" [disabled]="false" nz-button nzDanger nzGhost
(click)="userAction(0)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-lock']">
冻结
</button>
@ -39,7 +39,7 @@
</page-header-wrapper>
<nz-card [nzLoading]="service.http.loading">
<nz-card [nzLoading]="false">
<div [class]="isEditUser?'edit-box':'readOnly-box'">
<sv-container col="2">
<sv-title>个人信息
@ -67,10 +67,10 @@
</label>
<div style="float: right;">
<ng-container *ngIf="isEditUser; else elseTemplate">
<button [disabled]="service.http.loading" nz-button (click)="reset(0)">
<button [disabled]="false" nz-button (click)="reset(0)">
取消
</button>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="saveUser()">
<button [disabled]="false" nz-button nzDanger (click)="saveUser()">
保存
</button>
</ng-container>
@ -136,10 +136,10 @@
</label>
<div style="float: right;">
<ng-container *ngIf="isEditDriver;else editDriverButton">
<button [disabled]="service.http.loading" nz-button (click)="reset(1)">
<button [disabled]="false" nz-button (click)="reset(1)">
取消
</button>
<button [disabled]="service.http.loading" nz-button nzDanger (click)="saveDriver()">
<button [disabled]="false" nz-button nzDanger (click)="saveDriver()">
保存
</button>
</ng-container>
@ -361,7 +361,7 @@
[nzShowUploadList]="false" nzFileType="image/png,image/jpeg,image/jpg,image/gif"
[nzDisabled]="!status || disabledUpload" (nzChange)="changeUpload($event,data,key,key2,hover)">
<ng-container *ngIf="!data[key] && status">
<i class="upload-icon" nz-icon [nzType]="service.http.loading ? 'loading' : 'plus'"></i>
<i class="upload-icon" nz-icon [nzType]="false ? 'loading' : 'plus'"></i>
<div class="ant-upload-text">上传</div>
</ng-container>
<div *ngIf="data[key]" (mouseover)="data[hover]=true" (mouseleave)="data[hover]=false"

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

@ -16,11 +16,11 @@
<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]="service.http.loading" (click)="st?.load(1)" acl
<button nz-button nzType="primary" [nzLoading]="false" (click)="st?.load(1)" acl
[acl-ability]="['USERCENTER-DRIVER-CONFIG-search']">查询</button>
<button nz-button nzType="primary" [disabled]="service.http.loading" (click)="exportList()" acl
<button nz-button nzType="primary" [disabled]="false" (click)="exportList()" acl
[acl-ability]="['USERCENTER-DRIVER-CONFIG-export']">导出</button>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button (click)="resetSF()" [disabled]="false">重置</button>
<!-- <button nz-button nzType="link" (click)="expandToggle()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -31,7 +31,7 @@
<nz-card>
<!-- 数据列表 -->
<st #st [columns]="columns" [scroll]="{ x: '1200px' }"[data]="service.$api_configPage" [req]="{ params: reqParams }"
[loading]="service.http.loading" [page]={}>
[loading]="false" [page]={}>
<ng-template st-row="monthFreightAmount" let-item let-index="index">
<div>{{item?.monthFreightAmount | currency}}</div>
</ng-template>

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

@ -18,9 +18,9 @@
</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]="service.http.loading" (click)="st?.load(1)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-list']">查询</button>
<button nz-button nzType="primary" (click)="exportList()" [disabled]="service.http.loading" acl [acl-ability]="['USERCENTER-DRIVER-LIST-export']">导出</button>
<button nz-button (click)="resetSF()" [disabled]="service.http.loading">重置</button>
<button nz-button nzType="primary" [nzLoading]="false" (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()">
{{ !_$expand ? '展开' : '收起' }}
<i nz-icon [nzType]="!_$expand ? 'down' : 'up'"></i>
@ -40,7 +40,7 @@
[req]="{ method: 'POST', allInBody: true, reName: { pi: 'pageIndex', ps: 'pageSize' }, params: reqParams }"
[res]="{ reName: { list: 'data.records', total: 'data.total' } }"
[page]="{ show: true, showSize: true, pageSizes: [10, 20, 30, 50, 100, 200, 300, 500, 1000] }"
[loading]="service.http.loading">
[loading]="false">
<ng-template st-row="promotersTelephone" let-item let-index="index">
<a (click)="addPromoter(item)" acl [acl-ability]="['USERCENTER-DRIVER-LIST-promoter']">{{ item.promotersTelephone || '添加' }}</a>
</ng-template>