From 5886250ef43d5ae872b46b5cd87f856feed19591 Mon Sep 17 00:00:00 2001
From: jiannibang <271381693@qq.com>
Date: Mon, 9 Jan 2023 10:10:54 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=A0=E9=99=A4=E5=86=97?=
 =?UTF-8?q?=E4=BD=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Floors/Floors.js       |  2 +-
 src/components/NavBottom/NavBottom.js | 16 ++++------------
 src/components/Popup/Popup.js         |  2 +-
 src/components/Shop/Shop.js           |  2 +-
 src/components/ShopList/ShopList.js   |  2 +-
 src/js/helpers/data-helper.js         |  2 +-
 src/pages/Index/Index.js              | 24 ++++++++++--------------
 src/pages/Shops/Shops.js              |  4 ++--
 8 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/src/components/Floors/Floors.js b/src/components/Floors/Floors.js
index b154849..5335fe6 100644
--- a/src/components/Floors/Floors.js
+++ b/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>
   );
diff --git a/src/components/NavBottom/NavBottom.js b/src/components/NavBottom/NavBottom.js
index 163e927..002955d 100644
--- a/src/components/NavBottom/NavBottom.js
+++ b/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"
diff --git a/src/components/Popup/Popup.js b/src/components/Popup/Popup.js
index 7b88487..19f21bc 100644
--- a/src/components/Popup/Popup.js
+++ b/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);
diff --git a/src/components/Shop/Shop.js b/src/components/Shop/Shop.js
index 072f1ca..a82463e 100644
--- a/src/components/Shop/Shop.js
+++ b/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>
     )}
diff --git a/src/components/ShopList/ShopList.js b/src/components/ShopList/ShopList.js
index 564cd99..28180b5 100644
--- a/src/components/ShopList/ShopList.js
+++ b/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";
diff --git a/src/js/helpers/data-helper.js b/src/js/helpers/data-helper.js
index 47b456a..b161fa3 100644
--- a/src/js/helpers/data-helper.js
+++ b/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 };
diff --git a/src/pages/Index/Index.js b/src/pages/Index/Index.js
index dc6e85b..6f82d31 100644
--- a/src/pages/Index/Index.js
+++ b/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 && (
diff --git a/src/pages/Shops/Shops.js b/src/pages/Shops/Shops.js
index 191abab..ae95369 100644
--- a/src/pages/Shops/Shops.js
+++ b/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"