bimwe/mini-programs
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/juguohong/20250816'

Browse Source
This commit is contained in:
李瑞
2025-09-14 16:37:31 +08:00
parent dbeb110f8c c3da686483
commit 9860e2baa0
2 changed files with 94 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
src/components/FilterPopup/index.tsx
View File

@@ -13,7 +13,7 @@ import CourtType from "@/components/CourtType";
// 玩法
import GamePlayType from "@/components/GamePlayType";
import { useDictionaryActions } from "@/store/dictionaryStore";
import { View } from "@tarojs/components";
import { View, ScrollView } from "@tarojs/components";
const FilterPopup = (props: FilterPopupProps) => {
const {
@@ -91,76 +91,92 @@ const FilterPopup = (props: FilterPopupProps) => {
round
visible={visible}
onClose={onClose}
style={{ marginTop: statusNavbarHeigh + "px", maxHeight: '75vh' }}
style={{ marginTop: statusNavbarHeigh + "px", maxHeight: '70vh' }}
overlayStyle={{ marginTop: statusNavbarHeigh + "px" }}
zIndex={1001}
>
<div className={styles.filterPopupWrapper}>
{/* 日历 */}
<View>
<CalendarUI
type="multiple"
isBorder={true}
value={filterOptions?.dateRange}
onChange={handleDateChange}
/>
</View>
{/* 时间气泡选项 */}
<Bubble
options={timeBubbleData}
value={filterOptions?.timeSlot}
onChange={handleFilterChange}
layout="grid"
size="small"
columns={3}
name="timeSlot"
/>
{/* 范围选择 */}
<Range
min={1.0}
max={5.0}
step={0.5}
className={styles.filterPopupRange}
onChange={(value) => {
handleFilterChange("ntrp", value)
<View className={styles.filterPopupWrapper}>
{/* 可滚动的内容区域 */}
<ScrollView
scrollY
enhanced
showScrollbar={false}
className={styles.filterPopupContent}
style={{
maxHeight: '60vh'
}}
value={filterOptions?.ntrp}
/>
{/* 场次气泡选项 */}
{/* <div>
<TitleComponent
title="场地类型"
icon={<Image src={img.ICON_SITE} />}
/>
onTouchMove={(e) => {
// 阻止滚动穿透
e.stopPropagation();
}}
>
{/* 日历 */}
<View>
<CalendarUI
type="multiple"
isBorder={true}
value={filterOptions?.dateRange}
onChange={handleDateChange}
/>
</View>
{/* 时间气泡选项 */}
<Bubble
options={locationOptions}
value={filterOptions?.site}
options={timeBubbleData}
value={filterOptions?.timeSlot}
onChange={handleFilterChange}
layout="grid"
size="small"
columns={3}
name="site"
name="timeSlot"
/>
</div> */}
{/* CourtType */}
<CourtType
onChange={handleFilterChange}
name="venueType"
options={locationOptions}
value={filterOptions?.venueType}
/>
{/* 玩法 */}
<GamePlayType
onChange={handleFilterChange}
name="playType"
options={gamePlayOptions}
value={filterOptions?.playType}
/>
{/* 按钮 */}
<div className={styles.filterPopupBtnWrapper}>
{/* 范围选择 */}
<Range
min={1.0}
max={5.0}
step={0.5}
className={styles.filterPopupRange}
onChange={(value) => {
handleFilterChange("ntrp", value)
}}
value={filterOptions?.ntrp}
/>
{/* 场次气泡选项 */}
{/* <div>
<TitleComponent
title="场地类型"
icon={<Image src={img.ICON_SITE} />}
/>
<Bubble
options={locationOptions}
value={filterOptions?.site}
onChange={handleFilterChange}
layout="grid"
size="small"
columns={3}
name="site"
/>
</div> */}
{/* CourtType */}
<CourtType
onChange={handleFilterChange}
name="venueType"
options={locationOptions}
value={filterOptions?.venueType}
/>
{/* 玩法 */}
<GamePlayType
onChange={handleFilterChange}
name="playType"
options={gamePlayOptions}
value={filterOptions?.playType}
/>
</ScrollView>
{/* 固定在底部的按钮区域 */}
<View className={styles.filterPopupBtnWrapper}>
<Button
className={styles.btn}
type="default"
@@ -176,8 +192,8 @@ const FilterPopup = (props: FilterPopupProps) => {
>
显示 {gamesNum} 场球局
</Button>
</div>
</div>
</View>
</View>
</Popup>
</>
);