Browse Source

fix: 店铺详情折行\搜索内容重叠问题修复

dev
jiannibang 3 years ago
parent
commit
16634129e8
  1. 7
      src/components/HeadBar/HeadBar.scss
  2. 2
      src/components/Popup/Popup.js
  3. 4
      src/components/Popup/Popup.scss
  4. 1
      src/js/helpers/data-helper.js
  5. 2
      src/pages/Index/Index.scss
  6. 7
      src/pages/Shops/Shops.scss

7
src/components/HeadBar/HeadBar.scss

@ -33,10 +33,14 @@
position: relative; position: relative;
background: #ffffff; background: #ffffff;
flex: 0 0 56px; flex: 0 0 56px;
line-height: 16px;
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08); box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08);
border-radius: 8px; border-radius: 8px;
align-items: center; align-items: center;
padding-right: 17px;
justify-content: space-between;
.floorname { .floorname {
flex: 0 0 46px;
width: 46px; width: 46px;
font-family: DINPro; font-family: DINPro;
font-style: normal; font-style: normal;
@ -47,8 +51,7 @@
color: #333333; color: #333333;
} }
.format { .format {
position: absolute;
right: 17px;
white-space: nowrap;
font-family: PingFang SC; font-family: PingFang SC;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;

2
src/components/Popup/Popup.js

@ -26,7 +26,7 @@ const Popup = ({
onClick={() => closePopup()} onClick={() => closePopup()}
></img> ></img>
<div className="r1"> <div className="r1">
<div style={{ flex: 1 }}>
<div style={{ overflow: "hidden" }}>
<div className="popupname">{shop.name}</div> <div className="popupname">{shop.name}</div>
<div className="popupdesc"> <div className="popupdesc">
<span> {shop.shopFormat ? shop.shopFormat : " "}</span> <span> {shop.shopFormat ? shop.shopFormat : " "}</span>

4
src/components/Popup/Popup.scss

@ -27,7 +27,6 @@
z-index: 10; z-index: 10;
} }
.r1 { .r1 {
display: flex;
width: 100%; width: 100%;
padding: 14px 20px 0 14px; padding: 14px 20px 0 14px;
height: 110px; height: 110px;
@ -51,6 +50,9 @@
color: #323337; color: #323337;
margin-top: 10px; margin-top: 10px;
margin-bottom: 10px; margin-bottom: 10px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.popupdesc { .popupdesc {

1
src/js/helpers/data-helper.js

@ -147,6 +147,7 @@ const getMallInfo = async () => {
intro: true, intro: true,
formatColor: iot.color, formatColor: iot.color,
floorOrder, floorOrder,
floorName: iot.floor,
})), })),
})); }));
shopInfo.forEach(({ shopList }) => shopInfo.forEach(({ shopList }) =>

2
src/pages/Index/Index.scss

@ -153,7 +153,7 @@ body {
} }
.hud { .hud {
position: absolute; position: absolute;
z-index: 3000;
z-index: 10001;
top: 0; top: 0;
left: 0; left: 0;
width: 100vw; width: 100vw;

7
src/pages/Shops/Shops.scss

@ -79,10 +79,14 @@
position: relative; position: relative;
background: #ffffff; background: #ffffff;
flex: 0 0 56px; flex: 0 0 56px;
line-height: 16px;
box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08); box-shadow: 0px 4px 8px rgba(0, 0, 0, 0.08);
border-radius: 8px; border-radius: 8px;
align-items: center; align-items: center;
padding-right: 17px;
justify-content: space-between;
.floorname { .floorname {
flex: 0 0 46px;
width: 46px; width: 46px;
font-family: DINPro; font-family: DINPro;
font-style: normal; font-style: normal;
@ -93,8 +97,7 @@
color: #333333; color: #333333;
} }
.format { .format {
position: absolute;
right: 17px;
white-space: nowrap;
font-family: PingFang SC; font-family: PingFang SC;
font-style: normal; font-style: normal;
font-weight: normal; font-weight: normal;

Loading…
Cancel
Save