diff --git a/src/components/Floors/Floors.scss b/src/components/Floors/Floors.scss
index 78af184..b93ebfb 100644
--- a/src/components/Floors/Floors.scss
+++ b/src/components/Floors/Floors.scss
@@ -1,65 +1,55 @@
.floor-list {
- position: absolute;
- top: -172px;
- left: 10px;
- height: 160px;
- width: 40px;
- padding: 10px 0;
+ height: 72px;
+ width: 100vw;
+ flex: 0 0 72px;
text-align: center;
box-sizing: border-box;
z-index: 1000;
- background: #ffffff;
- box-shadow: 0px 8px 8px rgba(104, 110, 127, 0.04);
- border-radius: 12px;
- &.has-coupon {
- top: -211px;
- }
- .show-nav {
- top: -442px;
- }
- &.nav-end {
- top: -212px;
- }
+ background: var(--guide-floorBg);
+
ul {
- overflow-x: hidden;
- overflow-y: auto;
- height: 140px;
+ overflow-x: auto;
+ overflow-y: hidden;
+ width: 100vw;
+ height: 72px;
+ white-space: nowrap;
&::-webkit-scrollbar {
display: none;
}
}
li {
+ position: relative;
display: inline-block;
- line-height: 32px;
font-family: DINPro;
font-style: normal;
font-weight: normal;
- font-size: 14px;
+ font-size: 16px;
text-align: center;
- color: #323337;
- width: 32px;
- height: 32px;
- margin: 4px;
- &.active {
- background: linear-gradient(180deg, #508af7 0%, #5ea5f9 100%);
- border-radius: 8px;
- color: #fff;
- }
- }
- img {
- position: absolute;
- width: 8px;
- height: 3px;
- margin: auto;
- left: 0;
- right: 0;
- &.top {
- top: 7px;
+ color: var(--guide-floorColor);
+ width: 58px;
+ line-height: 72px;
+ height: 72px;
+ &.current {
+ background: rgba(0, 0, 0, 0.1);
+ &::after {
+ position: absolute;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ height: 20px;
+ display: flex;
+ content: "您在本层";
+ background: var(--guide-currentBg);
+ font-weight: 700;
+ font-size: 8px;
+ color: var(--guide-currentColor);
+ align-items: center;
+ justify-content: center;
+ }
}
- &.bottom {
- bottom: 7px;
- transform-origin: center;
- transform: rotate(180deg);
+ &.active {
+ background: var(--guide-floorActiveBg);
+ color: var(--guide-floorActiveColor);
}
}
}
diff --git a/src/components/HeadBar/HeadBar.js b/src/components/HeadBar/HeadBar.js
deleted file mode 100644
index a873ffd..0000000
--- a/src/components/HeadBar/HeadBar.js
+++ /dev/null
@@ -1,184 +0,0 @@
-import React, { useState, useEffect } from "react";
-import ShopList from "../ShopList/ShopList.js";
-import "./HeadBar.scss";
-import { searchTypes } from "../Options/Options";
-import backpng from './back.png'
-
-const HeadBar = ({
- mall,
- exit,
- start,
- end,
- floors,
- onSwap,
- shop,
- onSetStart,
- onSetEnd,
- isPick,
- setIsPick,
- blurMap,
- showSearchType,
- onClickSearchType,
- searchType,
- onIsTypingChange
-}) => {
- const [isTypingStart, setIsTypingStart] = useState(false);
- const [isTypingEnd, setIsTypingEnd] = useState(false);
- const isTyping = isTypingStart || isTypingEnd;
- const [q, setQ] = useState(null);
- const onlyShowStart = isTypingStart || (!start && isPick);
- const onlyShowEnd = isTypingEnd || (!end && isPick);
- const showStart = !onlyShowEnd;
- const showEnd = !onlyShowStart;
- const showBoth = !(isPick || isTyping);
- const hasBoth = start && end;
- const startValue =
- q !== null ? q : isPick ? (shop ? shop.name : "") : start ? start.name : "";
- const endValue =
- q !== null ? q : isPick ? (shop ? shop.name : "") : end ? end.name : "";
-
- useEffect(() => { onIsTypingChange(isTyping) }, [isTyping])
- return (
-
blurMap()}
- >
-
{
- if (isPick) setIsPick(false);
- else if (isTypingStart) {
- setQ(null);
- setIsTypingStart(false);
- } else if (isTypingEnd) {
- setQ(null);
- setIsTypingEnd(false);
- } else exit();
- }}
- >
-
-
-
- {showBoth &&
}
- {showStart && (
-
-
-
setIsTypingStart(true)}
- onChange={(e) => setQ(e.target.value)}
- readOnly={isPick}
- disabled={isPick}
- placeholder={isPick ? "请点击地图选择起点" : "请输入起点"}
- >
- {(start || (isPick && shop)) && (
-
- {floors[(start ? start : shop).floorOrder][1]}
-
- )}
-
- {start === null && isPick && (
-
{
- setIsPick(false);
- onSetStart(shop);
- }}
- >
- 开始导航
-
- )}
- {start === null && !isPick && !isTypingStart && (
-
{
- setQ(null);
- setIsPick(true);
- setIsTypingStart(false);
- setIsTypingEnd(false);
- }}
- >
- 地图选点
-
- )}
-
-
- )}
- {showEnd && (
-
-
-
setIsTypingEnd(true)}
- onChange={(e) => setQ(e.target.value)}
- readOnly={isPick}
- disabled={isPick}
- placeholder={isPick ? "请点击地图选择终点" : "请输入终点"}
- >
- {((isPick && shop) || end) && (
-
- {floors[(end ? end : shop).floorOrder][1]}
-
- )}
-
- {end === null && isPick && (
-
{
- setIsPick(false);
- onSetEnd(shop);
- }}
- >
- 开始导航
-
- )}
- {end === null && !isPick && !isTypingEnd && (
-
{
- setQ(null);
- setIsPick(true);
- setIsTypingEnd(false);
- }}
- >
- 地图选点
-
- )}
-
-
- )}
-
- {showBoth &&
onSwap()}>
}
-
- {showBoth && !hasBoth && (
-
- 请在顶部选择{!start ? "起" : "终"}点
-
- )}
- {isTyping && q && (
-
- {
- if (isTypingStart) {
- onSetStart(shop);
- setQ(null);
- setIsTypingStart(false);
- }
- if (isTypingEnd) {
- onSetEnd(shop);
- setQ(null);
- setIsTypingEnd(false);
- }
- }}
- top={"70px"}
- isRow={true}
- >
-
- )}
-
- );
-};
-
-export default HeadBar;
diff --git a/src/components/HeadBar/HeadBar.scss b/src/components/HeadBar/HeadBar.scss
deleted file mode 100644
index 420bdd9..0000000
--- a/src/components/HeadBar/HeadBar.scss
+++ /dev/null
@@ -1,271 +0,0 @@
-.head-bar {
- display: flex;
- box-sizing: border-box;
- width: calc(100vw - 20px);
- margin-left: 10px;
- margin-top: 10px;
- font-size: 16px;
- line-height: 44px;
- position: relative;
- z-index: 1;
- height: 64px;
- position: relative;
- border-radius: 12px;
- align-items: center;
- pointer-events: auto;
- &.double {
- height: 114px;
- .back {
- height: 114px;
- }
- .content {
- height: 114px;
- }
- }
-
- .back {
- display: flex;
- justify-content: center;
- align-items: center;
- position: relative;
- background: #ffffff;
- flex: 0 0 50px;
- margin-right: 8px;
- height: 64px;
- border-radius: 12px;
- img {
- width: 32px;
- height: 32px;
- }
- }
- .content {
- display: flex;
- flex-direction: column;
- justify-content: center;
- background: #ffffff;
- height: 64px;
- z-index: 2;
- flex: 1;
- position: relative;
- border-radius: 12px;
- .dots {
- position: absolute;
- top: 0;
- bottom: 0;
- left: 23px;
- width: 2px;
- height: 2px;
- border-radius: 50%;
- background: #c9cbd1;
- margin: auto 0;
- &::before {
- content: "";
- display: block;
- position: absolute;
- top: -6px;
- width: 2px;
- height: 2px;
- border-radius: 50%;
- background: #c9cbd1;
- left: 0;
- right: 0;
- margin: 0 auto;
- }
- &::after {
- content: "";
- display: block;
- position: absolute;
- bottom: -6px;
- width: 2px;
- height: 2px;
- border-radius: 50%;
- background: #c9cbd1;
- left: 0;
- right: 0;
- margin: 0 auto;
- }
- }
- .row {
- position: relative;
- line-height: 57px;
- height: 57px;
- padding-left: 48px;
- padding-right: 49px;
- &.start {
- background: 16px center/16px 16px no-repeat url("./start.png");
- }
- &.end {
- background: 16px center/16px 16px no-repeat url("./end.png");
- }
- &.single {
- padding-right: 10px;
- }
- .text {
- display: flex;
- align-items: center;
- input {
- border: none;
- background: transparent;
- display: inline-block;
- line-height: 57px;
- outline: none;
- width: 100%;
- font-family: PingFang SC;
- font-style: normal;
- font-weight: 600;
- font-size: 18px;
- color: #323337;
- }
- ::placeholder {
- font-size: 16px;
- font-weight: 400;
- color: #c9cbd1;
- }
- &.has-border {
- border-top: 1px solid rgba(238, 238, 238, 0.7);
- }
-
- .label {
- display: inline-block;
- flex: 0 0 30px;
- text-align: right;
- margin-left: 8px;
- font-style: normal;
- font-weight: bold;
- font-size: 12px;
- color: #b3aea7;
- }
- .right {
- background: #f3f4f8;
- border: 1px solid #edeff3;
- box-sizing: border-box;
- border-radius: 8px;
- font-family: PingFang SC;
- font-style: normal;
- font-weight: 600;
- font-size: 12px;
- line-height: 33px;
- color: #437af7;
- flex: 0 0 80px;
- text-align: center;
- display: inline-block;
- white-space: nowrap;
- margin-left: 8px;
- }
- }
- }
- .switch {
- position: absolute;
- width: 49px;
- height: 32px;
- background-image: url("./switch.png");
- background-size: contain;
- background-repeat: no-repeat;
- background-position: center;
- top: 0;
- bottom: 0;
- right: 0;
- margin: auto 0;
- }
- }
- .banner {
- position: absolute;
- display: flex;
- background: rgba(0, 0, 0, 0.6);
- width: 237px;
- line-height: 40px;
- height: 40px;
- text-align: center;
- bottom: -48px;
- left: 0;
- right: 0;
- margin: auto;
- font-family: PingFang SC;
- font-style: normal;
- font-weight: normal;
- font-size: 14px;
- color: #ffffff;
- border-radius: 20px;
- justify-content: center;
- align-items: center;
- &.start::before {
- content: "";
- display: inline-block;
- width: 16px;
- height: 16px;
- margin-right: 8px;
- vertical-align: middle;
- background-image: url("./start.png");
- background-size: contain;
- }
- &.end::before {
- content: "";
- display: inline-block;
- width: 16px;
- height: 16px;
- margin-right: 8px;
- vertical-align: middle;
- background-image: url("./end.png");
- background-size: contain;
- }
- &::after {
- content: "";
- display: inline-block;
- margin-left: 8px;
- width: 16px;
- height: 16px;
- vertical-align: middle;
- background-image: url("./arrow.png");
- background-size: contain;
- }
- }
- .shop-list-wrapper {
- position: absolute;
- top: 64px;
- left: -10px;
- width: 100vw;
- height: calc(100vh - 74px);
- overflow-x: hidden;
- overflow-y: auto;
- }
- .search-type {
- position: absolute;
- top: 100px;
- width: 100vw;
- height: 40px;
- line-height: 40px;
- background: #fff;
- display: flex;
- color: #404040;
- left: 0;
- font-size: 12px;
- .el {
- flex: 1 1 33%;
- text-align: center;
- span {
- position: relative;
- display: inline-block;
- img {
- width: 18px;
- height: 18px;
- vertical-align: middle;
- margin-right: 8px;
- }
- &.active {
- color: #0074ed;
- }
- &.active {
- &::after {
- content: "";
- position: absolute;
- width: 100%;
- height: 4px;
- background: #0074ed;
- bottom: 0;
- left: 0;
- }
- }
- }
- }
- }
-}
diff --git a/src/components/HeadBar/arrow.png b/src/components/HeadBar/arrow.png
deleted file mode 100644
index 9ec8fc50d5849f4d1a8b70fa85f3fcb0d7ec448f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 316
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
V1%*6NF~tA?002ovPDHLkV1hzDTzmik
diff --git a/src/components/Malls/Malls.js b/src/components/Malls/Malls.js
deleted file mode 100644
index bf13189..0000000
--- a/src/components/Malls/Malls.js
+++ /dev/null
@@ -1,260 +0,0 @@
-import React, { useState, useEffect, useContext } from "react";
-import { ListView } from "antd-mobile";
-import Modal from "react-modal";
-import "./Malls.scss";
-import search from "./search.png";
-import pos from "./pos.png";
-import close_white from "./close_white.png";
-import up from "./up.png";
-import {
- Mall,
- cityMallsGetter,
- CityMall,
-} from "../../js/helpers/data-helper.js";
-import { MallCode } from "../../pages/Index/Index";
-
-const getSectionData = (dataBlob, sectionID) => dataBlob[sectionID];
-const getRowData = (dataBlob, sectionID, rowID) => dataBlob[rowID];
-
-function genData(ds, cityMalls) {
- const dataBlob = {};
- const sectionIDs = [];
- const rowIDs = [];
- const groupByIndex = (list) =>
- list.reduce((acc, nxt) => {
- acc[nxt.index] = acc[nxt.index] ? [...acc[nxt.index], nxt] : [nxt];
- return acc;
- }, {});
- const data = groupByIndex(cityMalls);
- Object.keys(data).forEach((item, index) => {
- sectionIDs.push(item);
- dataBlob[item] = item;
- rowIDs[index] = [];
-
- data[item].forEach((city) => {
- rowIDs[index].push(city.name);
- dataBlob[city.name] = city;
- });
- });
- return ds.cloneWithRowsAndSections(dataBlob, sectionIDs, rowIDs);
-}
-
-const Malls = ({ isOpen, onRequestClose, setMallCode }) => {
- const [q, setQ] = useState("");
- const [showList, setShowList] = useState(false);
- const [cities, setCities] = useState([]);
- const [currentMall, setCurrentMall] = useState(null);
- const [currentCity, setCurrentCity] = useState(null);
- const [currentMalls, setCurrentMalls] = useState([]);
- const [isMallExpand, setIsMallExpand] = useState(false);
- const [dataSource, setDataSource] = useState(
- new ListView.DataSource({
- getRowData,
- getSectionHeaderData: getSectionData,
- rowHasChanged: (row1, row2) => row1 !== row2,
- sectionHeaderHasChanged: (s1, s2) => s1 !== s2,
- })
- );
- const mallCode = useContext(MallCode);
- const setDefaultCityMall = (list) => {
- setCurrentCity(list[0]);
- setCurrentMall(list[0].malls[0]);
- setCurrentMalls(list[0].malls);
- };
-
- useEffect(() => {
- document.title = "城市商场选择";
- cityMallsGetter().then((cityMalls) => {
- setCities(cityMalls);
- setDataSource(genData(dataSource, cityMalls));
-
- if (cityMalls.length) {
- const city = cityMalls.find(({ malls }) =>
- malls.find(({ code }) => mallCode === code)
- );
- if (city) {
- setCurrentCity(city);
- const mall = city.malls.find(({ code }) => mallCode === code);
- if (mall) setCurrentMall(mall);
- setCurrentMalls(city.malls);
- } else setDefaultCityMall(cityMalls);
- }
- });
- }, [mallCode]);
-
- return (
- onRequestClose()}
- >
- setIsMallExpand(false)}>
-
- setQ(e.target.value)}
- onFocus={() => setShowList(true)}
- onBlur={() => !q && setShowList(false)}
- >
-
-
- {q && (
-
setQ("")} />
- )}
- {showList && (
-
- {cities
- .filter(({ name }) => name.includes(q))
- .map((city) => (
-
{
- setCurrentCity(city);
- setCurrentMall(city.malls[0]);
- setCurrentMalls(city.malls);
- setShowList(false);
- }}
- >
- {city.name}
-
- ))}
-
- )}
- {!showList && (
-
-
-
-
- {currentCity &&
{currentCity.name}}
-
- {currentMall &&
{currentMall.name}}
-
-
-
当前定位城市
-
-
切换商场
-
{
- setIsMallExpand(false);
- }}
- >
-
{
- e.stopPropagation();
- }}
- >
- {currentMalls.map((mall) => (
-
{
- console.log("setMallCode", mall.code);
- setCurrentMall(mall);
- setIsMallExpand(false);
- setMallCode(mall.code);
- onRequestClose();
- // Taro.reLaunch({
- // url: `/pages/index/index?mallId=${mall.id}`
- // });
- }}
- >
- {mall.name}
-
- ))}
- {!isMallExpand && (
-
{
- e.stopPropagation();
- setIsMallExpand(true);
- }}
- >
- 更多
-
- )}
- {isMallExpand && (
-
{
- e.stopPropagation();
- setIsMallExpand(false);
- }}
- >
- )}
-
-
(
-
- )}
- renderHeader={() => (
-
-
切换城市
-
- {cities.map((city) => (
-
{
- setCurrentCity(city);
- setCurrentMall(city.malls[0]);
- setCurrentMalls(city.malls);
- }}
- >
- {city.name}
-
- ))}
-
-
{
- setCurrentCity(rowData);
- setCurrentMalls(rowData.malls);
- setCurrentMall(rowData.malls[0]);
- }}
- >
- {rowData.name}
-
- )}
- quickSearchBarStyle={{
- position: "absolute",
- top: 25,
- }}
- delayTime={10}
- delayActivityIndicator={
-
- rendering...
-
- }
- />
-
-
- )}
-
-
- {searchTypes.map(({ id, name, bg, bgb }) => (
-
{
- onClickSearchType(id);
- }}
- >
-
-
{name}
-
- ))}
-
-
-
onClickDisplayMode(displayMode == 0 ? 1 : 0)}
- >
-
- {displayMode == 0 ? "2D" : "3D"}
-
-
-
-
setShowNav(true)}
- >
-
- 导航
+
+
+
})
+
{routeSearchText}
+
+ 剩余{meters}米 {" "}
+ {minutes}分钟
+
setShowNav(false)}
+ className="bar"
+ style={{
+ width: `calc((100vw - 52px) * ${progressNum / 100} + 16px)`,
+ }}
+ >
+
+
-
- 目的地
+ {progressText}
- {showText && !hideSwitch && (
-
- {routeSearchAnimationType === 1
- ? "已切转地图视角"
- : "已切转方向标视角"}
-
- )}
- {!hideSwitch && (
-
{
- switchType();
- }}
- />
- )}
- {showNav ? (
-
-
-
{routeSearchText}
-
- 剩余{meters}米 {" "}
- {minutes}分钟
-
-
onExit()}
- >
-
-
-
- {progressText}
-
- {!hidePause && (
-
{
- puaseOrResume();
- }}
- />
- )}
-
- ) : (
-
- {end.logoPath &&
}
-
onExit()}
- >
-
{end.name}
-
-
{end.floorName}
{end.shopFormat}
-
-
- )}
+
+ {end.logoPath &&
}
+
onExit()}
+ >
+
正在导航到...
+
{end.name}
+
);
};
diff --git a/src/components/NavBottom/NavBottom.scss b/src/components/NavBottom/NavBottom.scss
index 6dfe511..ac4a16c 100644
--- a/src/components/NavBottom/NavBottom.scss
+++ b/src/components/NavBottom/NavBottom.scss
@@ -1,55 +1,16 @@
.nav-bottom {
position: absolute;
width: calc(100vw - 20px);
- left: 8px;
- bottom: 26px;
+ left: 10px;
+ bottom: 22px;
+ height: 220px;
+ background: #ffffff;
+ box-shadow: 0px 15px 24px rgba(0, 0, 0, 0.05);
border-radius: 18px;
- height: 200px;
- padding: 14px 0 0 14px;
- background: #fff;
z-index: 30;
- .tabs {
- position: absolute;
- display: flex;
- justify-content: center;
- align-items: center;
- bottom: 14px;
- left: 14px;
- right: 14px;
- height: 56px;
- background: #f3f4f8;
- border-radius: 10px;
- .tab {
- display: flex;
- width: calc((100vw - 20px - 28px - 12px) / 2);
- height: 48px;
- font-family: PingFang SC;
- font-style: normal;
- font-weight: 500;
- font-size: 16px;
- line-height: 22px;
- color: #323337;
- justify-content: center;
- align-items: center;
- img {
- width: 20px;
- height: 20px;
- margin-right: 8px;
- }
- &.active {
- background: linear-gradient(180deg, #508af7 0%, #5ea5f9 100%);
- box-shadow: 0px 6px 12px rgba(93, 172, 249, 0.2);
- border-radius: 10px;
- color: #fff;
- }
- }
- }
.nav {
- position: absolute;
- left: 0;
- right: 0;
- top: 0;
- bottom: 82px;
+ position: relative;
+ height: 110px;
.dir {
position: absolute;
top: 14px;
@@ -91,40 +52,23 @@
margin: 0 4px;
}
}
- .exit {
- position: absolute;
- top: 20px;
- right: 12px;
- width: 48px;
- height: 48px;
- text-align: center;
- border: 1px solid #e2e1df;
- box-sizing: border-box;
- border-radius: 12px;
- font-style: normal;
- font-weight: normal;
- font-size: 14px;
- line-height: 48px;
- color: #6a6665;
- }
+
.progress {
position: absolute;
- left: 20px;
- right: 20px;
- top: 108px;
- height: 4px;
- background: #edeff3;
- border-radius: 5px;
+ left: 0;
+ right: 0;
+ bottom: -1px;
+ height: 2px;
+ background: rgba(0, 0, 0, 0.05);
z-index: 1;
}
.bar {
position: absolute;
- left: 20px;
- right: 20px;
- top: 108px;
+ left: 0;
+ right: 0;
+ bottom: -2px;
height: 4px;
- background: #437af7;
- border-radius: 5px;
+ background: #516dd8;
z-index: 2;
}
@@ -132,21 +76,19 @@
display: flex;
position: absolute;
z-index: 3;
- width: 33px;
- height: 14px;
- top: 103.5px;
- background: #ffffff;
+ width: 32px;
+ height: 15px;
+ bottom: -7.5px;
+ background: linear-gradient(113.71deg, #435acd 0%, #749cf3 100%);
text-align: center;
- border: 2px solid #437af7;
border-radius: 12px;
font-family: DINPro;
font-style: normal;
font-weight: bold;
font-size: 10px;
- color: #437af7;
+ color: #fff;
justify-content: center;
align-items: center;
- transform: translate(-50%, 0);
}
.close-icon {
@@ -199,11 +141,8 @@
}
}
.destination {
- position: absolute;
- left: 0;
- right: 0;
- top: 0;
- bottom: 82px;
+ position: relative;
+ height: 110px;
.avatar {
position: absolute;
width: 80px;
@@ -217,15 +156,15 @@
.close-icon {
position: absolute;
- top: 16px;
- right: 16px;
- width: 24px;
- height: 24px;
+ top: 14px;
+ right: 14px;
+ width: 52px;
+ height: 82px;
z-index: 10;
}
.name {
position: absolute;
- top: 24px;
+ top: 57px;
left: 108px;
font-family: PingFang SC;
font-style: normal;
@@ -233,7 +172,7 @@
font-size: 24px;
line-height: 34px;
color: #323337;
- right: 20px;
+ right: 80px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
@@ -241,95 +180,12 @@
.meta {
display: flex;
position: absolute;
- top: 68px;
+ top: 29px;
left: 108px;
- right: 20px;
- font-family: PingFang SC;
- font-style: normal;
- font-weight: 500;
+ font-weight: 600;
font-size: 14px;
line-height: 20px;
- color: #a1a5b3;
- align-items: center;
- justify-content: space-between;
+ color: rgba(0, 0, 0, 0.4);
}
}
- .switch {
- position: absolute;
- top: -52px;
- right: 0;
- height: 40px;
- line-height: 40px;
- color: #fff;
- border-radius: 85px;
- font-size: 12px;
- font-family: SourceHanSansCN-Regular, SourceHanSansCN;
- font-weight: 400;
- background: rgba(0, 0, 0, 0.2);
- padding-left: 12px;
- padding-right: 42px;
- animation: 3s ease-out fadeout;
- @keyframes fadeout {
- from {
- opacity: 1;
- }
- to {
- opacity: 0;
- }
- }
- }
- .switch-pic {
- position: absolute;
- top: -52px;
- right: 0;
- width: 40px;
- height: 40px;
- vertical-align: middle;
- box-shadow: 0px 8px 8px rgba(104, 110, 127, 0.04);
- }
- .ar-btn {
- display: flex;
- flex-direction: row;
- justify-content: center;
- align-items: center;
- position: absolute;
- width: 111px;
- height: 40px;
- left: 0;
- top: -52px;
- background: #ffffff;
- border-radius: 20px;
- font-family: PingFang SC;
- font-style: normal;
- font-weight: 600;
- font-size: 16px;
- line-height: 40px;
- color: #474a56;
- img {
- width: 24px;
- height: 24px;
- margin-right: 8px;
- }
- }
- .br {
- margin-bottom: 8px;
- }
- .gold {
- font-weight: 400;
- color: #b48764;
- }
- .big {
- font-size: 20px;
- font-family: DINPro-Bold, DINPro;
- font-weight: bold;
- margin: 0 5px;
- }
- .pause {
- position: absolute;
- width: 40px;
- height: 40px;
- top: -100px;
- right: 0;
- box-shadow: 0px 8px 8px rgba(104, 110, 127, 0.04);
- }
}
diff --git a/src/components/NavBottom/close.png b/src/components/NavBottom/close.png
index 47bcaaf78eb7f59f28bffc53527f97318e80f7bc..475f0c006127f563faa5719f68663da25c18baf6 100644
GIT binary patch
literal 17109
zcmV)3K+C_0P)
C}J#fkurb?R!k+iQf^YYhzLdo
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
delta 558
zcmV+}0@3}|g#pwAA&F2uC{S0Hb+NUES+#PIRv_Plhxba70-cj}`
zBp^JC09XlA;eY4SN3`ONh^GfEmEt)Jg$GCkfGmkLsKNtUOK6d-<+KcCcz{d*$djNB
z4=5FLr~yfTl6**~%X-@+6fHZ}K_-wFK7m?-WC^W%&qtD9u1-o*iUZnrAa9eRDgd+4
z62R`TCM60BsFnw&Bnk->t$%GyNGJ>F7G~5EN&-|>C8Y$qm=liEfa8?qcAfGdvx@!N
z-u3-k)VULSAJ~}9k5v99(yVR#$3Z`BpD=c;A|(rw?^K1^vINZGdH3j33FZF-&F0y;
wl$%5BEyf~*6CY^tBNJm=EEbE!Vll-x0$qsgDatd}00000NkvXXt^-0~f)$bSO#lD@
diff --git a/src/components/Options/2d.png b/src/components/Options/2d.png
deleted file mode 100644
index a9e9f48daa29a97e006aedc134929331e871be35..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1785
zcmV(h5~qns((-InU=M+~R|7as0SVV4^j6TLZZ?;JWUkTI($`uasKldERfvLtACnKx=F3
zz3Fti6Ts)Q03WWbtZeJ*>UyV~M9M~B!GZ3LpvsU%7w(9+T}BZ{IO
z0KOgqZ(go`0lGy%tP
z8kzYy0G~Dv`XhklK@fO_9B$jT3t%sRPZ;apAfjcy@AniUBeSMp0Uy2$17Ak2CWR
z0o08$C;D9!MJtlYWJzwZsj2DSL?W@9nIAR)_Y=`~ec%5%0I`*vBQF8VvK~-MJ;%&*
z3<-Y$@Kg{4zb)j33SDE{_9Fm(0^noDCG~2pmxW>YdM-I*5|}-EcI~7|lh!lyasY{V
z^AI!dxOnm6hQ7YO%Y_0fW?e%=!<~~SPyRj;tprdN?~RCP@1;wZ)|@_T5pV_dPOX6kcirS-|rkDVB7XT0o)x=GBbZU48sGZ9$wD<
zuInz+TK~!jfER)w_+Ul@9n8EAK!)J}fUV5DB@9FPd%}igSv7I2Xa`VZypVOi?{6Hn
zf%)_2e@0v;fQJmUeaQAa
z?%x2`r&6h1eSLlD@gUOB&`?=hTl+MCH2^-4u}J{GR7$mbp7&n%xp^b8ZQJt!$g`Sd
zY#P-8YdttP_-1c!uQ;2lMm7O?LSF;$U=&50BrT3_m6UxIfC~URay}u;vL1>nr;HKr
z41z#H`p9T*ZvJQ#MZ1XTF$3@gB3kYH{tM>2ERc|L9A^nLi@jxBIGFj>s;a7|y1KeX
z?9H}q$qGhs05~NvAq>M)qekpF&NXh7h#v8MzbhL|>=~qJzb`Y#%;FIw=^7Dwy)njR
z$(BC@XbXbi_vU^{yX))gI{zQsP!tL0A66`)nOQl$GB!#
zmNkWlh=V-4O&+Ppm2<|Q^m2h2m=J4?F9wKTn4t_5V
z^ZQINj^iwj)0KKdbKMmc6;j;4oeOxbR6;H<2!h>ZN#<9b0yl{wRCQ&_Ho2Eg`IDz!0RLF2ma{aS1312tv=>`_WB
z^*ry*T)@jx(3rxdq>NqbXN~U*DJjXatZxv}M%l;A9bp*0n6JJqYe|`PLsHa#Q!>-+
zqF!s=7KY)wdERlRdoh~3WUtLr)UWb=|7Rr?^;z1uhlr%DB9VGL+bX|c=4Zn&{6{_m
z&&(ClR=G;fE!)`2(ndn+1OQS5nZ3^aQ4|&3S`<0V+!=C-LmaP&khBSlkenR6-iHua*t9A!ytPj0f1UWZoulvu--qIkz=1
b(Hi&<1E(=wjmrnj00000NkvXXu0mjfqPJRH
diff --git a/src/components/Options/3d.png b/src/components/Options/3d.png
deleted file mode 100644
index 271cd17910156d0a0fb63b850ed9cc4ed75bbc86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1798
zcmV+h2l@DkP)!VB)wHSF0z!oXQqm6!
zRY2*7Cfce$O4CS!F)`g_@y^U%iiFs0Q=?IfrfRfNR}`V8%kI7NHt*&fG92!5@7;SB
zVr2fDoHHNq^US>S&b-ed{Eru!E&NH6-0YmYPsR^|U`we~dS*6kwVi-c>N;lL4Pa3Y
z@N-18N^AW>JBhT7z~aS=FDn!ZTLF9lKsXJ^Du5qUDwRzK4jdS32a%Qu^!N97^!E1N
z31AC=w|b!d!OWZForr|kJG{F80=Vz^@#Bw;j*d>YLZl@EN~u9+-UZ+T9*7AddbG2%
z^Zucsq2uy>aB#5q)TvYVGV@&k=6G#?M?`D1)o5|k;SYwQN
zwh;hv918(ix%c}k2VnQflP4cMeE9Ix$~96NB|u84TbTJF0PpmDIS7IWjvYJpNVC2y
zduRUq`751sn{#{T??kjwYyBetT#rOu0!x-GSr~@lZf5?dH<$zP!;X%Qjl;vk|Ey=^
zT=fG318<+4oRo>VRgR3TEfM{)TCJ`c85ucruKv>!P)c0^U^_E^P6CNH$U$)-W6WqP
z!1I0MIPMo00`PIKj)`awfP1vof2(EhECNv!bpcpQME3xg>vj4ofc3_hr`rj<29eJK
zco@LDyt>zzc{_le*4pti0zi!cB&2=9`#w%YI}3%vw&CI7*Jl%aHuk{4z*{Pn$_8d$
z3qU4xsu0nT*80o{R)c_?mYFZ^t5&Obm&@f>&IjZi+dce!fJmtE_zI<2*T^1mykT3dlUD5aE2
zv#t+$b(2K&xTKNR+GDkdL{T(f(o1Ik3V;r;&9BpJP1owzb^>B##flZ-(W6Jd#LSZS
zUYZ$Z=CL3MHfgP&1R!@NDS=Yzi_W>NM0A-4^4~5XbI~4u%
zW+c4~zElr*R)1ayctmaj@J#^k&H?-jfUg;2e%vVV3qnAQE?l^Sysm&ZYj-j8Bk3MkskMG|Cg3j;XkpeauD}J`#Hrt2T!H`Z6#&pu
zN~x4;n+r9Y(6l9~ZwCRT)RoLEr}}47ZK|Q9{w!HVbWCR6X04S>tfA5h0XfM#J3H4A
z(K-MX@&>RWm*TxDVwcwXsYW!*nG#S+tw?A6N^hoKC!+1nxgB+dt*nzI
z*_BE~)G)cvoYpJ>98PbO@|?CbOCU*-Yn^j)?T)-b~aGq1DOiZXassVnZral9bC
zCd)G`lBhg2F)^{>;K746)rm$4EMLC-(us+QET1T32AEkSm6g`o=gu`zbqS=MMPC1W
zs!v|-4JdnJoBXB8FKrY>cgmj{X)AwbthJB%KqR9Z8ymZWh$N%y^XkT!d9$@vZnIfN
zH!X)o2}}(TMbTU$lD#2&HEj5wa;gDOP4NKVCEtxh#G%c*9}Y{D>HT`HA+CGQdj<*Bv)v-iG(nLnMA?0*hm
zwK3*5=W>^}5y%Egk|cJ{i9F)Z=V>
oW1eUvEH=w*)(A8UWTx%k1nbDwUhO;nv;Y7A07*qoM6N<$f}Eju=>Px#
diff --git a/src/components/Options/Options.js b/src/components/Options/Options.js
deleted file mode 100644
index cc6be86..0000000
--- a/src/components/Options/Options.js
+++ /dev/null
@@ -1,137 +0,0 @@
-import React from "react";
-import Modal from "react-modal";
-import flat from "./2d.png";
-import thrD from "./3d.png";
-import on from "./on.png";
-import mute from "./mute.png";
-import ft from "./ft.png";
-import ftb from "./ftb.png";
-import ztb from "./ztb.png";
-import zt from "./zt.png";
-import shortest from "./shortest.png";
-import shortestb from "./shortestb.png";
-import ft1 from "./ft1.png";
-import ftb1 from "./ftb1.png";
-import ztb1 from "./ztb1.png";
-import zt1 from "./zt1.png";
-import shortest1 from "./shortest1.png";
-import shortestb1 from "./shortestb1.png";
-import "antd-mobile/lib/switch/style/css";
-import "./Options.scss";
-
-export const displayModes = [
- {
- id: 0,
- name: "2D",
- bg: flat,
- },
- {
- id: 1,
- name: "3D",
- bg: thrD,
- },
-];
-export const searchTypes = [
- {
- id: 0,
- name: "最佳",
- bg: shortest,
- bgb: shortestb,
- bg1: shortest1,
- bgb1: shortestb1,
- },
- {
- id: 1,
- name: "扶梯",
- bg: ft,
- bgb: ftb,
- bg1: ft1,
- bgb1: ftb1,
- },
- {
- id: 2,
- name: "直梯",
- bg: zt,
- bgb: ztb,
- bg1: zt1,
- bgb1: ztb1,
- },
-];
-export const audioOptions = [
- {
- id: 0,
- name: "语音",
- bg: on,
- },
- {
- id: 1,
- name: "语音",
- bg: mute,
- },
-];
-
-const Options = ({
- show,
- hide,
- onClickDisplayMode,
- onClickSearchType,
- onClickPlayAudioMode,
- showHeadBar,
-}) => (
- 
- 
- {name}
-