修复已知问题

This commit is contained in:
2025-06-06 18:23:07 +08:00
parent 3ac3fd8cb2
commit 7ff3e3f064
51 changed files with 2503 additions and 1257 deletions

View File

@@ -1,18 +1,15 @@
import Header from './Header'
// import BestSellers from "./BestSellers";
import './index.scss'
import Taro from '@tarojs/taro';
import {Map} from '@tarojs/components'
import {Search} from '@nutui/icons-react-taro'
import {Button, Input} from '@nutui/nutui-react-taro'
// import {InfiniteLoading} from '@nutui/nutui-react-taro'
import {useShareAppMessage, useShareTimeline} from "@tarojs/taro"
import {useEffect, useState} from "react";
import ExpirationTime from "./ExpirationTime";
import {User} from "@/api/system/user/model";
import {getSiteInfo, getUserInfo, getWxOpenId} from "@/api/layout";
import Login from "./Login";
import {CmsWebsite} from "@/api/cms/cmsWebsite/model";
import {pageByQQMap, pageHjmCar} from "@/api/hjm/hjmCar";
import {HjmCar} from "@/api/hjm/hjmCar/model";
@@ -26,8 +23,8 @@ export interface Market {
}
function Home() {
const [website, setWebsite] = useState<CmsWebsite>()
const [IsLogin, setIsLogin] = useState<boolean>(true)
const [search, setSearch] = useState(false)
const [userInfo, setUserInfo] = useState<User>()
const [longitude, setLongitude] = useState<any>(108.374959)
const [latitude, setLatitude] = useState<any>(22.767024)
@@ -35,12 +32,6 @@ function Home() {
const [scale, setScale] = useState<any>(16)
const [keywords, setKeywords] = useState<string>('')
const [list, setList] = useState<HjmCar[]>([])
console.log(userInfo?.nickname)
console.log(website?.websiteName)
console.log(list.length)
// const [hasMore, setHasMore] = useState(true)
// const [list, setList] = useState<BszxPay[]>([])
// const [page, setPage] = useState(1)
useShareTimeline(() => {
return {
@@ -168,6 +159,7 @@ function Home() {
name: `${data.organization}`
}])
}
console.log(list.length,'carList.length')
})
};
@@ -178,7 +170,9 @@ function Home() {
// 获取站点信息
getSiteInfo().then((data) => {
console.log(data, 'siteInfo')
setWebsite(data)
if (data.search) {
setSearch(false);
}
})
// Taro.getSetting获取用户的当前设置。返回值中只会出现小程序已经向用户请求过的权限。
Taro.getSetting({
@@ -228,21 +222,21 @@ function Home() {
return (
<>
{!IsLogin ? (<Login done={handleLogin}/>) : (<>
{!IsLogin && search ? (<Login done={handleLogin}/>) : (<>
<Header user={userInfo}/>
<ExpirationTime/>
<div className={'fixed z-20 top-24 left-0 w-full'}>
<div className={'px-4'}>
<div className={'px-2'}>
<div
style={{
display: 'flex',
alignItems: 'center',
background: '#fff',
padding: '0 10px',
padding: '0 7px',
borderRadius: '20px'
}}
>
<Search/>
<Search className={'mx-2'}/>
<Input
placeholder="车辆编号"
value={keywords}
@@ -259,23 +253,20 @@ function Home() {
</div>
</div>
</div>
<Map
id="map"
longitude={longitude}
latitude={latitude}
scale={scale}
// @ts-ignore
markers={markers}
onTap={(map) => {
console.log('map tap',map)
}}
style={{width: '100%', height: '100vh'}}
/>
{/*<InfiniteLoading*/}
{/* className={'w-full fixed left-0 top-40'}*/}
{/*>*/}
{/* <BestSellers data={list}/>*/}
{/*</InfiniteLoading>*/}
{markers.length > 0 && (
<Map
id="map"
longitude={longitude}
latitude={latitude}
scale={scale}
// @ts-ignore
markers={markers}
onTap={(map) => {
console.log('map tap', map)
}}
style={{width: '100%', height: '100vh'}}
/>
)}
</>)}
</>
)