From 16634129e81c5ff71f3639c7c7ed0ce0a602e852 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Thu, 20 Apr 2023 13:04:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=BA=97=E9=93=BA=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=8A=98=E8=A1=8C\=E6=90=9C=E7=B4=A2=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E9=87=8D=E5=8F=A0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/HeadBar/HeadBar.scss | 7 +++++--
 src/components/Popup/Popup.js       | 2 +-
 src/components/Popup/Popup.scss     | 4 +++-
 src/js/helpers/data-helper.js       | 1 +
 src/pages/Index/Index.scss          | 2 +-
 src/pages/Shops/Shops.scss          | 7 +++++--
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/components/HeadBar/HeadBar.scss b/src/components/HeadBar/HeadBar.scss
index c5f9433..f173c58 100644
--- a/src/components/HeadBar/HeadBar.scss
+++ b/src/components/HeadBar/HeadBar.scss
@@ -33,10 +33,14 @@
       position: relative;
       background: #ffffff;
       flex: 0 0 56px;
+      line-height: 16px;
       box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08);
       border-radius: 8px;
       align-items: center;
+      padding-right: 17px;
+      justify-content: space-between;
       .floorname {
+        flex: 0 0 46px;
         width: 46px;
         font-family: DINPro;
         font-style: normal;
@@ -47,8 +51,7 @@
         color: #333333;
       }
       .format {
-        position: absolute;
-        right: 17px;
+        white-space: nowrap;
         font-family: PingFang SC;
         font-style: normal;
         font-weight: normal;
diff --git a/src/components/Popup/Popup.js b/src/components/Popup/Popup.js
index 6166a08..a7789e6 100644
--- a/src/components/Popup/Popup.js
+++ b/src/components/Popup/Popup.js
@@ -26,7 +26,7 @@ const Popup = ({
           onClick={() => closePopup()}
         ></img>
         <div className="r1">
-          <div style={{ flex: 1 }}>
+          <div style={{ overflow: "hidden" }}>
             <div className="popupname">{shop.name}</div>
             <div className="popupdesc">
               <span> {shop.shopFormat ? shop.shopFormat : " "}</span>
diff --git a/src/components/Popup/Popup.scss b/src/components/Popup/Popup.scss
index b77e0ab..b9a9bcc 100644
--- a/src/components/Popup/Popup.scss
+++ b/src/components/Popup/Popup.scss
@@ -27,7 +27,6 @@
       z-index: 10;
     }
     .r1 {
-      display: flex;
       width: 100%;
       padding: 14px 20px 0 14px;
       height: 110px;
@@ -51,6 +50,9 @@
         color: #323337;
         margin-top: 10px;
         margin-bottom: 10px;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
       }
 
       .popupdesc {
diff --git a/src/js/helpers/data-helper.js b/src/js/helpers/data-helper.js
index 7ed3901..a5daf21 100644
--- a/src/js/helpers/data-helper.js
+++ b/src/js/helpers/data-helper.js
@@ -147,6 +147,7 @@ const getMallInfo = async () => {
       intro: true,
       formatColor: iot.color,
       floorOrder,
+      floorName: iot.floor,
     })),
   }));
   shopInfo.forEach(({ shopList }) =>
diff --git a/src/pages/Index/Index.scss b/src/pages/Index/Index.scss
index 3907970..c5bc702 100644
--- a/src/pages/Index/Index.scss
+++ b/src/pages/Index/Index.scss
@@ -153,7 +153,7 @@ body {
   }
   .hud {
     position: absolute;
-    z-index: 3000;
+    z-index: 10001;
     top: 0;
     left: 0;
     width: 100vw;
diff --git a/src/pages/Shops/Shops.scss b/src/pages/Shops/Shops.scss
index d438804..0d727fe 100644
--- a/src/pages/Shops/Shops.scss
+++ b/src/pages/Shops/Shops.scss
@@ -79,10 +79,14 @@
       position: relative;
       background: #ffffff;
       flex: 0 0 56px;
+      line-height: 16px;
       box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08);
       border-radius: 8px;
       align-items: center;
+      padding-right: 17px;
+      justify-content: space-between;
       .floorname {
+        flex: 0 0 46px;
         width: 46px;
         font-family: DINPro;
         font-style: normal;
@@ -93,8 +97,7 @@
         color: #333333;
       }
       .format {
-        position: absolute;
-        right: 17px;
+        white-space: nowrap;
         font-family: PingFang SC;
         font-style: normal;
         font-weight: normal;