From b9ccc5702c9553cf25e0ed7fd07bec0717a017cf Mon Sep 17 00:00:00 2001 From: jiannibang <271381693@qq.com> Date: Fri, 21 Jul 2023 14:11:33 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=AF=BB=E8=BD=A6=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/js/helpers/data-helper.js | 39 ++++------------------------------- src/pages/Car/Car.js | 15 +++++++------- src/pages/Index/Index.js | 3 +-- 3 files changed, 12 insertions(+), 45 deletions(-) diff --git a/src/js/helpers/data-helper.js b/src/js/helpers/data-helper.js index a4dc7c8..e2ca1d6 100644 --- a/src/js/helpers/data-helper.js +++ b/src/js/helpers/data-helper.js @@ -108,27 +108,10 @@ const getMallInfo = async ({ memberID }) => { } })(), (async () => { - try { - const { data: activities } = await post( - `/api/ar/v1/applet/MallActList`, - { - memberID, - } - ); - return activities; - } catch (error) { - console.error(error); - return []; - } + return []; })(), (async () => { - try { - const { data: pois } = await post(`/api/ar/v1/applet/GetPoiList`); - return pois; - } catch (error) { - console.error(error); - return []; - } + return []; })(), (async () => { try { @@ -140,21 +123,7 @@ const getMallInfo = async ({ memberID }) => { } })(), (async () => { - try { - const { - data: { shopDetailShowCoupon, level: userLevel }, - } = await post(`/api/ar/v1/applet/MiniproBasicData`, { - memberID, - }); - const shopCouponMap = shopDetailShowCoupon.reduce( - (acc, nxt) => ({ ...acc, [nxt]: true }), - {} - ); - return { shopCouponMap, userLevel }; - } catch (error) { - console.error(error); - return {}; - } + return {}; })(), ]); mall.name = "SKP"; @@ -220,7 +189,7 @@ const getMallInfo = async ({ memberID }) => { mapData.buildArr.forEach(({ mapData: { parkArea } }) => { parkArea.forEach(({ parkNum }) => mall.lots.push(parkNum)); }); - console.log(mapData, shopInfo); + console.log(mall.lots, shopInfo); Object.assign(mall, { floorData: mall.floors, shopInfo, diff --git a/src/pages/Car/Car.js b/src/pages/Car/Car.js index 7ecb064..4a66309 100644 --- a/src/pages/Car/Car.js +++ b/src/pages/Car/Car.js @@ -1,6 +1,5 @@ import React, { useState, useEffect } from "react"; import car from "./car.png"; -import axios from "axios"; import "./Car.scss"; import plus from "./plus.svg"; import Keyboard from "../Keyboard/Keyboard"; @@ -8,10 +7,10 @@ import platepng from "./plate.png"; import plateActive from "./plate_active.png"; import lot from "./lot.png"; import lotActive from "./lot_active.png"; - +import { post } from "../../js/helpers/data-helper"; const Car = ({ lots, onLot = () => {}, plate, hasReverse }) => { const [isPlate, setIsPlate] = useState(hasReverse); - const [qArr, setQArr] = useState(hasReverse ? ["苏", "A"] : []); + const [qArr, setQArr] = useState(hasReverse ? ["川", "A"] : []); const [opened, setOpened] = useState(false); const [showKeyBoard, setShowKeyBoard] = useState(true); const [focusedIndex, setFocusedIndex] = useState(hasReverse ? 2 : 0); @@ -33,7 +32,7 @@ const Car = ({ lots, onLot = () => {}, plate, hasReverse }) => { return window.weui.toast("敬请期待", { className: "toast", }); - setQ("苏A"); + setQ("川A"); setIsPlate(true); setFocusedIndex(2); setShowKeyBoard(true); @@ -54,17 +53,17 @@ const Car = ({ lots, onLot = () => {}, plate, hasReverse }) => { } const { data: { data, code, msg }, - } = { data: { data: null, code: "201", msg: "123" } }; + } = await post("/api/ar/v1/applet/GetCarSpace", { CarNum: q }); if (code !== 200) return window.weui.toast(msg, { className: "toast", }); else { - if (!lots.includes(data.spaceNo)) - return window.weui.toast(`未找到车位号:${data.spaceNo}`, { + if (!lots.includes(data.spaceNum)) + return window.weui.toast(`未找到车位号:${data.spaceNum}`, { className: "toast", }); - return onLot(data.spaceNo); + return onLot(data.spaceNum); } } // if (!q || !lots.includes(floor + q.toUpperCase())) { diff --git a/src/pages/Index/Index.js b/src/pages/Index/Index.js index 5239516..d2d2648 100644 --- a/src/pages/Index/Index.js +++ b/src/pages/Index/Index.js @@ -238,7 +238,7 @@ const Index = () => { return { lastSearch: data }; case "addLine": lastSearch && - lastSearch.forEach(({ floorOrder: floorOrder, addLine }) => { + lastSearch.forEach(({ floorOrder, addLine }) => { Number(floorOrder) === data && addLine(); }); return { lastSearch }; @@ -353,7 +353,6 @@ const Index = () => { onBlurP: handleBlur, onSearchStart: (navigation) => { const { pathsByFloor } = navigation; - console.log(navigation); if (pathsByFloor.length === 1) setElevations([]); else { let result = [];