Browse Source

refactor: 删除冗余

pull/3/head
jiannibang 3 years ago
parent
commit
5886250ef4
  1. 2
      src/components/Floors/Floors.js
  2. 16
      src/components/NavBottom/NavBottom.js
  3. 2
      src/components/Popup/Popup.js
  4. 2
      src/components/Shop/Shop.js
  5. 2
      src/components/ShopList/ShopList.js
  6. 2
      src/js/helpers/data-helper.js
  7. 24
      src/pages/Index/Index.js
  8. 4
      src/pages/Shops/Shops.js

2
src/components/Floors/Floors.js

@ -59,7 +59,7 @@ const Floors = ({
</div>
) : (
<div className="floor-sub">
<img className="loc" src={loc}></img> <div className="sep"></div>
<img className="loc" alt="" src={loc}></img> <div className="sep"></div>
<div className="value">{floors[sceneIndex][1]}</div>
</div>
);

16
src/components/NavBottom/NavBottom.js

@ -1,20 +1,10 @@
import React, { useState, useEffect } from "react";
import React from "react";
import "./NavBottom.scss";
import followDirection from "./followDirection.png";
import notFollowDirection from "./notFollowDirection.png";
import play from "./play.png";
import pause from "./pause.png";
import closeButton from "./close.png";
import left from "./left.png";
import right from "./right.png";
import straight from "./straight.png";
import back from "./back.png";
import bubble from "./bubble.png";
import arpng from "./ar.png";
import nav from "./nav.png";
import navActive from "./nav_active.png";
import des from "./des.png";
import desActive from "./des_active.png";
const getImgByRouteSearchText = (txt) =>
txt.includes("左前")
@ -81,7 +71,9 @@ const NavBottom = ({
</div>
<div className="destination">
{end.logoPath && <img className="avatar" src={end.logoPath} />}
{end.logoPath && (
<img alt="图标" className="avatar" src={end.logoPath} />
)}
<img
alt="关闭"
className="close-icon"

2
src/components/Popup/Popup.js

@ -9,7 +9,7 @@ const Popup = ({ mall, sceneIndex, onClick, floors, shop, onClickActive }) => {
const baseHeight = long ? window.innerHeight : 312;
useEffect(() => {
setdoTransition(true);
setHeight(baseHeight);
setHeight(long ? window.innerHeight : 312);
setTimeout(() => {
setdoTransition(false);
}, 500);

2
src/components/Shop/Shop.js

@ -31,7 +31,7 @@ const Shop = ({
onClickActive();
}}
>
<img src={activeBg} className="avatar"></img>
<img src={activeBg} alt="" className="avatar"></img>
<div className="r1">{name} </div>
</div>
)}

2
src/components/ShopList/ShopList.js

@ -1,4 +1,4 @@
import React, { useState, useRef, useEffect } from "react";
import React, { useState, useRef } from "react";
import Shop from "../Shop/Shop";
import "./ShopList.scss";
import InfiniteScroll from "react-infinite-scroller";

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

@ -179,7 +179,7 @@ const getMallInfo = async () => {
floors: mall.floors.reduce((acc, { name, floorOrder, url }) => {
acc[floorOrder] = [url, name];
return acc;
}, new Array()),
}, []),
theme,
});
const mallInfo = { mall, shopInfo, images };

24
src/pages/Index/Index.js

@ -340,17 +340,19 @@ const Index = () => {
useEffect(() => {
if (focusTextClicked) {
if (shop) {
setEnd(shop);
map.startNavigate({
start,
end: shop,
});
}
if (shop) handleEndSet(shop);
setFocusTextClicked(false);
}
}, [focusTextClicked]);
const handleEndSet = (end) => {
setEnd(end);
map.startNavigate({
start,
end,
});
};
return (
<MallCode.Provider value={mallCode}>
<div className="index">
@ -438,13 +440,7 @@ const Index = () => {
></Floors>
)
}
onClickActive={(end) => {
setEnd(end);
map.startNavigate({
start,
end,
});
}}
onClickActive={handleEndSet}
></Popup>
)}
{showNav && (

4
src/pages/Shops/Shops.js

@ -1,4 +1,4 @@
import React, { useState, useEffect } from "react";
import React, { useState } from "react";
import Modal from "react-modal";
import "./Shops.scss";
import ShopList from "../../components/ShopList/ShopList.js";
@ -17,7 +17,7 @@ const Shops = ({ mall, isOpen, onRequestClose, onClick, onClose }) => {
onRequestClose={() => onRequestClose()}
>
<div className="header">
<img src={back} className="back" onClick={() => onClose()} />
<img src={back} alt="返回" className="back" onClick={() => onClose()} />
<input
value={q}
className="input"

Loading…
Cancel
Save