From 7f7ee30ff3af4965fdde87acffd58b7f7a8a2a9e Mon Sep 17 00:00:00 2001
From: Taric Xin <LincolnLin@swireproperties.com>
Date: Thu, 24 Feb 2022 20:36:58 +0800
Subject: [PATCH] edit

---
 src/app/core/startup/startup.service.ts           |  4 +++-
 .../freight/list/detail/detail.component.html     | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/app/core/startup/startup.service.ts b/src/app/core/startup/startup.service.ts
index b6c0d1dc..9b95436e 100644
--- a/src/app/core/startup/startup.service.ts
+++ b/src/app/core/startup/startup.service.ts
@@ -95,7 +95,9 @@ export class StartupService {
     // ACL：设置权限为全量
     this.aclService.setFull(false);
     // 初始化菜单
-    this.menuService.add(menuData);
+    if(menuData){
+      this.menuService.add(menuData);
+    }
     // 设置页面标题的后缀
     this.titleService.default = '';
     this.titleService.suffix = appData.name;
diff --git a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
index bd30936e..3247d6c7 100644
--- a/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
+++ b/src/app/routes/usercenter/components/freight/list/detail/detail.component.html
@@ -123,6 +123,9 @@
       <label *ngIf="detailData?.approvalStatus===30" style="color: #ff4d4f;"><i nz-icon nzType="close-circle"
           nzTheme="fill" class="mr-xs"></i>驳回&nbsp;驳回原因:{{detailData?.approvalOpinion}}
       </label>
+      <label *ngIf="detailData?.isExpired===30" style="color: #fa8c16;">
+        <i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
+      </label>
       <p style="margin-bottom: 0;">
         四要素验证：
         <label *ngIf="detailData?.esignCheckStatus===0" style="color: #ff4d4f;"><i nz-icon nzType="info-circle"
@@ -246,7 +249,11 @@
   </sv-container>
   <nz-divider></nz-divider>
   <sv-container col="3" class="mt16">
-    <sv-title>法人信息</sv-title>
+    <sv-title>法人信息
+      <label *ngIf="detailData?.legalPersonIdentityVO?.isExpired===30" style="color: #fa8c16;">
+        <i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
+      </label>
+    </sv-title>
     <sv label="法定代表人">
       <input nz-input type="text" [(ngModel)]="detailData.legalPersonIdentityVO.name" [readonly]="!isEdit"
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">
@@ -286,7 +293,11 @@
   </sv-container>
   <nz-divider></nz-divider>
   <sv-container col="3">
-    <sv-title>企业管理员信息</sv-title>
+    <sv-title>企业管理员信息
+      <label *ngIf="detailData?.adminUserInfo?.isExpired===30" style="color: #fa8c16;">
+        <i nz-icon nzType="info-circle" nzTheme="fill" class="ml-md mr-xs"></i>企业营业期限已过期
+      </label>
+    </sv-title>
     <sv label="姓名">
       <input nz-input type="text" [(ngModel)]="detailData.adminUserInfo.name" [readonly]="!isEdit"
         [nzBorderless]="!isEdit" [placeholder]="isEdit?'':'-'">