Merge branch 'feat/liujie'

This commit is contained in:
2025-12-08 16:02:10 +08:00
2 changed files with 23 additions and 15 deletions

View File

@@ -59,9 +59,13 @@
&-scroll {
flex: 0 0 auto;
width: calc(100% - 116px);
width: 100%;
height: 100%;
&.withApplication {
width: calc(100% - 116px);
}
&-content {
display: flex;
flex-direction: row;

View File

@@ -2,10 +2,11 @@ import React, { useRef } from "react";
import Taro from "@tarojs/taro";
import { View, Text, Image, ScrollView } from "@tarojs/components";
import dayjs from "dayjs";
import classnames from "classnames";
import img from "@/config/images";
import { useUserInfo } from "@/store/userStore";
import { formatNtrpDisplay, toast, navto } from "@/utils/helper";
import RMB_ICON from "@/static/detail/rmb.svg";
// import RMB_ICON from "@/static/detail/rmb.svg";
import { MATCH_STATUS, IsSubstituteSupported } from "@/services/detailService";
import OrderService from "@/services/orderService";
import styles from "./index.module.scss";
@@ -183,18 +184,18 @@ export default function Participants(props) {
if (!user_action_status) {
return;
}
const priceStrArr = price?.toString().split(".") ?? [];
const displayPrice = is_organizer ? (
<>
<Text className={styles.integer}>0</Text>
{/* <Text className={styles.decimalPart}>.00</Text> */}
</>
) : (
<>
<Text className={styles.integer}>{priceStrArr[0]}</Text>
<Text className={styles.decimalPart}>.{priceStrArr[1]}</Text>
</>
);
// const priceStrArr = price?.toString().split(".") ?? [];
// const displayPrice = is_organizer ? (
// <>
// <Text className={styles.integer}>0</Text>
// {/* <Text className={styles.decimalPart}>.00</Text> */}
// </>
// ) : (
// <>
// <Text className={styles.integer}>{priceStrArr[0]}</Text>
// <Text className={styles.decimalPart}>.{priceStrArr[1]}</Text>
// </>
// );
// user_action_status.can_assess = true;
// user_action_status.can_join = false;
// console.log(user_action_status, "user_action");
@@ -323,7 +324,10 @@ export default function Participants(props) {
{/* participants list */}
<ScrollView
refresherBackground="#FAFAFA"
className={styles["participants-list-scroll"]}
className={classnames(
styles["participants-list-scroll"],
showApplicationEntry ? styles.withApplication : ""
)}
scrollX
>
<View