Merge branch 'light_v3'

This commit is contained in:
张成
2025-09-21 13:27:45 +08:00
15 changed files with 928 additions and 16 deletions

View File

@@ -230,12 +230,18 @@ function toast(message) {
Taro.showToast({ title: message, icon: "none" });
}
function isFull (counts) {
function isFull(counts) {
const { max_players, current_players, max_substitute_players, current_substitute_count, is_substitute_supported } = counts
if (is_substitute_supported === IsSubstituteSupported.SUPPORT) {
if (max_players === current_players) {
return true
}
else if (is_substitute_supported === IsSubstituteSupported.SUPPORT) {
return max_substitute_players === current_substitute_count
}
return max_players === current_players
return false
}
// 底部操作栏
@@ -354,7 +360,7 @@ function StickyButton(props) {
return "";
}
const { text, available = true, action = () => {} } = generateTextAndAction(user_action_status)!;
const { text, available = true, action = () => { } } = generateTextAndAction(user_action_status)!;
let ActionText: React.FC | string = text;
@@ -552,7 +558,7 @@ function GameInfo(props) {
{ latitude: c_latitude, longitude: c_longitude },
]}
includePadding={{ left: 50, right: 50, top: 50, bottom: 50 }}
onError={() => {}}
onError={() => { }}
// hide business msg
showLocation
theme="dark"
@@ -752,9 +758,8 @@ function Participants(props) {
<View
className="participants-list-scroll-content"
style={{
width: `${
participants.length * 103 + (participants.length - 1) * 8
}px`,
width: `${participants.length * 103 + (participants.length - 1) * 8
}px`,
}}
>
{participants.map((participant) => {
@@ -863,8 +868,8 @@ function genRecommendGames(games, location, avatar) {
skill_level_max !== skill_level_min
? `${skill_level_min || "-"}${skill_level_max || "-"}`
: skill_level_min === "1"
? "无要求"
: `${skill_level_min}以上`,
? "无要求"
: `${skill_level_min}以上`,
playType: play_type,
};
});
@@ -874,7 +879,7 @@ function OrganizerInfo(props) {
const {
userInfo,
currentLocation: location,
onUpdateUserInfo = () => {},
onUpdateUserInfo = () => { },
handleViewUserInfo,
handleAddComment,
} = props;