From da7db827acfe87113e771e72eb582142ea540ad9 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Thu, 28 Mar 2024 16:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=E6=98=BE=E7=A4=BA=E8=AE=A2=E5=8D=95=E6=A0=B8=E9=94=80?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=20=E4=BC=98=E5=8C=96=EF=BC=9A=E5=95=86?=
 =?UTF-8?q?=E6=88=B7=E7=99=BB=E5=BD=95=E6=97=B6=20=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0=E8=BF=87=E9=95=BF=E4=BC=9A=E8=B6=85=E5=87=BA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/admin/business/index.vue | 2 +-
 pages/admin/business/login.vue | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pages/admin/business/index.vue b/pages/admin/business/index.vue
index 32f9852..851ced4 100644
--- a/pages/admin/business/index.vue
+++ b/pages/admin/business/index.vue
@@ -73,7 +73,7 @@ export default {
           icon: 'iconfont icon-kefujilu'
         });
       }
-      if(this.service.is_verify && [0].includes(Number(merchantInfo.merchant_type))){
+      if(this.service.is_verify && [0,3].includes(Number(merchantInfo.merchant_type))){
         list.push({
           title: '订单核销',
           url: '/pages/admin/order_cancellation/index?mer_id=' + merId,
diff --git a/pages/admin/business/login.vue b/pages/admin/business/login.vue
index 6a3cca9..4cd214d 100644
--- a/pages/admin/business/login.vue
+++ b/pages/admin/business/login.vue
@@ -252,8 +252,14 @@ export default {
         .name{
           width: calc(100% - 130rpx);
           height: 120rpx;
-          line-height: 120rpx;
           padding-left: 20rpx;
+          display: inline-flex;
+          flex-direction: row;
+          flex-wrap: wrap;
+          justify-content: flex-start;
+          align-items: center;
+          align-content: center;
+          overflow: hidden;
         }
       }
       .right{