Compare commits
1 Commits
2a9e8668a0
...
feat/juguo
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
99c8026f61 |
@@ -67,6 +67,12 @@ const NTRPEvaluatePopup = (props: NTRPEvaluatePopupProps, ref) => {
|
|||||||
const { updateUserInfo } = useUserActions();
|
const { updateUserInfo } = useUserActions();
|
||||||
const userInfo = useUserInfo();
|
const userInfo = useUserInfo();
|
||||||
const ntrpLevels = useNtrpLevels();
|
const ntrpLevels = useNtrpLevels();
|
||||||
|
const options = [
|
||||||
|
ntrpLevels.map((item) => ({
|
||||||
|
text: item,
|
||||||
|
value: item,
|
||||||
|
})),
|
||||||
|
];
|
||||||
const [evaCallback, setEvaCallback] = useState<EvaluateCallback>({
|
const [evaCallback, setEvaCallback] = useState<EvaluateCallback>({
|
||||||
type: "",
|
type: "",
|
||||||
next: () => {},
|
next: () => {},
|
||||||
@@ -165,7 +171,7 @@ const NTRPEvaluatePopup = (props: NTRPEvaluatePopupProps, ref) => {
|
|||||||
{visible && (
|
{visible && (
|
||||||
<Picker
|
<Picker
|
||||||
visible
|
visible
|
||||||
options={ntrpLevels}
|
options={options}
|
||||||
defaultValue={[ntrp]}
|
defaultValue={[ntrp]}
|
||||||
onChange={(val) => {
|
onChange={(val) => {
|
||||||
console.log(val[0]);
|
console.log(val[0]);
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ import { View, Text, Image } from "@tarojs/components";
|
|||||||
import Taro from "@tarojs/taro";
|
import Taro from "@tarojs/taro";
|
||||||
import { useUserInfo } from "@/store/userStore";
|
import { useUserInfo } from "@/store/userStore";
|
||||||
import {
|
import {
|
||||||
|
useEvaluate,
|
||||||
EvaluateCallback,
|
EvaluateCallback,
|
||||||
EvaluateScene,
|
EvaluateScene,
|
||||||
} from "@/store/evaluateStore";
|
} from "@/store/evaluateStore";
|
||||||
@@ -14,7 +15,6 @@ import styles from "./index.module.scss";
|
|||||||
import images from "@/config/images";
|
import images from "@/config/images";
|
||||||
import AiImportPopup from "@/publish_pages/publishBall/components/AiImportPopup";
|
import AiImportPopup from "@/publish_pages/publishBall/components/AiImportPopup";
|
||||||
import NTRPEvaluatePopup from "../NTRPEvaluatePopup";
|
import NTRPEvaluatePopup from "../NTRPEvaluatePopup";
|
||||||
import { useDictionaryStore } from "@/store/dictionaryStore";
|
|
||||||
|
|
||||||
export interface PublishMenuProps {
|
export interface PublishMenuProps {
|
||||||
onPersonalPublish?: () => void;
|
onPersonalPublish?: () => void;
|
||||||
@@ -30,8 +30,7 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
|
|||||||
area
|
area
|
||||||
} = useListState();
|
} = useListState();
|
||||||
|
|
||||||
const supportedCitiesList = useDictionaryStore((s) => s.getDictionaryValue('supported_cities')) || [];
|
|
||||||
|
|
||||||
// 使用 useEffect 监听 isVisible 变化,确保所有情况都能触发回调
|
// 使用 useEffect 监听 isVisible 变化,确保所有情况都能触发回调
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
onVisibleChange?.(isVisible);
|
onVisibleChange?.(isVisible);
|
||||||
@@ -68,10 +67,10 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
|
|||||||
};
|
};
|
||||||
const handleMenuItemClick = (type: "individual" | "group" | "ai") => {
|
const handleMenuItemClick = (type: "individual" | "group" | "ai") => {
|
||||||
const [_, address] = area;
|
const [_, address] = area;
|
||||||
if (!supportedCitiesList.includes(address)) {
|
if (address !== '上海市') {
|
||||||
(Taro as any).showModal({
|
(Taro as any).showModal({
|
||||||
title: '提示',
|
title: '提示',
|
||||||
content: '该城市尚未开放,您可加入社群或切换城市',
|
content: '仅上海地区开放,您可加入社群或切换城市',
|
||||||
showCancel: false,
|
showCancel: false,
|
||||||
confirmText: '知道了'
|
confirmText: '知道了'
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -4,11 +4,7 @@ import ListLoadError from "@/components/ListLoadError";
|
|||||||
import ListCardSkeleton from "@/components/ListCardSkeleton";
|
import ListCardSkeleton from "@/components/ListCardSkeleton";
|
||||||
import { useReachBottom } from "@tarojs/taro";
|
import { useReachBottom } from "@tarojs/taro";
|
||||||
import Taro from "@tarojs/taro";
|
import Taro from "@tarojs/taro";
|
||||||
import {
|
import { useUserInfo, useUserActions, useLastTestResult } from "@/store/userStore";
|
||||||
useUserInfo,
|
|
||||||
useUserActions,
|
|
||||||
useLastTestResult,
|
|
||||||
} from "@/store/userStore";
|
|
||||||
import { NTRPTestEntryCard } from "@/components";
|
import { NTRPTestEntryCard } from "@/components";
|
||||||
import { EvaluateScene } from "@/store/evaluateStore";
|
import { EvaluateScene } from "@/store/evaluateStore";
|
||||||
import { waitForAuthInit } from "@/utils/authInit";
|
import { waitForAuthInit } from "@/utils/authInit";
|
||||||
@@ -50,11 +46,7 @@ const ListContainer = (props) => {
|
|||||||
const { fetchUserInfo, fetchLastTestResult } = useUserActions();
|
const { fetchUserInfo, fetchLastTestResult } = useUserActions();
|
||||||
// 使用全局状态中的测试结果,避免重复调用接口
|
// 使用全局状态中的测试结果,避免重复调用接口
|
||||||
const lastTestResult = useLastTestResult();
|
const lastTestResult = useLastTestResult();
|
||||||
const {
|
const { bannerListImage, bannerDetailImage, bannerListIndex = 0 } = useDictionaryStore((s) => s.bannerDict) || {};
|
||||||
bannerListImage,
|
|
||||||
bannerDetailImage,
|
|
||||||
bannerListIndex = 0,
|
|
||||||
} = useDictionaryStore((s) => s.bannerDict) || {};
|
|
||||||
useReachBottom(() => {
|
useReachBottom(() => {
|
||||||
// 加载更多方法
|
// 加载更多方法
|
||||||
if (loading) {
|
if (loading) {
|
||||||
@@ -110,7 +102,7 @@ const ListContainer = (props) => {
|
|||||||
// 先等待静默登录完成
|
// 先等待静默登录完成
|
||||||
await waitForAuthInit();
|
await waitForAuthInit();
|
||||||
// 然后再获取用户信息
|
// 然后再获取用户信息
|
||||||
const userInfoId = userInfo && "id" in userInfo ? userInfo.id : null;
|
const userInfoId = userInfo && 'id' in userInfo ? userInfo.id : null;
|
||||||
if (!userInfoId) {
|
if (!userInfoId) {
|
||||||
await fetchUserInfo();
|
await fetchUserInfo();
|
||||||
return; // 等待下一次 useEffect 触发(此时 userInfo.id 已有值)
|
return; // 等待下一次 useEffect 触发(此时 userInfo.id 已有值)
|
||||||
@@ -121,13 +113,7 @@ const ListContainer = (props) => {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
init();
|
init();
|
||||||
}, [
|
}, [evaluateFlag, enableHomeCards, userInfo, lastTestResult, fetchLastTestResult]);
|
||||||
evaluateFlag,
|
|
||||||
enableHomeCards,
|
|
||||||
userInfo,
|
|
||||||
lastTestResult,
|
|
||||||
fetchLastTestResult,
|
|
||||||
]);
|
|
||||||
|
|
||||||
// 从全局状态中获取测试状态
|
// 从全局状态中获取测试状态
|
||||||
const hasTestInLastMonth = lastTestResult?.has_test_in_last_month || false;
|
const hasTestInLastMonth = lastTestResult?.has_test_in_last_month || false;
|
||||||
@@ -152,15 +138,13 @@ const ListContainer = (props) => {
|
|||||||
// 插入 banner 卡片(在 bannerListIndex 位置插入,不替换数据)
|
// 插入 banner 卡片(在 bannerListIndex 位置插入,不替换数据)
|
||||||
function insertBannerCard(list) {
|
function insertBannerCard(list) {
|
||||||
if (!bannerListImage) return list;
|
if (!bannerListImage) return list;
|
||||||
if (!list || !Array.isArray(list)) return list ?? [];
|
if (!list || !Array.isArray(list)) {
|
||||||
|
list = [];
|
||||||
|
}
|
||||||
const idx = Number(bannerListIndex);
|
const idx = Number(bannerListIndex);
|
||||||
return [
|
return [
|
||||||
...list.slice(0, idx),
|
...list.slice(0, idx),
|
||||||
{
|
{ type: "banner", banner_image_url: bannerListImage, banner_detail_url: bannerDetailImage },
|
||||||
type: "banner",
|
|
||||||
banner_image_url: bannerListImage,
|
|
||||||
banner_detail_url: bannerDetailImage,
|
|
||||||
},
|
|
||||||
...list.slice(idx),
|
...list.slice(idx),
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -169,9 +153,7 @@ const ListContainer = (props) => {
|
|||||||
function insertEvaluateCard(list) {
|
function insertEvaluateCard(list) {
|
||||||
if (!list || !Array.isArray(list)) return insertBannerCard(list ?? []);
|
if (!list || !Array.isArray(list)) return insertBannerCard(list ?? []);
|
||||||
|
|
||||||
const limitedList = shouldLimitByShowNumber
|
const limitedList = shouldLimitByShowNumber ? list.slice(0, showNumber) : list;
|
||||||
? list.slice(0, showNumber)
|
|
||||||
: list;
|
|
||||||
|
|
||||||
if (!evaluateFlag || hasTestInLastMonth) {
|
if (!evaluateFlag || hasTestInLastMonth) {
|
||||||
return insertBannerCard(limitedList);
|
return insertBannerCard(limitedList);
|
||||||
@@ -188,16 +170,7 @@ const ListContainer = (props) => {
|
|||||||
|
|
||||||
const memoizedList = useMemo(
|
const memoizedList = useMemo(
|
||||||
() => (enableHomeCards ? insertEvaluateCard(data) : data),
|
() => (enableHomeCards ? insertEvaluateCard(data) : data),
|
||||||
[
|
[enableHomeCards, evaluateFlag, data, hasTestInLastMonth, showNumber, bannerListImage, bannerDetailImage, bannerListIndex]
|
||||||
enableHomeCards,
|
|
||||||
evaluateFlag,
|
|
||||||
data,
|
|
||||||
hasTestInLastMonth,
|
|
||||||
showNumber,
|
|
||||||
bannerListImage,
|
|
||||||
bannerDetailImage,
|
|
||||||
bannerListIndex,
|
|
||||||
]
|
|
||||||
);
|
);
|
||||||
|
|
||||||
// 渲染 banner 卡片
|
// 渲染 banner 卡片
|
||||||
@@ -212,9 +185,7 @@ const ListContainer = (props) => {
|
|||||||
const target = item.banner_detail_url;
|
const target = item.banner_detail_url;
|
||||||
if (target) {
|
if (target) {
|
||||||
(Taro as any).navigateTo({
|
(Taro as any).navigateTo({
|
||||||
url: `/other_pages/bannerDetail/index?img=${encodeURIComponent(
|
url: `/other_pages/bannerDetail/index?img=${encodeURIComponent(target)}`,
|
||||||
target
|
|
||||||
)}`,
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}}
|
}}
|
||||||
@@ -227,14 +198,17 @@ const ListContainer = (props) => {
|
|||||||
backgroundPosition: "center",
|
backgroundPosition: "center",
|
||||||
backgroundRepeat: "no-repeat",
|
backgroundRepeat: "no-repeat",
|
||||||
}}
|
}}
|
||||||
></View>
|
>
|
||||||
|
</View>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const showNoData = isShowNoData && !loading && memoizedList?.length === 0;
|
||||||
|
|
||||||
// 渲染列表
|
// 渲染列表
|
||||||
const renderList = () => {
|
const renderList = () => {
|
||||||
// 请求数据为空
|
// 请求数据为空
|
||||||
if (isShowNoData) {
|
if (showNoData) {
|
||||||
return (
|
return (
|
||||||
<ListLoadError
|
<ListLoadError
|
||||||
reload={reload}
|
reload={reload}
|
||||||
@@ -259,10 +233,7 @@ const ListContainer = (props) => {
|
|||||||
}
|
}
|
||||||
if (enableHomeCards && match?.type === "evaluateCard") {
|
if (enableHomeCards && match?.type === "evaluateCard") {
|
||||||
return (
|
return (
|
||||||
<NTRPTestEntryCard
|
<NTRPTestEntryCard key={`evaluate-${index}`} type={EvaluateScene.list} />
|
||||||
key={`evaluate-${index}`}
|
|
||||||
type={EvaluateScene.list}
|
|
||||||
/>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return <ListCard key={match?.id || index} {...match} />;
|
return <ListCard key={match?.id || index} {...match} />;
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ import { EvaluateScene } from "@/store/evaluateStore";
|
|||||||
import { useUserInfo, useUserActions } from "@/store/userStore";
|
import { useUserInfo, useUserActions } from "@/store/userStore";
|
||||||
import { usePickerOption } from "@/store/pickerOptionsStore";
|
import { usePickerOption } from "@/store/pickerOptionsStore";
|
||||||
import { useGlobalState } from "@/store/global";
|
import { useGlobalState } from "@/store/global";
|
||||||
import { useListState } from "@/store/listStore";
|
|
||||||
import { useDictionaryStore } from "@/store/dictionaryStore";
|
|
||||||
|
|
||||||
interface MyselfPageContentProps {
|
interface MyselfPageContentProps {
|
||||||
isActive?: boolean;
|
isActive?: boolean;
|
||||||
@@ -43,10 +41,6 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
|
|||||||
const [collapseProfile, setCollapseProfile] = useState(false);
|
const [collapseProfile, setCollapseProfile] = useState(false);
|
||||||
const [refreshing, setRefreshing] = useState(false);
|
const [refreshing, setRefreshing] = useState(false);
|
||||||
|
|
||||||
const { area } = useListState();
|
|
||||||
const supportedCitiesList =
|
|
||||||
useDictionaryStore((s) => s.getDictionaryValue("supported_cities")) || [];
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
pickerOption.getCities();
|
pickerOption.getCities();
|
||||||
pickerOption.getProfessions();
|
pickerOption.getProfessions();
|
||||||
@@ -88,6 +82,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
|
|||||||
console.log("notEndGames", notEndGames);
|
console.log("notEndGames", notEndGames);
|
||||||
|
|
||||||
return { notEndGames, finishedGames };
|
return { notEndGames, finishedGames };
|
||||||
|
|
||||||
},
|
},
|
||||||
[]
|
[]
|
||||||
);
|
);
|
||||||
@@ -105,6 +100,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
|
|||||||
games_data = await UserService.get_participated_games(user_info.id);
|
games_data = await UserService.get_participated_games(user_info.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
const sorted_games = games_data.sort((a, b) => {
|
const sorted_games = games_data.sort((a, b) => {
|
||||||
return (
|
return (
|
||||||
new Date(a.original_start_time.replace(/\s/, "T")).getTime() -
|
new Date(a.original_start_time.replace(/\s/, "T")).getTime() -
|
||||||
@@ -160,16 +156,6 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
|
|||||||
};
|
};
|
||||||
|
|
||||||
const goPublish = () => {
|
const goPublish = () => {
|
||||||
const [_, address] = area;
|
|
||||||
if (!supportedCitiesList.includes(address)) {
|
|
||||||
(Taro as any).showModal({
|
|
||||||
title: "提示",
|
|
||||||
content: "该城市尚未开放,您可加入社群或切换城市",
|
|
||||||
showCancel: false,
|
|
||||||
confirmText: "知道了",
|
|
||||||
});
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
(Taro as any).navigateTo({
|
(Taro as any).navigateTo({
|
||||||
url: "/publish_pages/publishBall/index",
|
url: "/publish_pages/publishBall/index",
|
||||||
});
|
});
|
||||||
@@ -272,17 +258,15 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
|
|||||||
<View className={styles.gameTabsSection}>
|
<View className={styles.gameTabsSection}>
|
||||||
<View className={styles.tabContainer}>
|
<View className={styles.tabContainer}>
|
||||||
<View
|
<View
|
||||||
className={`${styles.tabItem} ${
|
className={`${styles.tabItem} ${active_tab === "hosted" ? styles.active : ""
|
||||||
active_tab === "hosted" ? styles.active : ""
|
}`}
|
||||||
}`}
|
|
||||||
onClick={() => setActiveTab("hosted")}
|
onClick={() => setActiveTab("hosted")}
|
||||||
>
|
>
|
||||||
<Text className={styles.tabText}>我主办的</Text>
|
<Text className={styles.tabText}>我主办的</Text>
|
||||||
</View>
|
</View>
|
||||||
<View
|
<View
|
||||||
className={`${styles.tabItem} ${
|
className={`${styles.tabItem} ${active_tab === "participated" ? styles.active : ""
|
||||||
active_tab === "participated" ? styles.active : ""
|
}`}
|
||||||
}`}
|
|
||||||
onClick={() => setActiveTab("participated")}
|
onClick={() => setActiveTab("participated")}
|
||||||
>
|
>
|
||||||
<Text className={styles.tabText}>我参与的</Text>
|
<Text className={styles.tabText}>我参与的</Text>
|
||||||
@@ -303,7 +287,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
|
|||||||
btnImg="ICON_ADD"
|
btnImg="ICON_ADD"
|
||||||
reload={goPublish}
|
reload={goPublish}
|
||||||
isShowNoData={game_records.length === 0}
|
isShowNoData={game_records.length === 0}
|
||||||
loadMoreMatches={() => {}}
|
loadMoreMatches={() => { }}
|
||||||
collapse={true}
|
collapse={true}
|
||||||
style={{
|
style={{
|
||||||
paddingBottom: ended_game_records.length ? 0 : "90px",
|
paddingBottom: ended_game_records.length ? 0 : "90px",
|
||||||
@@ -329,7 +313,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
|
|||||||
error={null}
|
error={null}
|
||||||
errorImg="ICON_LIST_EMPTY_CARD"
|
errorImg="ICON_LIST_EMPTY_CARD"
|
||||||
isShowNoData={ended_game_records.length === 0}
|
isShowNoData={ended_game_records.length === 0}
|
||||||
loadMoreMatches={() => {}}
|
loadMoreMatches={() => { }}
|
||||||
collapse={true}
|
collapse={true}
|
||||||
style={{ paddingBottom: "90px", overflow: "hidden" }}
|
style={{ paddingBottom: "90px", overflow: "hidden" }}
|
||||||
listLoadErrorWrapperHeight="fit-content"
|
listLoadErrorWrapperHeight="fit-content"
|
||||||
|
|||||||
@@ -40,9 +40,7 @@
|
|||||||
border-bottom: 0.5px solid rgba(0, 0, 0, 0.06);
|
border-bottom: 0.5px solid rgba(0, 0, 0, 0.06);
|
||||||
padding: 8px 12px;
|
padding: 8px 12px;
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -59,9 +57,7 @@
|
|||||||
align-items: flex-start;
|
align-items: flex-start;
|
||||||
|
|
||||||
color: rgba(60, 60, 67, 0.6);
|
color: rgba(60, 60, 67, 0.6);
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -121,9 +117,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
background: #ff3b30;
|
background: #ff3b30;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "SF Compact Rounded";
|
font-family: "SF Compact Rounded";
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
@@ -139,9 +133,7 @@
|
|||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
flex-direction: column;
|
flex-direction: column;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "SF Compact Rounded";
|
font-family: "SF Compact Rounded";
|
||||||
font-size: 22px;
|
font-size: 22px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -162,9 +154,7 @@
|
|||||||
|
|
||||||
.date {
|
.date {
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -174,9 +164,7 @@
|
|||||||
|
|
||||||
.venueTime {
|
.venueTime {
|
||||||
color: rgba(0, 0, 0, 0.8);
|
color: rgba(0, 0, 0, 0.8);
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -203,9 +191,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
gap: 12px;
|
gap: 12px;
|
||||||
color: rgba(0, 0, 0, 0.8);
|
color: rgba(0, 0, 0, 0.8);
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -249,9 +235,7 @@
|
|||||||
gap: 4px;
|
gap: 4px;
|
||||||
color: #000;
|
color: #000;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -267,9 +251,7 @@
|
|||||||
&Address {
|
&Address {
|
||||||
color: rgba(0, 0, 0, 0.8);
|
color: rgba(0, 0, 0, 0.8);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -288,9 +270,7 @@
|
|||||||
justify-content: flex-start;
|
justify-content: flex-start;
|
||||||
gap: 4px;
|
gap: 4px;
|
||||||
color: var(--Labels-Secondary, rgba(60, 60, 67, 0.6));
|
color: var(--Labels-Secondary, rgba(60, 60, 67, 0.6));
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -327,9 +307,7 @@
|
|||||||
|
|
||||||
& > .buttonText {
|
& > .buttonText {
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -369,9 +347,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
align-self: stretch;
|
align-self: stretch;
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -397,9 +373,7 @@
|
|||||||
width: 120px;
|
width: 120px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
color: rgba(60, 60, 67, 0.6);
|
color: rgba(60, 60, 67, 0.6);
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -409,9 +383,7 @@
|
|||||||
|
|
||||||
.content {
|
.content {
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -428,10 +400,9 @@
|
|||||||
|
|
||||||
.orderNo {
|
.orderNo {
|
||||||
display: flex;
|
display: flex;
|
||||||
flex-direction: column;
|
justify-content: flex-end;
|
||||||
justify-content: center;
|
align-items: center;
|
||||||
align-items: flex-end;
|
gap: 8px;
|
||||||
gap: 0px;
|
|
||||||
|
|
||||||
.copy {
|
.copy {
|
||||||
color: #007aff;
|
color: #007aff;
|
||||||
@@ -450,9 +421,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
align-self: stretch;
|
align-self: stretch;
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -473,9 +442,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
color: #000;
|
color: #000;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 12px;
|
font-size: 12px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -524,9 +491,7 @@
|
|||||||
&:nth-child(1) {
|
&:nth-child(1) {
|
||||||
color: #000;
|
color: #000;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -566,9 +531,7 @@
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
align-self: stretch;
|
align-self: stretch;
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 14px;
|
font-size: 14px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -604,9 +567,7 @@
|
|||||||
background: #000;
|
background: #000;
|
||||||
box-shadow: 0 8px 64px 0 rgba(0, 0, 0, 0.1);
|
box-shadow: 0 8px 64px 0 rgba(0, 0, 0, 0.1);
|
||||||
backdrop-filter: blur(16px);
|
backdrop-filter: blur(16px);
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -639,9 +600,7 @@
|
|||||||
text-align: center;
|
text-align: center;
|
||||||
// border: 0.5px solid rgba(0, 0, 0, 0.06);
|
// border: 0.5px solid rgba(0, 0, 0, 0.06);
|
||||||
color: #000;
|
color: #000;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
@@ -667,9 +626,7 @@
|
|||||||
padding: 12px 15px;
|
padding: 12px 15px;
|
||||||
color: rgba(60, 60, 67, 0.6);
|
color: rgba(60, 60, 67, 0.6);
|
||||||
text-align: center;
|
text-align: center;
|
||||||
font-feature-settings:
|
font-feature-settings: "liga" off, "clig" off;
|
||||||
"liga" off,
|
|
||||||
"clig" off;
|
|
||||||
font-family: "PingFang SC";
|
font-family: "PingFang SC";
|
||||||
font-size: 16px;
|
font-size: 16px;
|
||||||
font-style: normal;
|
font-style: normal;
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
|
|||||||
<View className='stadium-item-right'>
|
<View className='stadium-item-right'>
|
||||||
<View className='stadium-name'>{formData.name}</View>
|
<View className='stadium-name'>{formData.name}</View>
|
||||||
<View className='stadium-address'>
|
<View className='stadium-address'>
|
||||||
<Text>{calculateDistance(formData.istance || null) + ' · '}</Text>
|
<Text>{calculateDistance(formData.istance || null)} · </Text>
|
||||||
<Text>{formData.address}</Text>
|
<Text>{formData.address}</Text>
|
||||||
<Image src={images.ICON_ARRORW_SMALL} className='stadium-map-icon' />
|
<Image src={images.ICON_ARRORW_SMALL} className='stadium-map-icon' />
|
||||||
</View>
|
</View>
|
||||||
|
|||||||
Reference in New Issue
Block a user