diff --git a/package-lock.json b/package-lock.json index ccd105b..d4e8608 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "iot-qmplaza", + "name": "syk11-ar-react", "version": "0.1.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "iot-qmplaza", + "name": "syk11-ar-react", "version": "0.1.0", "dependencies": { "antd-mobile": "^2.3.4", diff --git a/package.json b/package.json index f2e6985..dcea312 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "syk11-ar-react", + "name": "chengduskp-ar-react", "version": "0.1.0", "private": true, "homepage": "./", diff --git a/src/components/Floors/Floors.js b/src/components/Floors/Floors.js index 4a8a77e..637787c 100644 --- a/src/components/Floors/Floors.js +++ b/src/components/Floors/Floors.js @@ -60,7 +60,7 @@ const Floors = ({ onClickFloor(index); }} > - {name} + {name === "景观层" ? "景观" : name} ))} diff --git a/src/components/ShopList/ShopList.js b/src/components/ShopList/ShopList.js index 85a81c8..b602b67 100644 --- a/src/components/ShopList/ShopList.js +++ b/src/components/ShopList/ShopList.js @@ -1,8 +1,6 @@ -import React, { useState, useRef } from "react"; +import React, { useRef } from "react"; import Shop from "../Shop/Shop"; import "./ShopList.scss"; -import InfiniteScroll from "react-infinite-scroller"; - const ShopList = ({ mall, q, @@ -12,7 +10,6 @@ const ShopList = ({ format = null, floorOrder = null, }) => { - const [index, setIndex] = useState(0); const shops = mall.shopInfo.reduce( (acc, { shopList }) => acc.concat(shopList), [] @@ -55,26 +52,18 @@ const ShopList = ({ const listRef = useRef(null); return (
- setIndex(index + 1)} - hasMore={filteredShops && filteredShops.length > index * 10} - useWindow={false} - getScrollParent={() => listRef && listRef.current} - > -
- {filteredShops.map((shop, i) => ( - onClick(shop)} - isRow={isRow} - > - ))} -
-
END
-
+
+ {filteredShops.map((shop, i) => ( + onClick(shop)} + isRow={isRow} + > + ))} +
+
END
); }; diff --git a/src/components/SideBar/SideBar.scss b/src/components/SideBar/SideBar.scss index e9df43e..0fe20b1 100644 --- a/src/components/SideBar/SideBar.scss +++ b/src/components/SideBar/SideBar.scss @@ -11,6 +11,7 @@ font-weight: 500; font-size: 12px; color: #474a56; + text-align: center; &.active { background: #ffffff; color: #437af7; diff --git a/src/js/helpers/data-helper.js b/src/js/helpers/data-helper.js index 378b05e..a4dc7c8 100644 --- a/src/js/helpers/data-helper.js +++ b/src/js/helpers/data-helper.js @@ -2,7 +2,7 @@ import axios from "axios"; import icons from "./image-helper"; let mallInfos = new Map(); -export const code = "project-dshd7pel_ogpcdect930ja"; +export const code = "project-ey_fpaur6s6fkgvszywana"; export const baseUrl = "https://iot.1000my.com"; export const post = async (url = "", data = {}) => { const response = await fetch(baseUrl + url, { @@ -157,9 +157,9 @@ const getMallInfo = async ({ memberID }) => { } })(), ]); - mall.name = "K11"; - document.title = "沈阳K11"; - mall.city = "沈阳"; + mall.name = "SKP"; + document.title = "成都SKP"; + mall.city = "成都"; const mapData = JSON.parse(mapDataJSON)[0]; mall.activities = activities; mall.pois = pois; diff --git a/src/pages/Index/Index.js b/src/pages/Index/Index.js index 8f15881..5239516 100644 --- a/src/pages/Index/Index.js +++ b/src/pages/Index/Index.js @@ -335,6 +335,8 @@ const Index = () => { autoRotate: false, customTitleFacilityTypeMap: { 116: true }, wrapperWindowRatio: 0.7, + showShopLabel: false, + useFormatColor: false, }, mall, onFocusShop: (data, stop) => { diff --git a/src/qmmap b/src/qmmap index 8363ebe..5fe6b71 160000 --- a/src/qmmap +++ b/src/qmmap @@ -1 +1 @@ -Subproject commit 8363ebe51f5de2e354f20f8ac1fb3e927dbcfa76 +Subproject commit 5fe6b71e639f2874bd9da038e673f12068e237e8