Merge remote-tracking branch 'refs/remotes/origin/master'

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

@@ -177,23 +177,32 @@
           }
 
           &-title {
-            display: flex;
-            align-items: center;
-            height: 24px;
-            gap: 2px;
+             display: flex;
+             align-items: center;
+             height: 24px;
+             gap: 2px;
             overflow: hidden;
             color: rgba(255, 255, 255, 0.85);
             text-overflow: ellipsis;
-            font-size: 16px;
-            font-style: normal;
-            font-weight: 600;
-            line-height: 24px; /* 150% */
+             font-size: 16px;
+             font-style: normal;
+             font-weight: 600;
+             line-height: 24px; /* 150% */
 
-            &-arrow {
-              width: 12px;
-              height: 12px;
-            }
-          }
+             &-text {
+               flex: 1;
+               min-width: 0;
+               overflow: hidden;
+               text-overflow: ellipsis;
+               white-space: nowrap;
+             }
+
+             &-arrow {
+               flex: 0 0 12px;
+               width: 12px;
+               height: 12px;
+             }
+           }
 
           &-time-range {
             overflow: hidden;

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

@@ -86,12 +86,12 @@ export default function OrganizerInfo(props) {
         await LoginService.followUser(id);
       }
       onUpdateUserInfo();
-      Taro.showToast({
+      (Taro as any).showToast({
         title: `${nickname} ${follow ? "已取消关注" : "已关注"}`,
         icon: "success",
       });
     } catch (e) {
-      Taro.showToast({
+      (Taro as any).showToast({
         title: `${nickname} ${follow ? "取消关注失败" : "关注失败"}`,
         icon: "error",
       });
@@ -193,13 +193,17 @@ export default function OrganizerInfo(props) {
                   className={styles["recommend-games-list-item"]}
                   onClick={handleViewGame.bind(null, game.id)}
                 >
-                  {/* game title */}
-                  <View className={styles["recommend-games-list-item-title"]}>
-                    <Text>{game.title}</Text>
-                    <Image
-                      className={
-                        styles["recommend-games-list-item-title-arrow"]
-                      }
+                   {/* game title */}
+                   <View className={styles["recommend-games-list-item-title"]}>
+                     <Text
+                       className={styles["recommend-games-list-item-title-text"]}
+                     >
+                       {game.title}
+                     </Text>
+                     <Image
+                       className={
+                         styles["recommend-games-list-item-title-arrow"]
+                       }
                       src={img.ICON_DETAIL_ARROW_RIGHT}
                     />
                   </View>

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

@@ -12,7 +12,12 @@ import WechatLogo from "@/static/detail/wechat_icon.svg";
 // import WechatTimeline from "@/static/detail/wechat_timeline.svg";
 import LinkIcon from "@/static/detail/link.svg";
 import CrossIcon from "@/static/detail/cross.svg";
-import { genNTRPRequirementText, navto, genGameLength } from "@/utils/helper";
+import {
+  genNTRPRequirementText,
+  navto,
+  genGameLength,
+  formatGameStartTime,
+} from "@/utils/helper";
 import { waitForAuthInit } from "@/utils/authInit";
 import { useUserActions } from "@/store/userStore";
 import { OSS_BASE } from "@/config/api";
@@ -107,7 +112,7 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
     const startTime = dayjs(start_time);
     const endTime = dayjs(end_time);
     const dayofWeek = DayOfWeekMap.get(startTime.day());
-    const gameLength = `${endTime.diff(startTime, "hour")}小时`;
+    const gameLength = genGameLength(startTime, endTime);
     const currentUserInfo = await ensureUserInfo();
     try {
       const url = await generateShareImage({
@@ -119,7 +124,7 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
           skill_level_max,
         )}`,
         gameDate: `${startTime.format("M月D日")} (${dayofWeek})`,
-        gameTime: `${startTime.format("ah")}点 ${gameLength}`,
+        gameTime: `${formatGameStartTime(startTime)} ${gameLength}`,
         venueName: location_name,
         venueImages: image_list ? image_list : [],
       });
@@ -133,11 +138,8 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
     }
   }
 
-  useShareAppMessage(async (res) => {
-    await changeMessageType();
-    await ensureUserInfo();
-    const url = await generateShareImageUrl();
-    // console.log(res, "res");
+  useShareAppMessage(async () => {
+    const url = shareImageUrl || (await generateShareImageUrl());
     return {
       title: detail.title,
       imageUrl: url,
@@ -164,7 +166,6 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
     const startTime = dayjs(start_time);
     const endTime = dayjs(end_time);
     const dayofWeek = DayOfWeekMap.get(startTime.day());
-    // const gameLength = `${endTime.diff(startTime, "hour")}小时`;
     const game_length = genGameLength(startTime, endTime);
     let qrCodeUrl = "";
     try {
@@ -193,7 +194,7 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
         title,
         locationName: location_name,
         date: `${startTime.format("M月D日")} (${dayofWeek})`,
-        time: `${startTime.format("ah")}点 ${game_length}`,
+        time: `${formatGameStartTime(startTime)} ${game_length}`,
         qrCodeUrl,
       });
     } catch (e) {

src/game_pages/sharePoster/index.tsx

@@ -14,7 +14,11 @@ import WechatLogo from "@/static/detail/wechat_icon.svg";
 import WechatTimeline from "@/static/detail/wechat_timeline.svg";
 import { useUserActions } from "@/store/userStore";
 import { DayOfWeekMap } from "../detail/config";
-import { genNTRPRequirementText } from "@/utils/helper";
+import {
+  genNTRPRequirementText,
+  genGameLength,
+  formatGameStartTime,
+} from "@/utils/helper";
 import { waitForAuthInit } from "@/utils/authInit";
 import { OSS_BASE } from "@/config/api";
 import styles from "./index.module.scss";
@@ -53,7 +57,7 @@ function SharePoster(props) {
     const startTime = dayjs(start_time);
     const endTime = dayjs(end_time);
     const dayofWeek = DayOfWeekMap.get(startTime.day());
-    const gameLength = `${endTime.diff(startTime, "hour")}小时`;
+    const gameLength = genGameLength(startTime, endTime);
     Taro.showLoading({ title: "生成中..." });
     const qrCodeUrlRes = await DetailService.getQrCodeUrl({
       page: "game_pages/detail/index",
@@ -77,7 +81,7 @@ function SharePoster(props) {
       title,
       locationName: location_name,
       date: `${startTime.format("M月D日")} (${dayofWeek})`,
-      time: `${startTime.format("ah")}点 ${gameLength}`,
+      time: `${formatGameStartTime(startTime)} ${gameLength}`,
       qrCodeUrl,
     });
     Taro.hideLoading();

src/utils/helper.ts

@@ -164,3 +164,12 @@ export function genGameLength(startTime: Dayjs, endTime: Dayjs) {
   // 保留一位小数，去除末尾的0
   return `${parseFloat(totalHours.toFixed(1))}小时`;
 }
+
+export function formatGameStartTime(startTime: Dayjs) {
+  if (!startTime || !startTime.isValid()) {
+    return "";
+  }
+  const hour = startTime.hour();
+  const minute = startTime.minute();
+  return minute === 0 ? `${hour}点` : `${hour}点${minute}分`;
+}

src/utils/share.ts

@@ -115,16 +115,25 @@ function with_cache_bust(url: string): string {
 // 工具函数 - OffscreenCanvas 下加载图片（使用 offscreen.createImage）
 const loadImage = (src: string): Promise<any> => {
     return new Promise((resolve, reject) => {
+        let timer: ReturnType<typeof setTimeout> | null = null
         try {
             const off = runtime.offscreen
             if (!off || typeof off.createImage !== 'function') {
                 throw new Error('OffscreenCanvas 未初始化或不支持 createImage')
             }
             const img = off.createImage()
-            img.onload = () => resolve(img)
-            img.onerror = reject
+            timer = setTimeout(() => reject(new Error(`图片加载超时: ${src}`)), 8000)
+            img.onload = () => {
+                if (timer) clearTimeout(timer)
+                resolve(img)
+            }
+            img.onerror = (e: any) => {
+                if (timer) clearTimeout(timer)
+                reject(e)
+            }
             img.src = with_cache_bust(src)
         } catch (e) {
+            if (timer) clearTimeout(timer)
             reject(e)
         }
     })
@@ -413,7 +422,7 @@ const drawShareCard = async (ctx: any, data: ShareCardData, offscreen: any): Pro
                 ctx.restore()
             } catch (error) {
                 // 如果头像加载失败，绘制默认头像
-                ctx.setFillStyle('#CCCCCC')
+                ctx.fillStyle = '#CCCCCC'
                 ctx.beginPath()
                 ctx.arc(avatarX + avatarSize / 2, avatarY + avatarSize / 2, avatarSize / 2, 0, 2 * Math.PI)
                 ctx.fill()
@@ -594,10 +603,12 @@ export async function generateShareImage(data: ShareCardData): Promise<string> {
     // 记录到 runtime（供 loadImage 使用）
     runtime.offscreen = offscreen
     isDrawing = true
-
-    const imagePath = await drawShareCard(ctx, data, offscreen)
-    isDrawing = false
-    return imagePath
+    try {
+        const imagePath = await drawShareCard(ctx, data, offscreen)
+        return imagePath
+    } finally {
+        isDrawing = false
+    }
 }
 
 export default generateShareImage