From a7bce7aa8d9d44266ee54e6cd5d9d3b4149cff40 Mon Sep 17 00:00:00 2001
From: hurui <177768073@qq.com>
Date: Wed, 22 May 2024 15:28:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/app/pages/account/sys-role/sys-role.component.ts    | 1 +
 src/app/pages/merchant/mer-list/mer-list.component.html | 4 ++--
 src/app/pages/merchant/mer-list/mer-list.component.ts   | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/app/pages/account/sys-role/sys-role.component.ts b/src/app/pages/account/sys-role/sys-role.component.ts
index 669944b..7d00a4a 100644
--- a/src/app/pages/account/sys-role/sys-role.component.ts
+++ b/src/app/pages/account/sys-role/sys-role.component.ts
@@ -188,6 +188,7 @@ export class SysRoleComponent {
    * 关闭编辑角色模态框
    */
   closeEditRole() {
+    this.editRoleForm.reset();
     this.editRoleVisible = false;
   }
 
diff --git a/src/app/pages/merchant/mer-list/mer-list.component.html b/src/app/pages/merchant/mer-list/mer-list.component.html
index 31b0214..bee5478 100644
--- a/src/app/pages/merchant/mer-list/mer-list.component.html
+++ b/src/app/pages/merchant/mer-list/mer-list.component.html
@@ -96,8 +96,8 @@
   <ng-container *nzModalContent>
     <nz-descriptions nzBordered [nzColumn]="{ xxl: 2, xl: 2, lg: 2, md: 2, sm: 2, xs: 1 }">
       <nz-descriptions-item nzSpan="2" nzTitle="商户标志">
-        <nz-avatar *ngIf="merDetailObject.merLogo" [nzShape]="'square'" [nzSize]="64" nzText="商户标志" nzSrc="{{IMAGE_URL+merDetailObject.merLogo}}"></nz-avatar>
-        <span *ngIf="!merDetailObject.merLogo">无</span>
+        <span *ngIf="merDetailObject.merLogo == null || merDetailObject.merLogo == ''" >未上传</span>
+        <img *ngIf="merDetailObject.merLogo != null && merDetailObject.merLogo != ''" nz-image width="64px" height="64px" nzSrc="{{IMAGE_URL+merDetailObject.merLogo}}" alt="">
       </nz-descriptions-item>
       <nz-descriptions-item nzTitle="登录账号">{{merDetailObject.loginName}}</nz-descriptions-item>
       <nz-descriptions-item nzTitle="账户角色">{{merDetailObject.roleName}}</nz-descriptions-item>
diff --git a/src/app/pages/merchant/mer-list/mer-list.component.ts b/src/app/pages/merchant/mer-list/mer-list.component.ts
index cb2e64f..476b739 100644
--- a/src/app/pages/merchant/mer-list/mer-list.component.ts
+++ b/src/app/pages/merchant/mer-list/mer-list.component.ts
@@ -28,6 +28,7 @@ import {Observable, Observer} from "rxjs";
 import {NzAvatarModule} from "ng-zorro-antd/avatar";
 import {MerService} from "../../../services/merchant/mer.service";
 import {RoleService} from "../../../services/role/role.service";
+import {NzImageModule} from "ng-zorro-antd/image";
 
 @Component({
   selector: 'app-mer-list',
@@ -68,7 +69,8 @@ import {RoleService} from "../../../services/role/role.service";
     NzFlexDirective,
     NzDescriptionsModule,
     NzUploadComponent,
-    NzAvatarModule
+    NzAvatarModule,
+    NzImageModule
   ],
   templateUrl: './mer-list.component.html',
   styleUrl: './mer-list.component.less'