Merge branch 'master' into dev

src/game_pages/detail/components/Carousel/index.module.scss

@@ -28,6 +28,7 @@
       &-image {
         border-radius: 12px;
         transition: transform 0.5s;
+        border: 0.5px solid rgba(255, 255, 255, 0.1);
       }
     }
   }

src/game_pages/detail/components/Participants/index.tsx

@@ -72,6 +72,22 @@ export default function Participants(props) {
   }>({ show: () => {} });
   const userInfo = useUserInfo();
   const participants = detail.participants || [];
+  // const participants = Array(10)
+  //   .fill(0)
+  //   .map((_, index) => ({
+  //     id: 337 + index,
+  //     join_time: "2025-12-06 11:06:24",
+  //     status: "joined",
+  //     is_organizer: true,
+  //     user: {
+  //       id: 18,
+  //       nickname: "小猫开刀削面店往猫毛里面下面条",
+  //       avatar_url:
+  //         "https://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/d284060f-248b-4d58-a153-4d37c0ca77c8.jpg",
+  //       phone: "18513125687",
+  //       ntrp_level: "1.5",
+  //     },
+  //   }));
   const {
     participant_count,
     max_participants,

src/game_pages/detail/index.tsx

@@ -63,7 +63,7 @@ function Index() {
     // await updateLocation();
     // await fetchUserInfo();
     if (id) {
-      Taro.showLoading();
+      // Taro.showLoading();
       fetchDetail();
     }
   });
@@ -104,7 +104,7 @@ function Index() {
         setShowEmptyState(true);
       }
     }
-    Taro.hideLoading();
+    // Taro.hideLoading();
   };
 
   const onUpdateUserInfo = () => {
@@ -181,7 +181,7 @@ function Index() {
       <EmptyState
         onGoToOtherGames={() => {
           Taro.switchTab({
-            url: '/main_pages/index',
+            url: "/main_pages/index",
           });
         }}
         onGoToHome={handleBack}

src/order_pages/orderDetail/index.tsx

@@ -696,6 +696,7 @@ const OrderCheck = () => {
         title={id ? "订单详情" : "加入活动"}
         titleClassName={styles.titleClassName}
         className={styles.navbar}
+        backgroundColor="#fafafa"
       />
       {/* Game Date and Address */}
       <GameInfo

src/user_pages/edit/index.tsx

@@ -161,7 +161,7 @@ const EditProfilePage: React.FC = () => {
         const tempFilePath = res.tempFilePaths[0];
         try {
           const avatar_url = await UserService.upload_avatar(tempFilePath);
-          await updateUserInfo({ avatar: avatar_url });
+          await updateUserInfo({ avatar_url: avatar_url });
           Taro.showToast({
             title: "头像上传成功",
             icon: "success",