Merge branch 'develop' of https://gitlab.eascs.com/tms-ui/tms-obc-web into develop

src/app/routes/financial-management/components/platform-account/platform-account.component.html

@@ -52,7 +52,7 @@
 </nz-card>
 
 <nz-card class="content-box">
-    <st #st [data]="url" [columns]="columns" [req]="{  process: beforeReq }" [scroll]="{ x: '1200px' }"
+    <st #st [data]="service.$api_get_platform_page" [columns]="columns" [req]="{  process: beforeReq }"
-        [loading]="service.http.loading">
+        [scroll]="{ x: '1200px' }" [loading]="service.http.loading">
     </st>
 </nz-card>

src/app/routes/financial-management/components/platform-account/platform-account.component.ts

@@ -18,9 +18,6 @@ export class PlatformAccountComponent implements OnInit {
   searchSchema: SFSchema = this.initSF();
   columns: STColumn[] = this.initST();
 
-  url = `/rule?_allow_anonymous=true`;
-
-
   constructor(public service: FreightAccountService, private router: Router, private nzModalService: NzModalService) {}
 
   ngOnInit(): void {}
@@ -88,7 +85,7 @@ export class PlatformAccountComponent implements OnInit {
 
   private initST(): STColumn[] {
     return [
-      { title: '网络货运人', index: 'description', width: 180 },
+      { title: '网络货运人', index: 'ltdName', width: 180 },
       { title: '银行类型', index: 'description', width: 120 },
       { title: '虚拟账户', index: 'description', width: 140 },
       {

src/app/routes/financial-management/services/freight-account.service.ts

@@ -21,6 +21,8 @@ export class FreightAccountService extends ShipperBaseService {
   $api_get_shipper_account_page = '/api/fcc/accountBalance/getShipperAccountBalanceByOperator';
   // 运营端获取司机账户信息
   $api_get_driver_account_page = '/api/fcc/accountBalance/getDriverAccountBalanceByOperator';
+  // 运营端获取平台余额
+  $api_get_platform_page = '/api/fcc/accountBalance/getPlatformBalanceByOperator';
 
   // 运营端获取货主账户明细信息
   $api_get_shipper_account_detail = '/api/fcc/accountBalanceDetail/getAccountBalanceShipperByOperatorPage';

src/app/routes/usercenter/components/driver/detail/detail.component.html

@@ -50,23 +50,20 @@
             nzType="close-circle" nzTheme="fill" class="mr-xs"></i>驳回
         </label>
         <label *ngIf="faceStatus == 1" style="color: #bec8c8; position: relative;
-        bottom: 2px;" class="ml-md"><i nz-icon
+        bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已发起</i>
-          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已发起</i>
         </label>
         <label *ngIf="faceStatus == 0" style="color: #bec8c8;  position: relative;
         bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：无</i>
         </label>
         <label *ngIf="faceStatus == 2" style="color: #bec8c8;   position: relative;
-        bottom: 2px;" class="ml-md"><i nz-icon
+        bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：进行中</i>
-          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：进行中</i>
         </label>
         <label *ngIf="faceStatus == 3" style="color: #52c41a;     position: relative;
-        bottom: 2px;" class="ml-md"><i nz-icon
+        bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已成功</i>
-          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已成功</i>
         </label>
         <label *ngIf="faceStatus == 4" style="color: #ff4d4f;     position: relative;
-        bottom: 2px;" class="ml-md"><i nz-icon
+        bottom: 2px;" class="ml-md"><i nz-icon nzType="check-circle" nzTheme="fill"
-          nzType="check-circle" nzTheme="fill" class="mr-xs">人脸识别结果：已失败;失败原因：{{facetext}}</i>
+            class="mr-xs">人脸识别结果：已失败;失败原因：{{facetext}}</i>
         </label>
         <div style="float: right;">
           <ng-container *ngIf="isEditUser; else elseTemplate">
@@ -79,10 +76,13 @@
           </ng-container>
           <ng-template #elseTemplate>
             <button nz-button nzType="default" nzDanger (click)="approveUser()"
-              *ngIf="userIdentityDetail?.certificationStatus===0"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">审核通过</button>
+              *ngIf="userIdentityDetail?.certificationStatus===0" acl
+              [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">审核通过</button>
             <button nz-button nzType="default" nzDanger (click)="rejectedUser()"
-              *ngIf="userIdentityDetail?.certificationStatus===0"  acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">驳回审核</button>
+              *ngIf="userIdentityDetail?.certificationStatus===0" acl
-            <button nz-button nzType="default" nzDanger (click)="ratify(0)" acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editUser']">修改</button>
+              [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditUser']">驳回审核</button>
+            <button nz-button nzType="default" nzDanger (click)="ratify(0)" acl
+              [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editUser']">修改</button>
           </ng-template>
         </div>
       </sv-title>
@@ -131,7 +131,8 @@
               (click)="approveDriver()" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditDriver']">审核通过</button>
             <button *ngIf="driverDetail?.approvalStatus==10" nz-button nzType="default" nzDanger
               (click)="rejectedDriver()" acl [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-auditDriver']">驳回审核</button>
-            <button nz-button nzType="default" nzDanger (click)="ratify(1)" acl  [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editDriver']">修改</button>
+            <button nz-button nzType="default" nzDanger (click)="ratify(1)" acl
+              [acl-ability]="['USERCENTER-DRIVER-LIST-DETAIL-editDriver']">修改</button>
           </ng-template>
         </div>
       </sv-title>
@@ -140,20 +141,10 @@
           [nzBorderless]="!isEditDriver" [placeholder]="isEditDriver?'':'-'">
       </sv>
       <sv label="准驾车型">
-      <nz-select
+        <nz-select [nzMaxTagCount]="3" nzPlaceHolder="Please select" [(ngModel)]="driverDetail.driverModel"
-      [nzMaxTagCount]="3"
+          nzMode="multiple" [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
-      nzPlaceHolder="Please select"
+          [nzShowArrow]="isEditDriver" [nzDisabled]="!isEditDriver">
-      [(ngModel)]="driverDetail.driverModel" 
+          <nz-option *ngFor="let i of contencarModel" [nzLabel]="i.label" [nzValue]="i.label"></nz-option>
-      nzMode="multiple"
-      [nzPlaceHolder]="isEditDriver?'':'-'" [nzBorderless]="!isEditDriver"
-      [nzShowArrow]="isEditDriver"
-      [nzDisabled]="!isEditDriver"
-    >
-    <nz-option
-    *ngFor="let i of contencarModel"
-    [nzLabel]="i.label"
-    [nzValue]="i.label"
-  ></nz-option>
         </nz-select>
       </sv>
       <sv label="有效期起">
@@ -270,7 +261,9 @@
 
   <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
-    <sv-title>服务评级</sv-title>
+    <sv-title>服务评级
+      <ng-container *ngIf="billEvaluateList?.length===0">(暂无评级)</ng-container>
+    </sv-title>
     <sv [label]="item.evaluateType" *ngFor="let item of billEvaluateList">
       <nz-rate [ngModel]="item.evaluateFraction" nzDisabled></nz-rate>
     </sv>

src/app/routes/usercenter/components/driver/detail/detail.component.ts

@@ -81,13 +81,11 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     });
     this.service.request(this.service.$api_getDictValue, { dictKey: 'driverModel' }).subscribe(res => {
       if (res) {
-        console.log(res);
         this.contencarModel = res;
       }
     });
     // 获取人脸识别结果
     this.service.request(this.service.$api_getFaceFlowQuery, { id: this.route.snapshot.params.id }).subscribe(res => {
-      console.log(res);
       if (res) {
         this.faceStatus = res.status;
         if (res.status == 4) {
@@ -106,7 +104,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     this.service.request(this.service.$api_get_driver_license, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
       if (res?.id) {
         Object.assign(res, { driverModel: res.driverModel ? res.driverModel.split(',') : [] });
-        console.log('driverDetail', res);
         this.driverDetail = res;
 
         this.tempalateDriverData = { ...this.driverDetail };
@@ -116,7 +113,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
     this.service.request(this.service.$api_get_driver_practice_seniority, { appUserId: this.route.snapshot.params.id }).subscribe(res => {
       if (res?.id) {
         this.licenseDetail = res;
-        console.log(res);
         this.tempalateLicenseDetail = { ...this.licenseDetail };
       }
     });
@@ -132,7 +128,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
       .subscribe(res => {
         if (res) {
           this.billEvaluateList = res;
-          console.log(this.billEvaluateList);
         }
       });
   }
@@ -261,7 +256,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
    */
   ratify(type: number) {
     if (type) {
-      console.log(this.driverDetail);
       this.isEditDriver = true;
     } else {
       this.isEditUser = true;
@@ -291,7 +285,6 @@ export class UserCenterComponentsDriverDetailComponent implements OnInit {
   initDetailByCode() {
     // 根据地区code查询地区详情
     this.service.request(this.service.$api_get_region_by_code, { regionCode: '' }).subscribe((res: any) => {
-      console.log(res);
       this.adressCodeList = res;
     });
   }

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

@@ -29,7 +29,13 @@
               </div>
             </div>
             <div>
-              服务评级：<nz-rate [ngModel]="billEvaluate" nzDisabled></nz-rate>
+              服务评级：
+              <ng-container *ngIf="billEvaluate!==null; else billEvaluateelseTemplate">
+                <nz-rate [ngModel]="billEvaluate" nzDisabled></nz-rate>
+              </ng-container>
+              <ng-template #billEvaluateelseTemplate>
+                暂无评价
+              </ng-template>
             </div>
           </div>
         </div>

src/app/routes/usercenter/components/freight/list/detail/detail.component.ts

@@ -40,7 +40,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
     2: '未认证'
   };
 
-  billEvaluate = 0;
+  billEvaluate = null;
   constructor(
     public service: UsermanageService,
     private route: ActivatedRoute,
@@ -81,7 +81,7 @@ export class FreightComponentsListDetailComponent implements OnInit {
     this.service
       .request(this.service.$api_get_driver_billEvaluate, { passiveUserId: this.route.snapshot.params.id }, 'POST', false)
       .subscribe(res => {
-        if (res) {
+        if (res?.length > 0) {
           this.service.request(this.service.$api_get_freight_billEvaluate, res).subscribe(billEvaluate => {
             if (billEvaluate) {
               this.billEvaluate = billEvaluate.totalScore;