优化样式

.gitignore

@@ -8,4 +8,6 @@ node_modules/
 src/config/env.ts
 .vscode
 *.http
+.cursor
+.codewiz
 

_doc/前端红点功能接口文档.md

@@ -473,7 +473,7 @@ async function safeMarkAsRead(type, ids) {
     })
   } catch (err) {
     // 标记已读失败不影响用户体验，静默处理
-    console.error('标记已读失败:', err)
+    console.warn('标记已读失败:', err)
   }
 }
 ```

analyze.js

@@ -28,7 +28,7 @@ function formatSize(bytes) {
 
 function analyze() {
   if (!fs.existsSync(DIST_DIR)) {
-    console.error('dist 目录不存在，请先执行 taro build --type weapp');
+    console.warn('dist 目录不存在，请先执行 taro build --type weapp');
     return;
   }
 

config/dev.ts

@@ -4,7 +4,11 @@ export default {
     quiet: false,
     stats: true
   },
-  mini: {},
+  mini: {
+    webpackChain(chain) {
+      chain.devtool('source-map')
+    }
+  },
   h5: {},
   // 添加这个配置来显示完整错误信息
   compiler: {

config/env.ts

@@ -0,0 +1,128 @@
+import Taro from '@tarojs/taro'
+
+// 环境类型
+export type EnvType = 'development' | 'production'
+
+// 环境配置接口
+export interface EnvConfig {
+  name: string
+  apiBaseURL: string
+  timeout: number
+  enableLog: boolean
+  enableMock: boolean
+  // 客服配置
+  customerService: {
+    corpId: string
+    serviceUrl: string
+    phoneNumber?: string
+    email?: string
+  }
+}
+
+// 各环境配置
+const envConfigs: Record<EnvType, EnvConfig> = {
+
+
+  // 开发环境
+  development: {
+    name: '开发环境',
+    // apiBaseURL: 'https://tennis.bimwe.com',
+    apiBaseURL: 'http://localhost:9098',
+    timeout: 15000,
+    enableLog: true,
+    enableMock: false,
+    // 客服配置
+    customerService: {
+      corpId: 'ww51fc969e8b76af82', // 企业ID
+      serviceUrl: 'https://work.weixin.qq.com/kfid/kfc64085b93243c5c91',
+
+    }
+  },
+  
+
+
+  // 生产环境1
+  // production: {
+  //   name: '生产环境1',
+  //   apiBaseURL: 'https://tennis.bimwe.com',
+  //   timeout: 10000,
+  //   enableLog: false,
+  //   enableMock: false,
+  //   // 客服配置
+  //   customerService: {
+  //     corpId: 'ww51fc969e8b76af82', // 企业ID
+  //     serviceUrl: 'https://work.weixin.qq.com/kfid/kfc64085b93243c5c91',
+
+  //   }
+  // },
+
+  // 生产环境2
+  production: {
+    name: '生产环境2',
+    apiBaseURL: 'https://youchang.qiongjingtiyu.com',
+    timeout: 10000,
+    enableLog: false,
+    enableMock: false,
+    // 客服配置
+    customerService: {
+      corpId: 'ww9a2d9a5d9410c664', // 企业ID
+      serviceUrl: 'https://work.weixin.qq.com/kfid/kfcd355e162e0390684',
+
+    }
+  }
+}
+
+// 获取当前环境
+export const getCurrentEnv = (): EnvType => {
+  // 在小程序环境中，使用默认逻辑判断环境
+  // 可以根据实际需要配置不同的判断逻辑
+
+  // 可以根据实际部署情况添加更多判断逻辑
+  // 比如通过 Taro.getEnv() 获取当前平台环境
+
+  const isProd = process.env.NODE_ENV === 'production'
+  if (isProd) {
+    return 'production'
+  } else {
+    return 'development'
+  }
+}
+
+// 获取当前环境配置
+export const getCurrentConfig = (): EnvConfig => {
+  const env = getCurrentEnv()
+  return envConfigs[env]
+}
+
+// 获取指定环境配置
+export const getEnvConfig = (env: EnvType): EnvConfig => {
+  return envConfigs[env]
+}
+
+// 是否为开发环境
+export const isDevelopment = (): boolean => {
+  return getCurrentEnv() === 'development'
+}
+
+// 是否为生产环境
+export const isProduction = (): boolean => {
+  return getCurrentEnv() === 'production'
+}
+
+
+
+// 环境配置调试信息
+export const getEnvInfo = () => {
+  const config = getCurrentConfig()
+  return {
+    env: getCurrentEnv(),
+    config,
+    taroEnv: Taro.getEnv(),
+    platform: Taro.getEnv() === Taro.ENV_TYPE.WEAPP ? '微信小程序' :
+      Taro.getEnv() === Taro.ENV_TYPE.WEB ? 'Web' :
+        Taro.getEnv() === Taro.ENV_TYPE.RN ? 'React Native' : '未知'
+  }
+}
+
+// 导出当前环境配置（方便直接使用）
+export default getCurrentConfig()

scripts/sync-project-config.js

@@ -11,7 +11,7 @@ const { envConfigs } = require(envConfigPath);
 
 const config = envConfigs[appEnv];
 if (!config) {
-  console.error(`[sync-project-config] Unknown APP_ENV: ${appEnv}`);
+  console.warn(`[sync-project-config] Unknown APP_ENV: ${appEnv}`);
   process.exit(1);
 }
 

src/components/Comments/index.tsx

@@ -11,7 +11,7 @@ import dayjs from "dayjs";
 import classnames from "classnames";
 import CommentServices from "@/services/commentServices";
 import messageService from "@/services/messageService";
-import { delay } from "@/utils";
+import { delay, getBackendErrorMsg } from "@/utils";
 import type {
   BaseComment,
   Comment,
@@ -342,7 +342,7 @@ export default forwardRef(function Comments(
     try {
       await messageService.markAsRead("comment", [message_id]);
     } catch (e) {
-      console.error("标记评论已读失败:", e);
+      console.warn("标记评论已读失败:", e);
     }
   }
 
@@ -459,6 +459,7 @@ export default forwardRef(function Comments(
   }
 
   async function createComment(val: string) {
+    try {
       const res = await CommentServices.createComment({ game_id, content: val });
       if (res.code === 0) {
         setComments((prev) => {
@@ -466,10 +467,16 @@ export default forwardRef(function Comments(
           return [{ ...res.data, replies: [] }, ...prev];
         });
         toast("发布成功");
+      } else {
+        toast(getBackendErrorMsg(res, "评论失败"));
+      }
+    } catch (error) {
+      toast(getBackendErrorMsg(error, "评论失败"));
     }
   }
 
   async function replyComment({ parent_id, reply_to_user_id, content }) {
+    try {
       const res = await CommentServices.replyComment({
         parent_id,
         reply_to_user_id,
@@ -489,6 +496,11 @@ export default forwardRef(function Comments(
           });
         });
         toast("回复成功");
+      } else {
+        toast(getBackendErrorMsg(res, "回复失败"));
+      }
+    } catch (error) {
+      toast(getBackendErrorMsg(error, "回复失败"));
     }
   }
 

src/components/CommonPopup/index.module.scss

@@ -3,6 +3,12 @@
 .common-popup {
   position: fixed;
   z-index: 9999 !important;
+  padding: 0;
+  box-sizing: border-box;
+  max-height: calc(100vh - 10px);
+  display: flex;
+  flex-direction: column;
+  background-color: theme.$page-background-color;
   &:global(.nut-popup-bottom.nut-popup-round) {
     border-radius: 20px 20px 0 0 !important;
   }
@@ -32,12 +38,7 @@
     }
   }
 
-  padding: 0;
+  
-  box-sizing: border-box;
-  max-height: calc(100vh - 10px);
-  display: flex;
-  flex-direction: column;
-  background-color: theme.$page-background-color;
 
   // .common-popup__header {
   //   padding: 12px 16px;

src/components/CustomPopup/CustomPopup.tsx

@@ -48,7 +48,14 @@ const CustomPopup: React.FC<CustomPopupProps> = ({
   const touchStartY = useRef(0)
 
   // 使用全局键盘状态
-  const { keyboardHeight, isKeyboardVisible, addListener, initializeKeyboardListener } = useKeyboardHeight()
+  const { keyboardHeight, isKeyboardVisible, addListener, initializeKeyboardListener, setKeyboardVisible } = useKeyboardHeight()
+
+  // 当弹窗显示时，设置键盘为不可见
+  useEffect(() => {
+    if (visible) {
+      setKeyboardVisible(false)
+    }
+  }, [visible, setKeyboardVisible])
 
   // 使用全局键盘状态监听
   useEffect(() => {

src/components/DistanceQuickFilterV2/index.tsx

@@ -134,7 +134,7 @@ const DistanceQuickFilterV2 = (props) => {
         throw new Error('获取位置信息失败');
       }
     } catch (error: any) {
-      console.error('重新定位失败:', error);
+      console.warn('重新定位失败:', error);
       (Taro as any).showToast({
         title: error?.message || '定位失败，请检查定位权限',
         icon: 'none',

src/components/FollowUserCard/index.tsx

@@ -42,7 +42,7 @@ const FollowUserCard: React.FC<FollowUserCardProps> = ({ user, tabKey, onFollowC
 
       onFollowChange?.(user.id, new_status);
     } catch (error) {
-      console.error('关注操作失败:', error);
+      console.warn('关注操作失败:', error);
       Taro.showToast({
         title: '操作失败',
         icon: 'none'
@@ -67,7 +67,7 @@ const FollowUserCard: React.FC<FollowUserCardProps> = ({ user, tabKey, onFollowC
         onBlockSuccess?.(user.id);
       }
     } catch (error) {
-      console.error('删除推荐人员失败:', error);
+      console.warn('删除推荐人员失败:', error);
       Taro.showToast({
         title: '操作失败',
         icon: 'none'

src/components/GameManagePopup/index.tsx

@@ -189,7 +189,8 @@ export default forwardRef(function GameManagePopup(props, ref) {
     detail.match_status,
   );
 
-  const inTwoHours = dayjs(detail.start_time).diff(dayjs(), "hour") < 2;
+  // const inTwoHours = dayjs(detail.start_time).diff(dayjs(), "hour") < 2;
+  const beforeStart = dayjs(detail.start_time).isAfter(dayjs());
 
   const hasOtherParticiappants = (detail.participants || [])
     .filter((item) => item.status === "joined")
@@ -207,7 +208,7 @@ export default forwardRef(function GameManagePopup(props, ref) {
         style={{ minHeight: "unset" }}
       >
         <View className={styles.container}>
-          {!finished && !inTwoHours && !hasOtherParticiappants && (
+          {!finished && !hasOtherParticiappants && beforeStart && (
             <View className={styles.button} onClick={handleEditGame}>
               编辑活动
             </View>
@@ -217,12 +218,12 @@ export default forwardRef(function GameManagePopup(props, ref) {
               重新发布
             </View>
           )}
-          {!finished && !inTwoHours && !hasOtherParticiappants && (
+          {!finished && beforeStart && (
             <View className={styles.button} onClick={handleCancelGame}>
               取消活动
             </View>
           )}
-          {!finished && hasJoin && (
+          {!finished && beforeStart && hasJoin && (
             <View className={styles.button} onClick={handleQuitGame}>
               退出活动
             </View>

src/components/GamePlayType/index.tsx

@@ -15,7 +15,7 @@ const GamePlayType = (props: IProps) => {
   const { name, onChange, value, options } = props;
   return (
     <View className={styles.gamePlayWrapper}>
-      <TitleComponent title="玩法" icon={<Image src={img.ICON_SITE} />} />
+      <TitleComponent title="玩法" icon={<Image src={img.ICON_GAME_PLAY} />} />
       <Bubble
         options={options}
         value={value}

src/components/HomeNavbar/index.tsx

@@ -146,7 +146,7 @@ const HomeNavbar = (props: IProps) => {
       console.log(`[HomeNavbar] 距离上次选择"继续浏览"还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟`);
       return false;
     } catch (error) {
-      console.error('[HomeNavbar] 检查定位弹窗显示条件失败:', error);
+      console.warn('[HomeNavbar] 检查定位弹窗显示条件失败:', error);
       return true; // 出错时默认显示
     }
   };
@@ -239,7 +239,7 @@ const HomeNavbar = (props: IProps) => {
   //     console.log(`距离上次选择"继续浏览"还不到2小时，剩余时间: ${Math.ceil((TWO_HOURS_MS - time_diff) / 1000 / 60)}分钟`);
   //     return false;
   //   } catch (error) {
-  //     console.error('检查定位弹窗显示条件失败:', error);
+  //     console.warn('检查定位弹窗显示条件失败:', error);
   //     return true; // 出错时默认显示
   //   }
   // };
@@ -276,7 +276,7 @@ const HomeNavbar = (props: IProps) => {
       (Taro as any).setStorageSync(CITY_CHANGE_TIME_KEY, current_time);
       console.log(`[LocationDialog] 已记录用户切换城市的时间，2小时内不再提示`);
     } catch (error) {
-      console.error('保存城市切换时间失败:', error);
+      console.warn('保存城市切换时间失败:', error);
     }
     console.log("切换到用户详情中的位置信息并更新缓存:", detectedProvince);
 
@@ -304,7 +304,7 @@ const HomeNavbar = (props: IProps) => {
       (Taro as any).setStorageSync(LOCATION_DIALOG_DISMISS_TIME_KEY, current_time);
       console.log(`[LocationDialog] 已记录用户选择"继续浏览"的时间，2小时内不再提示`);
     } catch (error) {
-      console.error('保存定位弹窗关闭时间失败:', error);
+      console.warn('保存定位弹窗关闭时间失败:', error);
     }
 
     // 关闭弹窗
@@ -409,7 +409,7 @@ const HomeNavbar = (props: IProps) => {
       (Taro as any).setStorageSync(CITY_CHANGE_TIME_KEY, current_time);
       console.log("已保存城市到缓存并记录切换时间:", _newArea, current_time);
     } catch (error) {
-      console.error("保存城市缓存失败:", error);
+      console.warn("保存城市缓存失败:", error);
     }
 
     // 先调用列表接口（会使用更新后的 state.area）

src/components/ImageUpload/ImageUpload.tsx

@@ -43,7 +43,7 @@ const ImageUpload: React.FC<ImageUploadProps> = ({
         onChange([...images, ...newImages])
       },
       fail: (err) => {
-        console.error('选择图片失败:', err)
+        console.warn('选择图片失败:', err)
       }
     })
   }, [images.length, maxCount, onChange])

src/components/ListCard/index.tsx

@@ -5,8 +5,9 @@ import img from "../../config/images";
 import { ListCardProps } from "../../../types/list/types";
 import { formatGameTime, calculateDuration } from "@/utils/timeUtils";
 import { navigateTo } from "@/utils/navigation";
-import images from '@/config/images'
+import images from "@/config/images";
 import "./index.scss";
+import { OSS_BASE } from "@/config/api";
 
 const ListCard: React.FC<ListCardProps> = ({
   id,
@@ -45,7 +46,7 @@ const ListCard: React.FC<ListCardProps> = ({
         className="image"
         mode="aspectFill"
         lazyLoad
-        defaultSource={require("@/static/emptyStatus/publish-empty-card.png")}
+        defaultSource={`${OSS_BASE}/front/ball/images/publish-empty-card.png`}
       />
     );
   };
@@ -67,7 +68,9 @@ const ListCard: React.FC<ListCardProps> = ({
     const containerWidthPx = screenWidth - 130;
 
     // 计算固定信息宽度
-    const extraInfo = `${court_type ? `・${court_type}` : ''}${distance_km ? `・${distance_km}km` : ''}`;
+    const extraInfo = `${court_type ? `・${court_type}` : ""}${
+      distance_km ? `・${distance_km}km` : ""
+    }`;
 
     // 估算字符宽度（基于 12px 字体）
     const getTextWidth = (text: string) => {
@@ -98,7 +101,9 @@ const ListCard: React.FC<ListCardProps> = ({
     let currentWidth = 0;
     for (let i = 0; i < location.length; i++) {
       const char = location[i];
-      const charWidth = /[\u4e00-\u9fa5\u3000-\u303f\uff00-\uffef]/.test(char) ? 12 : 6;
+      const charWidth = /[\u4e00-\u9fa5\u3000-\u303f\uff00-\uffef]/.test(char)
+        ? 12
+        : 6;
       if (currentWidth + charWidth > availableWidth) {
         break;
       }
@@ -106,7 +111,7 @@ const ListCard: React.FC<ListCardProps> = ({
       maxChars++;
     }
 
-    return location.slice(0, maxChars) + '...';
+    return location.slice(0, maxChars) + "...";
   }, [location, court_type, distance_km]);
 
   // 根据图片数量决定展示样式
@@ -220,9 +225,10 @@ const ListCard: React.FC<ListCardProps> = ({
                 </Text>
               </View>
               <View className="tag ntprTag">
-                <Image src={images.ICON_LIST_NTPR} className='ntprIcon' />
+                <Image src={images.ICON_LIST_NTPR} className="ntprIcon" />
                 <Text className="tag-text">
-                  {Number(skill_level_min)?.toFixed(1)} - {Number(skill_level_max)?.toFixed(1)}
+                  {Number(skill_level_min)?.toFixed(1)} -{" "}
+                  {Number(skill_level_max)?.toFixed(1)}
                 </Text>
                 {/* 分割线 */}
                 <View className="typeLine" />
@@ -251,13 +257,8 @@ const ListCard: React.FC<ListCardProps> = ({
             />
             {/* <Text className="smoothTitle">{game_type}</Text> */}
           </View>
-          {
+          {venue_description && <View className="line" />}
-            venue_description && (<View className="line" />)
+          {venue_description && (
-          }
-          {
-            venue_description &&
-            (
-
             <View className="localAreaContainer">
               <View className="localAreaTitle">场馆方:</View>
               <View className="localAreaWrapper">
@@ -265,8 +266,7 @@ const ListCard: React.FC<ListCardProps> = ({
                 <Text className="localAreaText">{venue_description}</Text>
               </View>
             </View>
-            )
+          )}
-          }
         </View>
       )}
     </View>

src/components/ListLoadError/index.module.scss

@@ -7,7 +7,6 @@
 
   .listLoadErrorImg {
     width: 154px;
-    height: 154px;
   }
 
   .listLoadErrorText {

src/components/ListLoadError/index.tsx

@@ -24,7 +24,6 @@ const ListLoadError = (props: IProps) => {
     wrapperHeight = "",
     width = "",
     height = "",
-    scale = "",
   } = props;
   const handleReload = () => {
     reload && typeof reload === "function" && reload();
@@ -34,7 +33,7 @@ const ListLoadError = (props: IProps) => {
     <View className={styles.listLoadError} style={{ height: wrapperHeight }}>
       <Image
         className={styles.listLoadErrorImg}
-        style={{ width, height, transform: `scale(${scale})` }}
+        style={{ width, height }}
         src={errorImg ? img[errorImg] : img.ICON_LIST_LOAD_ERROR}
       />
       {text && <Text className={styles.listLoadErrorText}>{text}</Text>}

src/components/NTRPEvaluatePopup/index.tsx

@@ -67,12 +67,6 @@ const NTRPEvaluatePopup = (props: NTRPEvaluatePopupProps, ref) => {
   const { updateUserInfo } = useUserActions();
   const userInfo = useUserInfo();
   const ntrpLevels = useNtrpLevels();
-  const options = [
-    ntrpLevels.map((item) => ({
-      text: item,
-      value: item,
-    })),
-  ];
   const [evaCallback, setEvaCallback] = useState<EvaluateCallback>({
     type: "",
     next: () => {},
@@ -171,7 +165,7 @@ const NTRPEvaluatePopup = (props: NTRPEvaluatePopupProps, ref) => {
               {visible && (
                 <Picker
                   visible
-                  options={options}
+                  options={ntrpLevels}
                   defaultValue={[ntrp]}
                   onChange={(val) => {
                     console.log(val[0]);

src/components/Picker/PopupPicker.tsx

@@ -52,7 +52,7 @@ const PopupPicker = ({
   ntrpTested,
 }: PickerProps) => {
   const [defaultValue, setDefaultValue] = useState<(string | number)[]>([]);
-  const [defaultOptions, setDefaultOptions] = useState<PickerOption[][]>([]);
+  const [defaultOptions, setDefaultOptions] = useState<PickerOption[][]>([...options]);
   const [pickerCurrentValue, setPickerCurrentValue] =
     useState<(string | number)[]>(value);
 

src/components/PublishMenu/PublishMenu.tsx

@@ -3,7 +3,6 @@ import { View, Text, Image } from "@tarojs/components";
 import Taro from "@tarojs/taro";
 import { useUserInfo } from "@/store/userStore";
 import {
-  useEvaluate,
   EvaluateCallback,
   EvaluateScene,
 } from "@/store/evaluateStore";
@@ -15,6 +14,7 @@ import styles from "./index.module.scss";
 import images from "@/config/images";
 import AiImportPopup from "@/publish_pages/publishBall/components/AiImportPopup";
 import NTRPEvaluatePopup from "../NTRPEvaluatePopup";
+import { useDictionaryStore } from "@/store/dictionaryStore";
 
 export interface PublishMenuProps {
   onPersonalPublish?: () => void;
@@ -30,6 +30,7 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
     area
   } = useListState();
 
+  const supportedCitiesList = useDictionaryStore((s) => s.getDictionaryValue('supported_cities')) || [];
   
   // 使用 useEffect 监听 isVisible 变化，确保所有情况都能触发回调
   useEffect(() => {
@@ -67,10 +68,10 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
   };
   const handleMenuItemClick = (type: "individual" | "group" | "ai") => {
     const [_, address] = area;
-    if (address !== '上海市') {
+    if (!supportedCitiesList.includes(address)) {
       (Taro as any).showModal({
         title: '提示',
-        content: '仅上海地区开放，您可加入社群或切换城市',
+        content: '该城市尚未开放，您可加入社群或切换城市',
         showCancel: false,
         confirmText: '知道了'
       })

src/components/Radar/indexV2.tsx

@@ -256,7 +256,7 @@ const RadarChartV2 = forwardRef<RadarChartV2Ref, RadarChartV2Props>(
                   const bgImg = await loadImage(canvas, shareBgUrl);
                   ctx.drawImage(bgImg, 0, 0, width, height);
                 } catch (error) {
-                  console.error("Failed to load background image:", error);
+                  console.warn("Failed to load background image:", error);
                   // 如果加载失败，使用白色背景作为兜底
                   ctx.fillStyle = "#FFFFFF";
                   ctx.fillRect(0, 0, width, height);
@@ -392,12 +392,12 @@ const RadarChartV2 = forwardRef<RadarChartV2Ref, RadarChartV2Props>(
                       );
                       ctx.restore();
                     } catch (error) {
-                      console.error("Failed to load docCopy image:", error);
+                      console.warn("Failed to load docCopy image:", error);
                     }
 
                     currentY += (48 + 20) * scale; // 头像区域高度 + gap
                   } catch (error) {
-                    console.error("Failed to load avatar image:", error);
+                    console.warn("Failed to load avatar image:", error);
                   }
                 }
 
@@ -523,7 +523,7 @@ const RadarChartV2 = forwardRef<RadarChartV2Ref, RadarChartV2Props>(
                     iconSize,
                   );
                 } catch (error) {
-                  console.error("Failed to load icon:", error);
+                  console.warn("Failed to load icon:", error);
                 }
 
                 // 绘制底部文字
@@ -601,7 +601,7 @@ const RadarChartV2 = forwardRef<RadarChartV2Ref, RadarChartV2Props>(
                     // 恢复上下文状态
                     ctx.restore();
                   } catch (error) {
-                    console.error("Failed to load QR code:", error);
+                    console.warn("Failed to load QR code:", error);
                   }
                 }
 

src/components/ShareCardCanvas/index.tsx

@@ -575,7 +575,7 @@ const ShareCardCanvas: React.FC<ShareCardCanvasProps> = ({
                             setTempImagePath(res.tempFilePath)
                         },
                         fail: (error: any) => {
-                            console.error('图片生成失败:', error)
+                            console.warn('图片生成失败:', error)
                             setIsDrawing(false)
                             reject(error)
                         }
@@ -595,7 +595,7 @@ const ShareCardCanvas: React.FC<ShareCardCanvasProps> = ({
                 console.log('Canvas绘制命令已发送')
 
             } catch (error) {
-                console.error('绘制分享卡片失败:', error)
+                console.warn('绘制分享卡片失败:', error)
                 setIsDrawing(false) // 绘制失败，重置状态
                 Taro.showToast({
                     title: '生成分享卡片失败',

src/components/SubscribeNotificationTip/index.tsx

@@ -16,7 +16,7 @@ const SubscribeNotificationTip: React.FC<SubscribeNotificationTipProps> = ({
     navigateTo({
       url: '/other_pages/enable_notification/index',
     }).catch((err) => {
-      console.error('跳转失败:', err);
+      console.warn('跳转失败:', err);
     });
   };
 

src/components/UploadCover/upload-from-wx.tsx

@@ -119,7 +119,6 @@ export default function UploadFromWx(props: UploadFromWxProps) {
       sourceType: ["album", "camera"],
     }).then(async (res) => {
       const analyzedFiles = await onChooseImageSuccess(res.tempFiles);
-      // cropping image to standard size
       const compressedTempFiles = await compressImage(analyzedFiles);
 
       let start = Date.now();
@@ -130,19 +129,22 @@ export default function UploadFromWx(props: UploadFromWxProps) {
         is_public: 1 as unknown as 0 | 1,
         id: (start++).toString(),
       }));
-      const onFileUpdate = uploadApi.batchUpload(files).then((res) => {
+
-        return res.map((item) => ({
+      Taro.showLoading({ title: "上传中..." });
+      try {
+        const uploadRes = await uploadApi.batchUpload(files);
+        const successful = uploadRes
+          .filter((item) => item.data != null)
+          .map((item) => ({
             id: item.id,
-          url: item ? item.data.file_url : "",
+            url: (item.data as { file_url: string }).file_url,
           }));
-      });
+        onAdd(successful, Promise.resolve(successful));
-      onAdd(
+      } catch (e) {
-        files.map((item) => ({
+        console.warn("批量上传失败:", e);
-          id: item.id,
+      } finally {
-          url: item.filePath,
+        Taro.hideLoading();
-        })),
+      }
-        onFileUpdate
-      );
     });
   };
   return (

src/components/UserInfo/index.tsx

@@ -6,14 +6,19 @@ import "./index.scss";
 import { EditModal } from "@/components";
 import { UserService, PickerOption } from "@/services/userService";
 import { PopupPicker } from "@/components/Picker/index";
-import { useUserActions, useNicknameChangeStatus, useLastTestResult } from "@/store/userStore";
+import {
+  useUserActions,
+  useNicknameChangeStatus,
+  useLastTestResult,
+  useUserInfo,
+} from "@/store/userStore";
 import { UserInfoType } from "@/services/userService";
 import {
   useCities,
   useProfessions,
   useNtrpLevels,
 } from "@/store/pickerOptionsStore";
-import { formatNtrpDisplay } from "@/utils/helper";
+import { formatNtrpDisplay, getBackendErrorMsg } from "@/utils/helper";
 import { useGlobalState } from "@/store/global";
 
 // 用户信息接口
@@ -69,7 +74,7 @@ const on_edit = () => {
 // 用户信息卡片组件
 const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
   editable = true,
-  user_info,
+  user_info: user_info_prop,
   is_current_user,
   is_following = false,
   collapseProfile,
@@ -80,9 +85,13 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
   set_user_info,
   onTab,
 }) => {
+  const global_user_info = useUserInfo();
+  // 查看别人页面时用传入的 user_info，个人页用全局 store
+  const user_info = is_current_user ? global_user_info : (user_info_prop ?? global_user_info);
   const nickname_change_status = useNicknameChangeStatus();
   const { setShowGuideBar } = useGlobalState();
-  const { updateUserInfo, updateNickname, fetchLastTestResult } = useUserActions();
+  const { updateUserInfo, updateNickname, fetchLastTestResult } =
+    useUserActions();
   const ntrpLevels = useNtrpLevels();
   // 使用全局状态中的测试结果，避免重复调用接口
   const lastTestResult = useLastTestResult();
@@ -91,18 +100,16 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
   const prevUserInfoRef = useRef<Partial<UserInfoType>>();
 
   useEffect(() => {
-    // 只在 user_info 真正变化时打印（通过 JSON 序列化比较）
     const prevStr = JSON.stringify(prevUserInfoRef.current);
     const currentStr = JSON.stringify(user_info);
     if (prevStr !== currentStr) {
-      console.log("UserInfoCard 用户信息变化:", user_info);
       prevUserInfoRef.current = user_info;
     }
-    // 如果全局状态中没有测试结果，则调用接口（使用请求锁，多个组件同时调用时只会请求一次）
+    // 仅当前用户才拉取 NTRP 测试结果
-    if (!lastTestResult && user_info?.id) {
+    if (is_current_user && !lastTestResult && user_info?.id) {
       fetchLastTestResult();
     }
-  }, [user_info?.id, lastTestResult, fetchLastTestResult]);
+  }, [user_info?.id, lastTestResult, fetchLastTestResult, is_current_user]);
 
   // 从全局状态中获取测试状态
   const ntrpTested = lastTestResult?.has_test_in_last_month || false;
@@ -117,11 +124,15 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
     useState(false);
 
   // 表单状态
-  const [form_data, set_form_data] = useState<Partial<UserInfoType>>({});
+  const [form_data, set_form_data] = useState<Partial<UserInfoType>>({ ...user_info });
 
-  useDidShow(() => {
+  // useDidShow(() => {
+  //   set_form_data({ ...user_info });
+  // });
+
+  useEffect(() => {
     set_form_data({ ...user_info });
-  });
+  }, [user_info])
 
   useEffect(() => {
     const visibles = [
@@ -129,6 +140,7 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
       location_picker_visible,
       ntrp_picker_visible,
       occupation_picker_visible,
+      edit_modal_visible,
     ];
     const allPickersClosed = visibles.every((item) => !item);
     // 所有选择器都关闭时，显示 GuideBar；否则隐藏
@@ -138,6 +150,7 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
     location_picker_visible,
     ntrp_picker_visible,
     occupation_picker_visible,
+    edit_modal_visible,
   ]);
 
   // 职业数据
@@ -237,10 +250,10 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
         icon: "success",
       });
     } catch (error) {
-      console.error("保存失败:", error);
+      console.warn("保存失败:", error);
       Taro.showToast({
-        title: "保存失败",
+        title: getBackendErrorMsg(error, "保存失败"),
-        icon: "error",
+        icon: "none",
       });
     }
   };
@@ -280,10 +293,10 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
         icon: "success",
       });
     } catch (error) {
-      console.error("保存失败:", error);
+      console.warn("保存失败:", error);
       Taro.showToast({
-        title: "保存失败",
+        title: getBackendErrorMsg(error, "保存失败"),
-        icon: "error",
+        icon: "none",
       });
     }
   };
@@ -295,8 +308,8 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
 
   // 处理地区选择
   const handle_location_change = (e: any) => {
-    const [country, province, city] = e;
+    const [province, city, district] = e;
-    handle_field_edit({ country, province, city });
+    handle_field_edit({ province, city, district });
   };
 
   // 处理NTRP水平选择
@@ -307,8 +320,8 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
 
   // 处理职业选择
   const handle_occupation_change = (e: any) => {
-    const [country, province, city] = e;
+    const [firstVal, secondVal, thirdVal] = e;
-    handle_field_edit("occupation", `${country} ${province} ${city}`);
+    handle_field_edit("occupation", `${firstVal} ${secondVal} ${thirdVal}`);
   };
   const handle_edit_modal_cancel = () => {
     // 关闭编辑弹窗时显示 GuideBar
@@ -365,7 +378,6 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
       urls: [url],
     });
   };
-
   return (
     <View className="user_info_card">
       {/* 头像和基本信息 */}
@@ -565,12 +577,12 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
                 <Text>选择职业</Text>
               </View>
             ) : null}
-            {user_info.country || user_info.province || user_info.city ? (
+            {user_info.province || user_info.city || user_info.district ? (
               <View
                 className="tag_item"
                 onClick={() => editable && handle_open_edit_modal("location")}
               >
-                <Text className="tag_text">{`${user_info.province}${user_info.city}`}</Text>
+                <Text className="tag_text">{`${user_info.city}${user_info.district}`}</Text>
               </View>
             ) : is_current_user ? (
               <View
@@ -643,16 +655,16 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
         <PopupPicker
           showHeader={true}
           title="选择性别"
-          options={[
+          options={
             [
               { text: "男", value: "0" },
               { text: "女", value: "1" },
               { text: "保密", value: "2" },
-            ],
+            ]
-          ]}
+          }
           visible={gender_picker_visible}
           setvisible={setGenderPickerVisible}
-          value={form_data.gender === "" ? ["0"] : [form_data.gender]}
+          value={!form_data.gender ? ["0"] : [form_data.gender]}
           onChange={handle_gender_change}
         />
       )}
@@ -665,8 +677,8 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
           visible={location_picker_visible}
           setvisible={setLocationPickerVisible}
           value={
-            form_data.country
+            form_data.province
-              ? [form_data.country, form_data.province, form_data.city]
+              ? [form_data.province, form_data.city, form_data.district]
               : getDefaultOption(cities)
           }
           onChange={handle_location_change}
@@ -678,15 +690,12 @@ const UserInfoCardComponent: React.FC<UserInfoCardProps> = ({
           showHeader={true}
           title="选择 NTRP 自评水平"
           ntrpTested={ntrpTested}
-          options={ntrpLevels.map((level) => ({
+          options={ntrpLevels}
-            text: level,
-            value: level,
-          }))}
           type="ntrp"
           img={user_info.avatar_url || ""}
           visible={ntrp_picker_visible}
           setvisible={setNtrpPickerVisible}
-          value={[form_data.ntrp_level || "2.5"]}
+          value={!form_data.ntrp_level ? ["2.5"] : [form_data.ntrp_level]}
           onChange={handle_ntrp_level_change}
         />
       )}
@@ -864,8 +873,7 @@ export const GameTabs: React.FC<GameTabsProps> = ({
           <Text className="tab_text">{hosted_text}</Text>
         </View>
         <View
-          className={`tab_item ${
+          className={`tab_item ${active_tab === "participated" ? "active" : ""
-            active_tab === "participated" ? "active" : ""
             }`}
           onClick={() => on_tab_change("participated")}
         >

src/components/refundPopup/index.tsx

@@ -13,7 +13,7 @@ import orderService from "@/services/orderService";
 import styles from "./index.module.scss";
 import closeIcon from "@/static/order/orderListClose.svg";
 
-function genRefundNotice(refund_policy) {
+function genRefundNotice(refund_policy, order_amount) {
   if (refund_policy.length === 0) {
     return {};
   }
@@ -23,8 +23,7 @@ function genRefundNotice(refund_policy) {
   if (matchPolicyIndex === -1) {
     matchPolicyIndex = refund_policy.length - 1;
   }
-  const { deadline_formatted, price, refund_rate } =
+  const { time_range, price, refund_rate } = refund_policy[matchPolicyIndex];
-    refund_policy[matchPolicyIndex];
   if (refund_rate === 1) {
     return {
       refundPrice: price,
@@ -33,20 +32,18 @@ function genRefundNotice(refund_policy) {
   } else if (refund_rate === 0) {
     return {
       refundPrice: 0,
-      notice: `当前退出不可退款，后续流程未明确，@麻真瑜`,
+      notice: `当前退出不可退款，¥${order_amount} 将不予退回`,
     };
   }
-  const refundPrice = Number(Math.ceil(price * refund_rate * 100) / 100);
+  // const refundPrice = Number(Math.ceil(price * refund_rate * 100) / 100);
-  const leftHours = dayjs(deadline_formatted).diff(dayjs(), "hour");
+  // const leftHours = dayjs(deadline_formatted).diff(dayjs(), "hour");
   return {
-    refundPrice,
+    refundPrice: price,
-    notice: `距活动开始已不足${leftHours}h，当前退出您需扣除${
+    notice: `活动开始${time_range}，当前退出需扣除您${Math.ceil((order_amount - price) * 100) / 100}元`,
-      Math.floor((price - refundPrice) * 100) / 100
-    }元`,
   };
 }
 
-function renderCancelContent(refund_policy = []) {
+function renderCancelContent(refund_policy = [], amount) {
   const current = dayjs();
   const policyList = [
     {
@@ -65,7 +62,7 @@ function renderCancelContent(refund_policy = []) {
     }),
   ];
   const targetIndex = policyList.findIndex((item) => item.beforeCurrent);
-  const { notice } = genRefundNotice(refund_policy);
+  const { notice } = genRefundNotice(refund_policy, amount);
   return (
     <View className={styles.refundPolicy}>
       {/* <View className={styles.moduleTitle}>
@@ -80,7 +77,7 @@ function renderCancelContent(refund_policy = []) {
             className={classnames(
               styles.policyItem,
               targetIndex > index && index !== 0 ? styles.pastItem : "",
-              targetIndex === index ? styles.currentItem : ""
+              targetIndex === index ? styles.currentItem : "",
             )}
           >
             <View className={styles.time}>
@@ -169,7 +166,7 @@ export default forwardRef<RefundRef>(function RefundPopup(_props, ref) {
             onClick={onClose}
           />
         </View>
-        {renderCancelContent(refundPolicy)}
+        {renderCancelContent(refundPolicy, orderData.amount)}
         <Button className={styles.action} onClick={handleConfirmQuit}>
           确认并退出
         </Button>

src/config/images.js

@@ -1,74 +1,76 @@
+import { OSS_BASE } from "@/config/api";
 export default {
-    ICON_REMOVE: require('@/static/publishBall/icon-remove.svg'),
+  ICON_REMOVE: require("@/static/publishBall/icon-remove.svg"),
-    ICON_UPLOAD: require('@/static/publishBall/icon-upload.svg'),
+  ICON_UPLOAD: require("@/static/publishBall/icon-upload.svg"),
-    ICON_LOCATION: require('@/static/publishBall/icon-location.svg'),
+  ICON_LOCATION: require("@/static/publishBall/icon-location.svg"),
-    ICON_GAMEPLAY: require('@/static/publishBall/icon-gameplay.svg'),
+  ICON_GAMEPLAY: require("@/static/publishBall/icon-gameplay.svg"),
-    ICON_PERSONAL: require('@/static/publishBall/icon-personal.svg'),
+  ICON_PERSONAL: require("@/static/publishBall/icon-personal.svg"),
-    ICON_CHANGDA: require('@/static/publishBall/icon-changda.svg'),
+  ICON_CHANGDA: require("@/static/publishBall/icon-changda.svg"),
-    ICON_COST: require('@/static/publishBall/icon-cost.svg'),
+  ICON_COST: require("@/static/publishBall/icon-cost.svg"),
-    ICON_TIPS: require('@/static/publishBall/icon-tips.svg'),
+  ICON_TIPS: require("@/static/publishBall/icon-tips.svg"),
-    ICON_ARROW_RIGHT: require('@/static/publishBall/icon-arrow-right.svg'),
+  ICON_ARROW_RIGHT: require("@/static/publishBall/icon-arrow-right.svg"),
-    ICON_FILTER: require('@/static/list/icon-filter.svg'),
+  ICON_FILTER: require("@/static/list/icon-filter.svg"),
-    ICON_FILTER_SELECTED: require('@/static/list/icon-filter-selected.svg'),
+  ICON_FILTER_SELECTED: require("@/static/list/icon-filter-selected.svg"),
-    ICON_SEARCH: require('@/static/list/icon-search.svg'),
+  ICON_SEARCH: require("@/static/list/icon-search.svg"),
-    ICON_PLAY: require('@/static/list/icon-play.svg'),
+  ICON_PLAY: require("@/static/list/icon-play.svg"),
-    ICON_SITE: require('@/static/list/icon-site.svg'),
+  ICON_SITE: require("@/static/list/icon-site.svg"),
-    ICON_ARROW_DOWN: require('@/static/list/icon-arrow-down.svg'),
+  ICON_ARROW_DOWN: require("@/static/list/icon-arrow-down.svg"),
-    ICON_MENU_ITEM_SELECTED: require('@/static/list/icon-menu-item-selected.svg'),
+  ICON_MENU_ITEM_SELECTED: require("@/static/list/icon-menu-item-selected.svg"),
-    ICON_ARROW_DOWN_WHITE: require('@/static/list/icon-arrow-down-white.svg'),
+  ICON_ARROW_DOWN_WHITE: require("@/static/list/icon-arrow-down-white.svg"),
-    ICON_LIST_RIGHT_ARROW: require('@/static/list/icon-list-right-arrow.svg'),
+  ICON_LIST_RIGHT_ARROW: require("@/static/list/icon-list-right-arrow.svg"),
-    ICON_ARROW_LEFT: require('@/static/detail/icon-arrow-left.svg'),
+  ICON_ARROW_LEFT: require("@/static/detail/icon-arrow-left.svg"),
-    ICON_LOGO_GO: require('@/static/detail/icon-logo-go.svg'),
+  ICON_LOGO_GO: require("@/static/detail/icon-logo-go.svg"),
-    ICON_MAP: require('@/static/publishBall/icon-map.svg'),
+  ICON_MAP: require("@/static/publishBall/icon-map.svg"),
-    ICON_STADIUM: require('@/static/publishBall/icon-stadium.svg'),
+  ICON_STADIUM: require("@/static/publishBall/icon-stadium.svg"),
-    ICON_ARRORW_SMALL: require('@/static/publishBall/icon-arrow-small.svg'),
+  ICON_ARRORW_SMALL: require("@/static/publishBall/icon-arrow-small.svg"),
-    ICON_MAP_SEARCH: require('@/static/publishBall/icon-map-search.svg'),
+  ICON_MAP_SEARCH: require("@/static/publishBall/icon-map-search.svg"),
-    ICON_HEART_CIRCLE: require('@/static/publishBall/icon-heartcircle.png'),
+  ICON_HEART_CIRCLE: require("@/static/publishBall/icon-heartcircle.png"),
-    ICON_ADD: require('@/static/publishBall/icon-add.svg'),
+  ICON_ADD: require("@/static/publishBall/icon-add.svg"),
-    ICON_COPY: require('@/static/publishBall/icon-arrow-right.svg'),
+  ICON_COPY: require("@/static/publishBall/icon-arrow-right.svg"),
-    ICON_DELETE: require('@/static/publishBall/icon-delete.svg'),
+  ICON_DELETE: require("@/static/publishBall/icon-delete.svg"),
-    ICON_RIGHT_MAX: require('@/static/publishBall/icon-right-max.svg'),
+  ICON_RIGHT_MAX: require("@/static/publishBall/icon-right-max.svg"),
-    ICON_PLUS: require('@/static/publishBall/icon-plus.svg'),
+  ICON_PLUS: require("@/static/publishBall/icon-plus.svg"),
-    ICON_GROUP: require('@/static/publishBall/icon-group.svg'),
+  ICON_GROUP: require("@/static/publishBall/icon-group.svg"),
-    ICON_PERSON: require('@/static/publishBall/icon-person.svg'),
+  ICON_PERSON: require("@/static/publishBall/icon-person.svg"),
-    ICON_PUBLISH: require('@/static/publishBall/icon-publish.png'),
+  ICON_PUBLISH: require("@/static/publishBall/icon-publish.png"),
-    ICON_CIRCLE_UNSELECT: require('@/static/publishBall/icon-circle-unselect.svg'),
+  ICON_CIRCLE_UNSELECT: require("@/static/publishBall/icon-circle-unselect.svg"),
-    ICON_CIRCLE_SELECT: require('@/static/publishBall/icon-circle-select-ring.svg'),
+  ICON_CIRCLE_SELECT: require("@/static/publishBall/icon-circle-select-ring.svg"),
-    ICON_CIRCLE_SELECT_ARROW: require('@/static/publishBall/icon-circle-select-arrow.svg'),
+  ICON_CIRCLE_SELECT_ARROW: require("@/static/publishBall/icon-circle-select-arrow.svg"),
-    ICON_LOGO: require('@/static/logo.svg'),
+  ICON_LOGO: require("@/static/logo.svg"),
-    ICON_CHANGE: require('@/static/list/icon-change.svg'),
+  ICON_CHANGE: require("@/static/list/icon-change.svg"),
-    ICON_DETAIL_MAP: require('@/static/detail/icon-map.svg'),
+  ICON_DETAIL_MAP: require("@/static/detail/icon-map.svg"),
-    ICON_DETAIL_ARROW_RIGHT: require('@/static/detail/icon-arrow-right.svg'),
+  ICON_DETAIL_ARROW_RIGHT: require("@/static/detail/icon-arrow-right.svg"),
-    ICON_DETAIL_NOTICE: require('@/static/detail/icon-notice.svg'),
+  ICON_DETAIL_NOTICE: require("@/static/detail/icon-notice.svg"),
-    ICON_DETAIL_APPLICATION_ADD: require('@/static/detail/icon-application-add.svg'),
+  ICON_DETAIL_APPLICATION_ADD: require("@/static/detail/icon-application-add.svg"),
-    ICON_DETAIL_COMMENT: require('@/static/detail/icon-comment.svg'),
+  ICON_DETAIL_COMMENT: require("@/static/detail/icon-comment.svg"),
-    ICON_DETAIL_COMMENT_LIGHT: require('@/static/detail/icon-comment-light.svg'),
+  ICON_DETAIL_COMMENT_LIGHT: require("@/static/detail/icon-comment-light.svg"),
-    ICON_DETAIL_SHARE: require('@/static/detail/icon-share-light.svg'),
+  ICON_DETAIL_SHARE: require("@/static/detail/icon-share-light.svg"),
-    ICON_GUIDE_BAR_PUBLISH: require('@/static/common/guide-bar-publish.svg'),
+  ICON_GUIDE_BAR_PUBLISH: require("@/static/common/guide-bar-publish.svg"),
-    ICON_NAVIGATOR_BACK: require('@/static/common/navigator-back.svg'),
+  ICON_NAVIGATOR_BACK: require("@/static/common/navigator-back.svg"),
-    ICON_LIST_PLAYING_GAME: require('@/static/list/icon-paying-game.svg'),
+  ICON_LIST_PLAYING_GAME: require("@/static/list/icon-paying-game.svg"),
-    ICON_LIST_LOAD_ERROR: require('@/static/list/icon-load-error.svg'),
+  ICON_LIST_LOAD_ERROR: require("@/static/list/icon-load-error.svg"),
-    ICON_LIST_RELOAD: require('@/static/list/icon-reload.svg'),
+  ICON_LIST_RELOAD: require("@/static/list/icon-reload.svg"),
-    ICON_LIST_EMPTY: require('@/static/emptyStatus/publish-empty.png'),
+  ICON_LIST_EMPTY: require("@/static/emptyStatus/publish-empty.png"),
-    ICON_LIST_EMPTY_CARD: require('@/static/emptyStatus/publish-empty-card.png'),
+  ICON_LIST_EMPTY_CARD: `${OSS_BASE}/front/ball/images/publish-empty-card.png`,
-    ICON_LIST_SEARCH_SEARCH: require('@/static/search/icon-search.svg'),
+  ICON_LIST_SEARCH_SEARCH: require("@/static/search/icon-search.svg"),
-    ICON_LIST_SEARCH_BACK: require('@/static/search/icon-back.svg'),
+  ICON_LIST_SEARCH_BACK: require("@/static/search/icon-back.svg"),
-    ICON_LIST_SEARCH_CLEAR: require('@/static/search/icon-search-clear.svg'),
+  ICON_LIST_SEARCH_CLEAR: require("@/static/search/icon-search-clear.svg"),
-    ICON_LIST_SEARCH_CLEAR_HISTORY: require('@/static/search/icon-clear-history.svg'),
+  ICON_LIST_SEARCH_CLEAR_HISTORY: require("@/static/search/icon-clear-history.svg"),
-    ICON_LIST_SEARCH_SUGGESTION: require('@/static/search/icon-search-suggestion.svg'),
+  ICON_LIST_SEARCH_SUGGESTION: require("@/static/search/icon-search-suggestion.svg"),
-    ICON_LIST_INPUT_LOGO: require('@/static/list/icon-input-logo.svg'),
+  ICON_LIST_INPUT_LOGO: require("@/static/list/icon-input-logo.svg"),
-    ICON_IMPORTANT_BTN: require('@/static/publishBall/icon-important-btn.svg'),
+  ICON_IMPORTANT_BTN: require("@/static/publishBall/icon-important-btn.svg"),
-    ICON_IMPORTANT_BLACK: require('@/static/publishBall/icon-important-black.svg'),
+  ICON_IMPORTANT_BLACK: require("@/static/publishBall/icon-important-black.svg"),
-    ICON_ARROW_RIGHT_WHITE: require('@/static/publishBall/icon-arrow-right-white.svg'),
+  ICON_ARROW_RIGHT_WHITE: require("@/static/publishBall/icon-arrow-right-white.svg"),
-    ICON_ARROW_RIGHT_BLACK: require('@/static/publishBall/icon-arrow-right-black.svg'),
+  ICON_ARROW_RIGHT_BLACK: require("@/static/publishBall/icon-arrow-right-black.svg"),
-    ICON_EXAMINATION: require('@/static/userInfo/examination.svg'),
+  ICON_EXAMINATION: require("@/static/userInfo/examination.svg"),
-    ICON_ARROW_GREEN: require('@/static/userInfo/arrow-green.svg'),
+  ICON_ARROW_GREEN: require("@/static/userInfo/arrow-green.svg"),
-    ICON_COPY: require('@/static/publishBall/icon-copy.svg'),
+  ICON_COPY: require("@/static/publishBall/icon-copy.svg"),
-    ICON_UPLOAD_IMG: require('@/static/publishBall/icon-upload-img.svg'),
+  ICON_UPLOAD_IMG: require("@/static/publishBall/icon-upload-img.svg"),
-    ICON_UPLOAD_SUCCESS: require('@/static/publishBall/icon-upload-success.svg'),
+  ICON_UPLOAD_SUCCESS: require("@/static/publishBall/icon-upload-success.svg"),
-    ICON_CLOSE: require('@/static/publishBall/icon-close.svg'),
+  ICON_CLOSE: require("@/static/publishBall/icon-close.svg"),
-    ICON_LIST_NTPR: require('@/static/list/ntpr.svg'),
+  ICON_LIST_NTPR: require("@/static/list/ntpr.svg"),
-    ICON_LIST_CHANGDA: require('@/static/list/icon-changda.svg'),
+  ICON_LIST_CHANGDA: require("@/static/list/icon-changda.svg"),
-    ICON_LIST_CHANGDA_QIuju: require('@/static/list/changdaqiuju.png'),
+  ICON_LIST_CHANGDA_QIuju: require("@/static/list/changdaqiuju.png"),
-    ICON_RELOCATE: require('@/static/list/icon-relocate.svg'),
+  ICON_RELOCATE: require("@/static/list/icon-relocate.svg"),
-  }
+  ICON_GAME_PLAY: require("@/static/list/icon_game_type.svg"),
+};

src/container/listContainer/index.tsx

@@ -4,7 +4,11 @@ import ListLoadError from "@/components/ListLoadError";
 import ListCardSkeleton from "@/components/ListCardSkeleton";
 import { useReachBottom } from "@tarojs/taro";
 import Taro from "@tarojs/taro";
-import { useUserInfo, useUserActions, useLastTestResult } from "@/store/userStore";
+import {
+  useUserInfo,
+  useUserActions,
+  useLastTestResult,
+} from "@/store/userStore";
 import { NTRPTestEntryCard } from "@/components";
 import { EvaluateScene } from "@/store/evaluateStore";
 import { waitForAuthInit } from "@/utils/authInit";
@@ -46,7 +50,11 @@ const ListContainer = (props) => {
   const { fetchUserInfo, fetchLastTestResult } = useUserActions();
   // 使用全局状态中的测试结果，避免重复调用接口
   const lastTestResult = useLastTestResult();
-  const { bannerListImage, bannerDetailImage, bannerListIndex = 0 } = useDictionaryStore((s) => s.bannerDict) || {};
+  const {
+    bannerListImage,
+    bannerDetailImage,
+    bannerListIndex = 0,
+  } = useDictionaryStore((s) => s.bannerDict) || {};
   useReachBottom(() => {
     // 加载更多方法
     if (loading) {
@@ -102,7 +110,7 @@ const ListContainer = (props) => {
       // 先等待静默登录完成
       await waitForAuthInit();
       // 然后再获取用户信息
-      const userInfoId = userInfo && 'id' in userInfo ? userInfo.id : null;
+      const userInfoId = userInfo && "id" in userInfo ? userInfo.id : null;
       if (!userInfoId) {
         await fetchUserInfo();
         return; // 等待下一次 useEffect 触发（此时 userInfo.id 已有值）
@@ -113,7 +121,13 @@ const ListContainer = (props) => {
       }
     };
     init();
-  }, [evaluateFlag, enableHomeCards, userInfo, lastTestResult, fetchLastTestResult]);
+  }, [
+    evaluateFlag,
+    enableHomeCards,
+    userInfo,
+    lastTestResult,
+    fetchLastTestResult,
+  ]);
 
   // 从全局状态中获取测试状态
   const hasTestInLastMonth = lastTestResult?.has_test_in_last_month || false;
@@ -132,46 +146,60 @@ const ListContainer = (props) => {
     );
   };
 
-  // 插入 banner 卡片
+  // showNumber 为 0 表示尚未同步，不参与截断；截断时只限制「数据条数」，插卡不占数据条数
+  const shouldLimitByShowNumber = showNumber > 0;
+
+  // 插入 banner 卡片（在 bannerListIndex 位置插入，不替换数据）
   function insertBannerCard(list) {
     if (!bannerListImage) return list;
-    if (!list || !Array.isArray(list)) return list ?? [];
+    if (!list || !Array.isArray(list)) {
+      list = [];
+    }
+    const idx = Number(bannerListIndex);
     return [
-      ...list.slice(0, Number(bannerListIndex)), 
+      ...list.slice(0, idx),
-      { type: "banner", banner_image_url: bannerListImage, banner_detail_url: bannerDetailImage }, 
+      {
-      ...list.slice(Number(bannerListIndex))
+        type: "banner",
+        banner_image_url: bannerListImage,
+        banner_detail_url: bannerDetailImage,
+      },
+      ...list.slice(idx),
     ];
   }
 
-  // 对于没有ntrp等级的用户每个月展示一次, 插在第二个位置后面
+  // 对于没有 ntrp 等级的用户每个月展示一次，插在第 2 条数据后面；插卡是插入不替换，保留全部 showNumber 条数据
-  // insertBannerCard 需在最后统一执行，否则前面分支直接 return 时 banner 不会被插入
   function insertEvaluateCard(list) {
-    let result: any[];
+    if (!list || !Array.isArray(list)) return insertBannerCard(list ?? []);
 
-    if (!evaluateFlag) {
+    const limitedList = shouldLimitByShowNumber
-      result = showNumber !== undefined ? list.slice(0, showNumber) : list;
+      ? list.slice(0, showNumber)
-    } else if (!list || list.length === 0) {
+      : list;
-      result = list;
+
-    } else if (hasTestInLastMonth) {
+    if (!evaluateFlag || hasTestInLastMonth) {
-      result = showNumber !== undefined ? list.slice(0, showNumber) : list;
+      return insertBannerCard(limitedList);
-    } else if (list.length <= 2) {
-      result = [...list, { type: "evaluateCard" }];
-    } else {
-      const [item1, item2, ...rest] = list;
-      result = [
-        item1,
-        item2,
-        { type: "evaluateCard" },
-        ...(showNumber !== undefined ? rest.slice(0, showNumber - 3) : rest),
-      ];
     }
 
+    if (limitedList.length <= 2) {
+      return insertBannerCard([...limitedList, { type: "evaluateCard" }]);
+    }
+
+    const [item1, item2, ...rest] = limitedList;
+    const result = [item1, item2, { type: "evaluateCard" }, ...rest];
     return insertBannerCard(result);
   }
 
   const memoizedList = useMemo(
     () => (enableHomeCards ? insertEvaluateCard(data) : data),
-    [enableHomeCards, evaluateFlag, data, hasTestInLastMonth, showNumber, bannerListImage, bannerDetailImage, bannerListIndex]
+    [
+      enableHomeCards,
+      evaluateFlag,
+      data,
+      hasTestInLastMonth,
+      showNumber,
+      bannerListImage,
+      bannerDetailImage,
+      bannerListIndex,
+    ]
   );
 
   // 渲染 banner 卡片
@@ -186,7 +214,9 @@ const ListContainer = (props) => {
           const target = item.banner_detail_url;
           if (target) {
             (Taro as any).navigateTo({
-              url: `/other_pages/bannerDetail/index?img=${encodeURIComponent(target)}`,
+              url: `/other_pages/bannerDetail/index?img=${encodeURIComponent(
+                target
+              )}`,
             });
           }
         }}
@@ -199,15 +229,16 @@ const ListContainer = (props) => {
           backgroundPosition: "center",
           backgroundRepeat: "no-repeat",
         }}
-      >
+      ></View>
-      </View>
     );
   };
 
+  const showNoData = isShowNoData && !loading && memoizedList?.length === 0;
+
   // 渲染列表
   const renderList = () => {
     // 请求数据为空
-    if (isShowNoData) {
+    if (showNoData) {
       return (
         <ListLoadError
           reload={reload}
@@ -232,7 +263,10 @@ const ListContainer = (props) => {
           }
           if (enableHomeCards && match?.type === "evaluateCard") {
             return (
-              <NTRPTestEntryCard key={`evaluate-${index}`} type={EvaluateScene.list} />
+              <NTRPTestEntryCard
+                key={`evaluate-${index}`}
+                type={EvaluateScene.list}
+              />
             );
           }
           return <ListCard key={match?.id || index} {...match} />;

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

@@ -220,7 +220,9 @@ export default function OrganizerInfo(props) {
                   >
                     <Text>{game.venue}</Text>
                     <Text>·</Text>
-                    <Text>{game.venueType}</Text>
+                    <Text style={{ whiteSpace: "nowrap" }}>
+                      {game.venueType}
+                    </Text>
                     <Text>·</Text>
                     <Text>{game.distance}</Text>
                   </View>
@@ -247,7 +249,7 @@ export default function OrganizerInfo(props) {
                           styles[
                             "recommend-games-list-item-addon-message-applications"
                           ],
-                          styles.joinMsg
+                          styles.joinMsg,
                         )}
                       >
                         <Text>已加入</Text>

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

@@ -25,9 +25,10 @@ dayjs.locale("zh-cn");
 // 分享弹窗
 export default forwardRef(({ id, from, detail, userInfo }, ref) => {
   const [visible, setVisible] = useState(false);
-  const [publishFlag, setPublishFlag] = useState(false);
   const [shareImageUrl, setShareImageUrl] = useState("");
   const { fetchUserInfo } = useUserActions();
+
+  const publishFlag = from === "publish";
   // const posterRef = useRef();
   const { max_participants, participant_count } = detail || {};
 
@@ -57,18 +58,20 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
   }
 
   useImperativeHandle(ref, () => ({
-    show: async (publish_flag = false) => {
+    show: async () => {
-      setPublishFlag(publish_flag);
-      if (publish_flag) {
-        try {
-          const url = await generateShareImageUrl();
-          setShareImageUrl(url);
-        } catch (e) {}
-      }
       setVisible(true);
     },
   }));
 
+  useEffect(() => {
+    if (from === "publish") {
+      generateShareImageUrl().then((url) => {
+        setShareImageUrl(url);
+        setVisible(true);
+      });
+    }
+  }, [from]);
+
   async function generateShareImageUrl() {
     const {
       play_type,
@@ -106,7 +109,7 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
     // console.log(res, "res");
     return {
       title: detail.title,
-      imageUrl: url || "https://img.yzcdn.cn/vant/cat.jpeg",
+      imageUrl: url,
       path: `/game_pages/detail/index?id=${id}&from=share`,
     };
   });
@@ -142,6 +145,7 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
     const qrCodeUrl = qrCodeUrlRes.data.ossPath;
     await delay(100);
     // Taro.showLoading({ title: "生成中..." });
+    console.log('url', qrCodeUrl)
     const url = await generatePosterImage({
       playType: play_type,
       ntrp: `NTRP ${genNTRPRequirementText(skill_level_min, skill_level_max)}`,
@@ -157,6 +161,8 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
       time: `${startTime.format("ah")}点 ${gameLength}`,
       qrCodeUrl,
     });
+
+    console.log('urlend', url)
     // Taro.hideLoading();
     Taro.showShareImageMenu({
       path: url,
@@ -183,7 +189,6 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
 
   function onClose() {
     setVisible(false);
-    setPublishFlag(false);
   }
 
   return (

src/game_pages/detail/index.tsx

@@ -54,12 +54,6 @@ function Index() {
       await waitForAuthInit();
       // 然后再获取用户信息
       await fetchUserInfo();
-
-      await delay(1000);
-
-      if (from === "publish") {
-        handleShare(true);
-      }
     };
     init();
   }, []);
@@ -92,7 +86,7 @@ function Index() {
       //   handleShare(true);
       // }
     } catch (error) {
-      console.error("用户位置更新失败", error);
+      console.warn("用户位置更新失败", error);
     }
   };
 
@@ -126,8 +120,12 @@ function Index() {
     }
   }
 
-  function handleShare(flag = false) {
+  function handleShare() {
-    sharePopupRef.current.show(flag);
+    if (!detail.id) {
+      toast("球局未加载完成，请稍后再试");
+      return false;
+    }
+    sharePopupRef.current.show();
   }
 
   const handleJoinGame = async () => {
@@ -293,6 +291,7 @@ function Index() {
           currentUserInfo={myInfo}
         />
         {/* share popup */}
+        {detail.id && myInfo.id && (
           <SharePopup
             ref={sharePopupRef}
             id={id as string}
@@ -300,6 +299,7 @@ function Index() {
             detail={detail}
             userInfo={myInfo}
           />
+        )}
       </View>
     </ScrollView>
   );

src/home_pages/index.tsx

@@ -17,14 +17,14 @@ const HomePage: React.FC = () => {
         if (loginResult.success) {
           // 静默登录成功，获取用户信息
           fetchUserInfo().catch((error) => {
-            console.error("获取用户信息失败:", error);
+            console.warn("获取用户信息失败:", error);
           });
           checkNicknameChangeStatus().catch((error) => {
-            console.error("检查昵称变更状态失败:", error);
+            console.warn("检查昵称变更状态失败:", error);
           });
         }
       } catch (error) {
-        console.error("静默登录失败:", error);
+        console.warn("静默登录失败:", error);
         // 静默登录失败不影响使用
       }
 

src/login_pages/index/index.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from "react";
 import { View, Text, Button, Image } from "@tarojs/components";
 import Taro, { useRouter } from "@tarojs/taro";
+import { GeneralNavbar } from "@/components";
 import {
   wechat_auth_login,
   save_login_state,
@@ -171,6 +172,8 @@ const LoginPage: React.FC = () => {
         <View className="bg_overlay"></View>
       </View>
 
+      <GeneralNavbar title="" showBack={true} showAvatar={false} onBack={handle_return_home} />
+
       {/* 主要内容 */}
       <View className="login_main_content">
         {/* 品牌区域 */}
@@ -216,9 +219,9 @@ const LoginPage: React.FC = () => {
             <Text className="button_text">手机号快捷登录</Text>
           </Button>
 
-          <View className="return_home_button link_button" onClick={handle_return_home}>
+          {/* <View className="return_home_button link_button" onClick={handle_return_home}>
             <Text className="button_text">返回首页</Text>
-          </View>
+          </View> */}
 
           {/* 用户协议复选框 */}
           <View className="terms_checkbox_section">

src/login_pages/verification/index.tsx

@@ -139,7 +139,7 @@ const VerificationPage: React.FC = () => {
         });
       }
     } catch (error) {
-      console.error("发送验证码异常:", error);
+      console.warn("发送验证码异常:", error);
       Taro.showToast({
         title: "发送失败，请重试",
         icon: "none",

src/main_pages/components/ListPageContent.tsx

@@ -67,6 +67,8 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
   } = store;
 
   const supportedCitiesList = useDictionaryStore((s) => s.getDictionaryValue('supported_cities', ['上海市'])) || [];
+  // 首页是否展示二维码，由 getDictionaryManyKey 的 show_home_qrcode 控制，默认 true 保持原样
+  const showHomeQrcode = useDictionaryStore((s) => s.getDictionaryValue('show_home_qrcode', true));
 
   const {
     isShowFilterPopup,
@@ -227,18 +229,16 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
 
   useEffect(() => {
     // 分批异步执行初始化操作，避免阻塞首屏渲染
-    // 1. 立即执行：获取城市、二维码和行政区列表（轻量操作）
     getCities();
-    getCityQrCode();
+    if (showHomeQrcode) getCityQrCode();
-    getDistricts(); // 新增：获取行政区列表
+    getDistricts();
 
-    // 只有当页面激活时才加载位置和列表数据
     if (isActive) {
       getLocation().catch((error) => {
-        console.error('获取位置信息失败:', error);
+        console.warn('获取位置信息失败:', error);
       });
     }
-  }, [isActive]);
+  }, [isActive, showHomeQrcode]);
 
   // 记录上一次的城市，用于检测城市变化
   const prevAreaRef = useRef<[string, string] | null>(null);
@@ -309,7 +309,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
               lastLoadedAreaRef.current = [...currentArea] as [string, string];
             }
           } catch (error) {
-            console.error("重新加载数据失败:", error);
+            console.warn("重新加载数据失败:", error);
           }
         }, delayMs);
         prevIsActiveRef.current = isActive;
@@ -375,7 +375,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
         await updateUserLocation(location.latitude, location.longitude, isFirstCall);
         hasUpdatedLocationRef.current = true;
       } catch (error) {
-        console.error("更新用户位置失败:", error);
+        console.warn("更新用户位置失败:", error);
       }
     }
     // 先调用列表接口
@@ -462,7 +462,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
       await getMatchesData();
       await fetchGetGamesCount();
     } catch (error) {
-      console.error("刷新列表失败:", error);
+      console.warn("刷新列表失败:", error);
     }
   };
 
@@ -477,7 +477,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
       const { fetchDictionary } = useDictionaryStore.getState();
       await fetchDictionary();
     } catch (error) {
-      console.error("初始化字典数据失败:", error);
+      console.warn("初始化字典数据失败:", error);
     }
   };
 
@@ -537,7 +537,13 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
   return (
     <>
       {shouldShowNoGames ? (
+        showHomeQrcode ? (
           renderCityQrcode()
+        ) : (
+          <View className={styles.cqContainer}>
+            <Text>当前城市暂无球局，敬请期待</Text>
+          </View>
+        )
       ) : (
         <View ref={scrollContextRef}>
           <View className={styles.listPage} style={{ paddingTop: totalHeight }}>
@@ -610,7 +616,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
                   try {
                     await loadMoreMatches();
                   } catch (error) {
-                    console.error("加载更多失败:", error);
+                    console.warn("加载更多失败:", error);
                   } finally {
                     loadingMoreRef.current = false;
                   }

src/main_pages/components/MyselfPageContent.tsx

@@ -11,12 +11,16 @@ import { EvaluateScene } from "@/store/evaluateStore";
 import { useUserInfo, useUserActions } from "@/store/userStore";
 import { usePickerOption } from "@/store/pickerOptionsStore";
 import { useGlobalState } from "@/store/global";
+import { useListState } from "@/store/listStore";
+import { useDictionaryStore } from "@/store/dictionaryStore";
 
 interface MyselfPageContentProps {
   isActive?: boolean;
 }
 
-const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }) => {
+const MyselfPageContent: React.FC<MyselfPageContentProps> = ({
+  isActive = true,
+}) => {
   const pickerOption = usePickerOption();
   const { statusNavbarHeightInfo } = useGlobalState() || {};
   const { totalHeight = 98 } = statusNavbarHeightInfo || {};
@@ -39,6 +43,10 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
   const [collapseProfile, setCollapseProfile] = useState(false);
   const [refreshing, setRefreshing] = useState(false);
 
+  const { area } = useListState();
+  const supportedCitiesList =
+    useDictionaryStore((s) => s.getDictionaryValue("supported_cities")) || [];
+
   useEffect(() => {
     pickerOption.getCities();
     pickerOption.getProfessions();
@@ -65,20 +73,21 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
       game_records: TennisMatch[]
     ): { notEndGames: TennisMatch[]; finishedGames: TennisMatch[] } => {
       const now = new Date().getTime();
-      return game_records.reduce(
+
-        (result, cur) => {
+      // 使用for
-          let { end_time } = cur;
+      const notEndGames: TennisMatch[] = [];
-          end_time = end_time.replace(/\s/, "T");
+      const finishedGames: TennisMatch[] = [];
-          new Date(end_time).getTime() > now
+      for (const game of game_records) {
-            ? result.notEndGames.push(cur)
+        const { end_time } = game;
-            : result.finishedGames.push(cur);
+        const end_time_str = end_time.replace(/\s/, "T");
-          return result;
+        new Date(end_time_str).getTime() > now
-        },
+          ? notEndGames.push(game)
-        {
+          : finishedGames.unshift(game);
-          notEndGames: [] as TennisMatch[],
-          finishedGames: [] as TennisMatch[],
       }
-      );
+
+      console.log("notEndGames", notEndGames);
+
+      return { notEndGames, finishedGames };
     },
     []
   );
@@ -95,6 +104,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
       } else {
         games_data = await UserService.get_participated_games(user_info.id);
       }
+
       const sorted_games = games_data.sort((a, b) => {
         return (
           new Date(a.original_start_time.replace(/\s/, "T")).getTime() -
@@ -102,10 +112,12 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
         );
       });
       const { notEndGames, finishedGames } = classifyGameRecords(sorted_games);
+      console.log("notEndGames", notEndGames);
+
       set_game_records(notEndGames);
       setEndedGameRecords(finishedGames);
     } catch (error) {
-      console.error("加载球局数据失败:", error);
+      console.warn("加载球局数据失败:", error);
     }
   }, [active_tab, user_info, classifyGameRecords]);
 
@@ -138,7 +150,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
         duration: 1500,
       });
     } catch (error) {
-      console.error("关注操作失败:", error);
+      console.warn("关注操作失败:", error);
       (Taro as any).showToast({
         title: "操作失败，请重试",
         icon: "error",
@@ -148,6 +160,16 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
   };
 
   const goPublish = () => {
+    const [_, address] = area;
+    if (!supportedCitiesList.includes(address)) {
+      (Taro as any).showModal({
+        title: "提示",
+        content: "该城市尚未开放，您可加入社群或切换城市",
+        showCancel: false,
+        confirmText: "知道了",
+      });
+      return;
+    }
     (Taro as any).navigateTo({
       url: "/publish_pages/publishBall/index",
     });
@@ -176,7 +198,7 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
     try {
       await Promise.all([fetchUserInfo(), load_game_data()]);
     } catch (error) {
-      console.error("刷新失败:", error);
+      console.warn("刷新失败:", error);
       (Taro as any).showToast({
         title: "刷新失败，请重试",
         icon: "none",
@@ -288,9 +310,8 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
                 overflow: "hidden",
               }}
               listLoadErrorWrapperHeight="fit-content"
-              listLoadErrorWidth="320px"
+              listLoadErrorWidth="410px"
-              listLoadErrorHeight="152px"
+              listLoadErrorHeight="185px"
-              listLoadErrorScale="1.2"
               defaultShowNum={3}
             />
           </ScrollView>
@@ -312,9 +333,8 @@ const MyselfPageContent: React.FC<MyselfPageContentProps> = ({ isActive = true }
                   collapse={true}
                   style={{ paddingBottom: "90px", overflow: "hidden" }}
                   listLoadErrorWrapperHeight="fit-content"
-                  listLoadErrorWidth="320px"
+                  listLoadErrorWidth="410px"
-                  listLoadErrorHeight="152px"
+                  listLoadErrorHeight="185px"
-                  listLoadErrorScale="1.2"
                   defaultShowNum={3}
                 />
               </ScrollView>

src/main_pages/index.config.ts

@@ -1,6 +1,7 @@
 export default definePageConfig({
   navigationBarTitleText: '首页',
   navigationStyle: 'custom',
-    navigationBarBackgroundColor: '#FAFAFA'
+  navigationBarBackgroundColor: '#FAFAFA',
-  })
+  enableShareAppMessage: true,
+})
 

src/main_pages/index.tsx

@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useCallback } from "react";
 import { View } from "@tarojs/components";
-import Taro from "@tarojs/taro";
+import Taro, { useRouter, useShareAppMessage } from "@tarojs/taro";
+import { OSS_BASE } from "@/config/api";
 import { wechat_auth_login, save_login_state } from "@/services/loginService";
 import { useUserActions } from "@/store/userStore";
 import { useGlobalState } from "@/store/global";
@@ -18,7 +19,11 @@ import { useDictionaryStore } from "@/store/dictionaryStore";
 type TabType = "list" | "message" | "personal";
 
 const MainPage: React.FC = () => {
-  const [currentTab, setCurrentTab] = useState<TabType>("list");
+  const { params } = useRouter();
+  const [currentTab, setCurrentTab] = useState<TabType>(() => {
+    const tab = params?.tab as TabType | undefined;
+    return tab === "list" || tab === "message" || tab === "personal" ? tab : "list";
+  });
   const [isPublishMenuVisible, setIsPublishMenuVisible] = useState(false);
   const [isDistanceFilterVisible, setIsDistanceFilterVisible] = useState(false);
   const [isCityPickerVisible, setIsCityPickerVisible] = useState(false);
@@ -35,6 +40,14 @@ const MainPage: React.FC = () => {
   const { showGuideBar, guideBarZIndex, setShowGuideBar, setGuideBarZIndex } =
     useGlobalState();
 
+  // 从分享链接进入时根据 ?tab= 定位到对应 tab
+  useEffect(() => {
+    const tab = params?.tab as TabType | undefined;
+    if (tab === "list" || tab === "message" || tab === "personal") {
+      setCurrentTab(tab);
+    }
+  }, [params?.tab]);
+
   // 初始化：自动微信授权并获取用户信息
   useEffect(() => {
     const init = async () => {
@@ -55,7 +68,7 @@ const MainPage: React.FC = () => {
             return;
           }
         } catch (error) {
-          console.error("微信授权异常:", error);
+          console.warn("微信授权异常:", error);
           setAuthErrorMessage("微信授权失败，请重试");
           setShowAuthError(true);
           return;
@@ -68,7 +81,7 @@ const MainPage: React.FC = () => {
           await fetchUserInfo();
           await checkNicknameChangeStatus();
         } catch (error) {
-          console.error("获取用户信息失败:", error);
+          console.warn("获取用户信息失败:", error);
         }
       }
     };
@@ -153,6 +166,43 @@ const MainPage: React.FC = () => {
     []
   );
 
+  // 分享：按 tab 用 map 对应文案与分享图
+  const share_config: Record<
+    TabType,
+    { title: string; image_path: string; query: string }
+  > = {
+    list: {
+      title: "有你就有场，发现身边好球友和好球局",
+      image_path: "system/share_home.png",
+      query: "?tab=list",
+    },
+    personal: {
+      title: "快来有场，约我一起打网球～",
+      image_path: "system/share_self.png",
+      query: "?tab=personal",
+    },
+    message: {
+      title: "查看球友动态",
+      image_path: "system/share_home.png",
+      query: "?tab=message",
+    },
+  };
+  useShareAppMessage(() => {
+    const config = share_config[currentTab] ?? {
+      title: "约球",
+      image_path: "system/share_home.png",
+      query: "",
+    };
+    // const imageUrl = OSS_BASE
+    //   ? `${OSS_BASE.replace(/\/$/, "")}/${config.image_path}`
+    //   : "";
+    return {
+      title: config.title,
+      path: "/main_pages/index" + config.query,
+      // imageUrl,
+    };
+  });
+
   // 滚动到顶部
   const scrollToTop = useCallback(() => {
     // 如果当前是列表页，触发列表页内部滚动

src/order_pages/orderDetail/index.module.scss

@@ -40,7 +40,9 @@
     border-bottom: 0.5px solid rgba(0, 0, 0, 0.06);
     padding: 8px 12px;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -57,7 +59,9 @@
     align-items: flex-start;
 
     color: rgba(60, 60, 67, 0.6);
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 12px;
     font-style: normal;
@@ -117,7 +121,9 @@
             align-items: center;
             background: #ff3b30;
             color: #fff;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "SF Compact Rounded";
             font-style: normal;
             font-weight: 600;
@@ -133,7 +139,9 @@
             box-sizing: border-box;
             flex-direction: column;
             align-items: center;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "SF Compact Rounded";
             font-size: 22px;
             font-style: normal;
@@ -154,7 +162,9 @@
 
           .date {
             color: #000;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "PingFang SC";
             font-size: 16px;
             font-style: normal;
@@ -164,7 +174,9 @@
 
           .venueTime {
             color: rgba(0, 0, 0, 0.8);
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "PingFang SC";
             font-size: 12px;
             font-style: normal;
@@ -191,7 +203,9 @@
           align-items: center;
           gap: 12px;
           color: rgba(0, 0, 0, 0.8);
-          font-feature-settings: "liga" off, "clig" off;
+          font-feature-settings:
+            "liga" off,
+            "clig" off;
           font-family: "PingFang SC";
           font-size: 12px;
           font-style: normal;
@@ -235,7 +249,9 @@
             gap: 4px;
             color: #000;
             text-align: center;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "PingFang SC";
             font-size: 16px;
             font-style: normal;
@@ -251,7 +267,9 @@
           &Address {
             color: rgba(0, 0, 0, 0.8);
             text-align: center;
-            font-feature-settings: "liga" off, "clig" off;
+            font-feature-settings:
+              "liga" off,
+              "clig" off;
             font-family: "PingFang SC";
             font-size: 12px;
             font-style: normal;
@@ -270,7 +288,9 @@
     justify-content: flex-start;
     gap: 4px;
     color: var(--Labels-Secondary, rgba(60, 60, 67, 0.6));
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 12px;
     font-style: normal;
@@ -307,7 +327,9 @@
 
       & > .buttonText {
         color: #000;
-        font-feature-settings: "liga" off, "clig" off;
+        font-feature-settings:
+          "liga" off,
+          "clig" off;
         font-family: "PingFang SC";
         font-size: 12px;
         font-style: normal;
@@ -347,7 +369,9 @@
     align-items: center;
     align-self: stretch;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -373,7 +397,9 @@
         width: 120px;
         display: inline-block;
         color: rgba(60, 60, 67, 0.6);
-        font-feature-settings: "liga" off, "clig" off;
+        font-feature-settings:
+          "liga" off,
+          "clig" off;
         font-family: "PingFang SC";
         font-size: 14px;
         font-style: normal;
@@ -383,7 +409,9 @@
 
       .content {
         color: #000;
-        font-feature-settings: "liga" off, "clig" off;
+        font-feature-settings:
+          "liga" off,
+          "clig" off;
         font-family: "PingFang SC";
         font-size: 14px;
         font-style: normal;
@@ -400,9 +428,10 @@
 
         .orderNo {
           display: flex;
-          justify-content: flex-end;
+          flex-direction: column;
-          align-items: center;
+          justify-content: center;
-          gap: 8px;
+          align-items: flex-end;
+          gap: 0px;
 
           .copy {
             color: #007aff;
@@ -421,7 +450,9 @@
     align-items: center;
     align-self: stretch;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -442,7 +473,9 @@
       align-items: center;
       color: #000;
       text-align: center;
-      font-feature-settings: "liga" off, "clig" off;
+      font-feature-settings:
+        "liga" off,
+        "clig" off;
       font-family: "PingFang SC";
       font-size: 12px;
       font-style: normal;
@@ -491,7 +524,9 @@
       &:nth-child(1) {
         color: #000;
         text-align: center;
-        font-feature-settings: "liga" off, "clig" off;
+        font-feature-settings:
+          "liga" off,
+          "clig" off;
         font-family: "PingFang SC";
         font-size: 14px;
         font-style: normal;
@@ -531,7 +566,9 @@
     align-items: center;
     align-self: stretch;
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 14px;
     font-style: normal;
@@ -567,7 +604,9 @@
   background: #000;
   box-shadow: 0 8px 64px 0 rgba(0, 0, 0, 0.1);
   backdrop-filter: blur(16px);
-  font-feature-settings: "liga" off, "clig" off;
+  font-feature-settings:
+    "liga" off,
+    "clig" off;
   font-family: "PingFang SC";
   font-size: 16px;
   font-style: normal;
@@ -600,7 +639,9 @@
     text-align: center;
     // border: 0.5px solid rgba(0, 0, 0, 0.06);
     color: #000;
-    font-feature-settings: "liga" off, "clig" off;
+    font-feature-settings:
+      "liga" off,
+      "clig" off;
     font-family: "PingFang SC";
     font-size: 16px;
     font-style: normal;
@@ -626,7 +667,9 @@
   padding: 12px 15px;
   color: rgba(60, 60, 67, 0.6);
   text-align: center;
-  font-feature-settings: "liga" off, "clig" off;
+  font-feature-settings:
+    "liga" off,
+    "clig" off;
   font-family: "PingFang SC";
   font-size: 16px;
   font-style: normal;

src/order_pages/orderDetail/index.tsx

@@ -10,6 +10,7 @@ import orderService, {
   GameOrderRes,
   OrderStatus,
   refundTextMap,
+  RefundStatus,
 } from "@/services/orderService";
 import { debounce } from "@tarojs/runtime";
 import {
@@ -76,7 +77,7 @@ function genGameNotice(order_status, start_time) {
 
 function GameInfo(props) {
   const { detail, currentLocation, orderDetail, init } = props;
-  const { order_status, refund_status, amount } = orderDetail;
+  const { order_status, refund_status, amount, refund_amount } = orderDetail;
   const {
     latitude,
     longitude,
@@ -111,7 +112,7 @@ function GameInfo(props) {
   const startTime = dayjs(start_time);
   const endTime = dayjs(end_time);
   const game_length = Number(
-    (endTime.diff(startTime, "minutes") / 60).toFixed()
+    (endTime.diff(startTime, "minutes") / 60).toFixed(),
   );
 
   const startMonth = startTime.format("M");
@@ -244,7 +245,10 @@ function GameInfo(props) {
     <View className={styles.gameInfoContainer}>
       {["refund", "progress", "expired"].includes(orderStatus) && (
         <View className={styles.paidInfo}>
-          {refundTextMap.get(refund_status)} ¥ {amount}
+          {refundTextMap.get(refund_status)} ¥{" "}
+          {[RefundStatus.PENDING, RefundStatus.SUCCESS].includes(refund_status)
+            ? refund_amount
+            : amount}
         </View>
       )}
       {["progress", "expired"].includes(orderStatus) &&
@@ -344,7 +348,7 @@ function GameInfo(props) {
               handlePayNow: () => {},
               handleViewGame,
             },
-            "detail"
+            "detail",
           )?.map((obj) => (
             <View className={classnames(styles.button, styles[obj.className])}>
               <Text className={styles.buttonText}>{obj.text}</Text>
@@ -504,7 +508,7 @@ function RefundPolicy(props) {
       const theTimeObj = dayjs(
         isLast
           ? refund_policy.at(-2).deadline_formatted
-          : item.deadline_formatted
+          : item.deadline_formatted,
       );
       const year = theTimeObj.format("YYYY");
       const month = theTimeObj.format("M");
@@ -531,7 +535,7 @@ function RefundPolicy(props) {
             className={classnames(
               styles.policyItem,
               targetIndex > index && index !== 0 ? styles.pastItem : "",
-              targetIndex === index ? styles.currentItem : ""
+              targetIndex === index ? styles.currentItem : "",
             )}
           >
             <View className={styles.time}>

src/order_pages/orderList/index.tsx

@@ -9,6 +9,7 @@ import orderService, {
   OrderStatus,
   CancelType,
   refundTextMap,
+  RefundStatus,
 } from "@/services/orderService";
 import { getStorage, removeStorage, setStorage } from "@/store/storage";
 import { useGlobalStore } from "@/store/global";
@@ -101,7 +102,7 @@ const OrderList = () => {
         newList.splice(
           index,
           clear ? newList.length - index : 1,
-          addPageInfo(res.data.rows, page)
+          addPageInfo(res.data.rows, page),
         );
         return newList;
       });
@@ -264,13 +265,17 @@ const OrderList = () => {
     });
   }
 
-  function handleQuit(item) {
+  async function handleQuit(item) {
     if (refundRef.current) {
-      refundRef.current.show(item, (result) => {
+      const res = await orderService.getRefundPolicy({ order_id: item.id });
+      refundRef.current.show(
+        { ...item, refund_policy: res.data.refund_policy },
+        (result) => {
           if (result) {
             getOrders(item.page);
           }
-      });
+        },
+      );
     }
   }
 
@@ -293,7 +298,7 @@ const OrderList = () => {
     >
       <GeneralNavbar
         title="球局订单"
-        backgroundColor="transparent"
+        backgroundColor="#ffffff"
         titleClassName={styles.titleClassName}
         className={styles.navbar}
       />
@@ -316,7 +321,7 @@ const OrderList = () => {
             item.order_status === OrderStatus.PENDING &&
             item.cancel_type === CancelType.NONE;
           const canceled = [CancelType.USER, CancelType.TIMEOUT].includes(
-            item.cancel_type
+            item.cancel_type,
           );
           const { game_info } = item;
 
@@ -349,7 +354,7 @@ const OrderList = () => {
                     <View
                       className={classnames(
                         styles.payNum,
-                        styles[unPay ? "pending" : "paid"]
+                        styles[unPay ? "pending" : "paid"],
                       )}
                     >
                       <Text>
@@ -358,7 +363,15 @@ const OrderList = () => {
                           : refundTextMap.get(item.refund_status)}
                       </Text>{" "}
                       <View className={styles.amount}>
-                        ¥ <Text>{item.amount}</Text>
+                        ¥{" "}
+                        <Text>
+                          {[
+                            RefundStatus.PENDING,
+                            RefundStatus.SUCCESS,
+                          ].includes(item.refund_status)
+                            ? item.refund_amount
+                            : item.amount}
+                        </Text>
                       </View>
                     </View>
                   )}
@@ -370,7 +383,7 @@ const OrderList = () => {
                   {insertDotInTags([location_name, court_type, "3.5km"]).map(
                     (text, index) => (
                       <Text key={index}>{text}</Text>
-                    )
+                    ),
                   )}
                 </View>
                 <View className={styles.gameOtherInfo}>
@@ -426,12 +439,12 @@ const OrderList = () => {
                       handlePayNow,
                       handleViewGame,
                     },
-                    "list"
+                    "list",
                   )?.map((obj) => (
                     <View
                       className={classnames(
                         styles.button,
-                        styles[obj.className]
+                        styles[obj.className],
                       )}
                     >
                       <Text className={styles.buttonText}>{obj.text}</Text>

src/other_pages/comment_reply/index.tsx

@@ -77,7 +77,7 @@ const CommentReply = () => {
         if (allCommentIds.length > 0) {
           // 使用统一接口标记已读，传入所有评论ID
           messageService.markAsRead('comment', allCommentIds).catch(e => {
-            console.error("标记评论已读失败:", e);
+            console.warn("标记评论已读失败:", e);
           });
         }
       }
@@ -221,7 +221,7 @@ const CommentReply = () => {
 
         if (allCommentIds.length > 0) {
           messageService.markAsRead('comment', allCommentIds).catch(e => {
-            console.error("标记评论已读失败:", e);
+            console.warn("标记评论已读失败:", e);
           });
         }
       }
@@ -249,7 +249,7 @@ const CommentReply = () => {
         <View className="comment-left">
           <Image
             className="user-avatar"
-            src={item.user_avatar || "https://img.yzcdn.cn/vant/cat.jpeg"}
+            src={item.user_avatar }
             mode="aspectFill"
             onClick={(e) => handleUserClick(e, item.user_id)}
           />

src/other_pages/enable_notification/index.tsx

@@ -21,7 +21,7 @@ const EnableNotificationPage: React.FC = () => {
           setQrCodeUrl(res.data.ServiceAccountQRCode);
         }
       } catch (error) {
-        console.error('获取二维码失败:', error);
+        console.warn('获取二维码失败:', error);
       }
     };
     fetchQRCode();

src/other_pages/new_follow/index.tsx

@@ -62,7 +62,7 @@ const NewFollow = () => {
         if (allFanIds.length > 0) {
           // 使用统一接口标记已读，传入所有关注者ID
           messageService.markAsRead('follow', allFanIds).catch(e => {
-            console.error("标记关注已读失败:", e);
+            console.warn("标记关注已读失败:", e);
           });
         }
       } else {
@@ -168,7 +168,7 @@ const NewFollow = () => {
 
         if (allFanIds.length > 0) {
           messageService.markAsRead('follow', allFanIds).catch(e => {
-            console.error("标记关注已读失败:", e);
+            console.warn("标记关注已读失败:", e);
           });
         }
       } else {

src/other_pages/ntrp-evaluate/index.tsx

@@ -99,7 +99,7 @@ function isOnCancelEmpty(onCancelFunc) {
     const normalized = funcString.replace(/\s/g, "");
     return emptyFunctionPatterns.includes(normalized);
   } catch (error) {
-    console.error("检查 onCancel 函数时出错:", error);
+    console.warn("检查 onCancel 函数时出错:", error);
     return false;
   }
 }
@@ -531,7 +531,7 @@ function Result() {
       //   setQrCodeUrl(tempFilePath);
       // }
     } catch (error) {
-      console.error("获取二维码失败:", error);
+      console.warn("获取二维码失败:", error);
     }
   }
 
@@ -645,7 +645,7 @@ function Result() {
       });
       return imageUrl;
     } catch (error) {
-      console.error("生成图片失败:", error);
+      console.warn("生成图片失败:", error);
       throw error;
     }
   }

src/publish_pages/publishBall/components/AiImportPopup/AiImportPopup.tsx

@@ -88,7 +88,7 @@ const AiImportPopup: React.FC<AiImportPopupProps> = ({
         })
       }
     } catch (error) {
-      console.error('获取剪切板失败:', error)
+      console.warn('获取剪切板失败:', error)
       Taro.showToast({
         title: '读取剪切板失败，请手动输入',
         icon: 'error',
@@ -163,7 +163,7 @@ const AiImportPopup: React.FC<AiImportPopupProps> = ({
         }
       }
     } catch (error) {
-      console.error('选择图片失败:', error)
+      console.warn('选择图片失败:', error)
       if (!(typeof error === 'object' && error.errMsg && error.errMsg.includes('fail cancel'))) {
         setUploadFailCount(prev => prev + 1)
         Taro.showToast({

src/publish_pages/publishBall/components/SelectStadium/SelectStadium.tsx

@@ -53,7 +53,7 @@ const SelectStadium: React.FC<SelectStadiumProps> = ({
         }
       }
     } catch (error) {
-      console.error('获取场馆列表失败:', error)
+      console.warn('获取场馆列表失败:', error)
     } finally {
       setLoading(false)
     }
@@ -107,7 +107,7 @@ const SelectStadium: React.FC<SelectStadiumProps> = ({
         setShowDetail(true)
       },
       fail: (err: { errMsg: string }) => {
-        console.error('选择位置失败:', err)
+        console.warn('选择位置失败:', err)
         const { errMsg } = err || {};
         if (!errMsg.includes('fail cancel')) {
           Taro.showToast({

src/publish_pages/publishBall/components/SelectStadium/StadiumDetail.tsx

@@ -152,7 +152,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
         })
       },
       fail: (err: { errMsg: string }) => {
-        console.error('选择位置失败:', err)
+        console.warn('选择位置失败:', err)
         const { errMsg } = err || {};
         if (!errMsg.includes('fail cancel')) {
           Taro.showToast({
@@ -199,13 +199,6 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
     }
    }
 
-   // 当键盘显示时触发 changeTextarea
-   useEffect(() => {
-     if (isKeyboardVisible) {
-       changeTextarea(true)
-     }
-   }, [isKeyboardVisible])
-
    const changePicker = (value:boolean) => {
     setOpenPicker(value);
    }
@@ -237,7 +230,7 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
         <View className='stadium-item-right'>
           <View className='stadium-name'>{formData.name}</View>
           <View className='stadium-address'>
-            <Text>{calculateDistance(formData.istance || null)} · </Text>
+            <Text>{calculateDistance(formData.istance || null) + ' · '}</Text>
             <Text>{formData.address}</Text>
             <Image src={images.ICON_ARRORW_SMALL} className='stadium-map-icon' />
           </View>
@@ -269,11 +262,13 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
                 <TextareaTag
                   value={formData[item.prop]}
                   onChange={(value) => {
-                    //changeTextarea(true)
                     updateFormData(item.prop, value)
                   }}
-                  // onBlur={() => changeTextarea(false)}
+                  // onBlur={() => {
-                  onFocus={() => changeTextarea(true)}
+                  // }}
+                  onFocus={() => {
+                    changeTextarea(true)
+                  }}
                   placeholder='有其他场地信息可备注'
                   options={(item.options || []).map((o) => ({ label: o, value: o }))}
                 />

src/publish_pages/publishBall/index.tsx

@@ -13,7 +13,7 @@ import {
 } from "../../config/formSchema/publishBallFormSchema";
 import { PublishBallFormData } from "../../../types/publishBall";
 import PublishService from "@/services/publishService";
-import { getNextHourTime, getEndTime, delay } from "@/utils";
+import { getNextHourTime, getEndTime, delay, getBackendErrorMsg } from "@/utils";
 import { useGlobalState } from "@/store/global";
 import GeneralNavbar from "@/components/GeneralNavbar";
 import images from "@/config/images";
@@ -364,15 +364,13 @@ const PublishBall: React.FC = () => {
   };
   // 提交表单
   const handleSubmit = async () => {
-    // 基础验证
     const params = getParams();
     const { republish } = params || {};
     if (activityType === "individual") {
       const isValid = validateFormData(formData[0]);
-      if (!isValid || publishLoading) {
+      if (!isValid || publishLoading) return;
-        return;
-      }
       setPublishLoading(true);
+      try {
         const {
           activityInfo,
           descriptionInfo,
@@ -408,40 +406,35 @@ const PublishBall: React.FC = () => {
             : await PublishService.createPersonal(options);
         const successText = republish === "0" ? "更新成功" : "发布成功";
         if (res.code === 0 && res.data) {
-        Taro.showToast({
+          Taro.showToast({ title: successText, icon: "success" });
-          title: successText,
-          icon: "success",
-        });
           delay(1000);
-        // 如果是个人球局，则跳转到详情页，并自动分享
-        // 如果是畅打，则跳转第一个球局详情页，并自动分享 @刘杰
           const id = (res as any).data?.id;
-        // 如果是编辑，就返回，否则就是新发布
           if (republish === "0") {
             Taro.navigateBack();
           } else {
-          // 使用 redirectTo 替换当前页面，避免返回时回到发布页面
             Taro.redirectTo({
-            // @ts-expect-error: id
+              url: `/game_pages/detail/index?id=${id || 1}&from=publish&autoShare=1`,
-            url: `/game_pages/detail/index?id=${
-              id || 1
-            }&from=publish&autoShare=1`,
             });
           }
         } else {
           Taro.showToast({
-          title: res.message,
+            title: getBackendErrorMsg(res, "发布失败"),
             icon: "none",
           });
           setPublishLoading(false);
         }
+      } catch (error) {
+        Taro.showToast({
+          title: getBackendErrorMsg(error, "发布失败"),
+          icon: "none",
+        });
+        setPublishLoading(false);
+      }
+      return;
     }
     if (activityType === "group") {
       const isValid = formData.every((item) => validateFormData(item));
-      if (!isValid || publishLoading) {
+      if (!isValid || publishLoading) return;
-        return;
-      }
-      setPublishLoading(true);
       if (checkAdjacentDataSame(formData)) {
         Taro.showToast({
           title: "信息不可与前序场完全一致",
@@ -449,6 +442,8 @@ const PublishBall: React.FC = () => {
         });
         return;
       }
+      setPublishLoading(true);
+      try {
         const options = formData.map((item) => {
           const {
             activityInfo,
@@ -482,27 +477,25 @@ const PublishBall: React.FC = () => {
             ? await PublishService.gamesUpdate(options[0])
             : await PublishService.create_play_pmoothlys({ rows: options });
         if (res.code === 0 && res.data) {
-        Taro.showToast({
+          Taro.showToast({ title: successText, icon: "success" });
-          title: successText,
-          icon: "success",
-        });
           delay(1000);
-        // 如果是个人球局，则跳转到详情页，并自动分享
-        // 如果是畅打，则跳转第一个球局详情页，并自动分享 @刘杰
           const id =
             republish === "0"
               ? (res as any).data?.id
               : (res as any).data?.[0]?.id;
-        // 使用 redirectTo 替换当前页面，避免返回时回到发布页面
           Taro.redirectTo({
-          // @ts-expect-error: id
+            url: `/game_pages/detail/index?id=${id || 1}&from=publish&autoShare=1`,
-          url: `/game_pages/detail/index?id=${
-            id || 1
-          }&from=publish&autoShare=1`,
           });
         } else {
           Taro.showToast({
-          title: res.message,
+            title: getBackendErrorMsg(res, "发布失败"),
+            icon: "none",
+          });
+          setPublishLoading(false);
+        }
+      } catch (error) {
+        Taro.showToast({
+          title: getBackendErrorMsg(error, "发布失败"),
           icon: "none",
         });
         setPublishLoading(false);

src/services/detailService.ts

@@ -169,7 +169,7 @@ class GameDetailService {
   }
 
   async getLinkUrl(req: { path: string, query: string }): Promise<ApiResponse<{ url_link: string, path: string, query: string }>> {
-    return httpService.post('/user/generate_url_link', req, { showLoading: true })
+    return httpService.post('/user/generate_url_link', req, { showLoading: false })
   }
 }
 

src/services/followService.ts

@@ -51,7 +51,7 @@ export class FollowService {
         throw new Error(response.message || '获取互关列表失败');
       }
     } catch (error) {
-      console.error('获取互关列表失败:', error);
+      console.warn('获取互关列表失败:', error);
       return { list: [], total: 0 };
     }
   }
@@ -79,7 +79,7 @@ export class FollowService {
         throw new Error(response.message || '获取粉丝列表失败');
       }
     } catch (error) {
-      console.error('获取粉丝列表失败:', error);
+      console.warn('获取粉丝列表失败:', error);
       return { list: [], total: 0 };
     }
   }
@@ -107,7 +107,7 @@ export class FollowService {
         throw new Error(response.message || '获取新增粉丝列表失败');
       }
     } catch (error) {
-      console.error('获取新增粉丝列表失败:', error);
+      console.warn('获取新增粉丝列表失败:', error);
       return { list: [], total: 0 };
     }
   }
@@ -135,7 +135,7 @@ export class FollowService {
         throw new Error(response.message || '获取关注列表失败');
       }
     } catch (error) {
-      console.error('获取关注列表失败:', error);
+      console.warn('获取关注列表失败:', error);
       return { list: [], total: 0 };
     }
   }
@@ -178,7 +178,7 @@ export class FollowService {
         throw new Error(response.message || '关注失败');
       }
     } catch (error) {
-      console.error('关注失败:', error);
+      console.warn('关注失败:', error);
       throw error;
     }
   }
@@ -201,7 +201,7 @@ export class FollowService {
         throw new Error(response.message || '取消关注失败');
       }
     } catch (error) {
-      console.error('取消关注失败:', error);
+      console.warn('取消关注失败:', error);
       throw error;
     }
   }
@@ -231,7 +231,7 @@ export class FollowService {
         throw new Error(response.message || '获取推荐用户失败');
       }
     } catch (error) {
-      console.error('获取推荐用户失败:', error);
+      console.warn('获取推荐用户失败:', error);
       return { list: [], total: 0 };
     }
   }
@@ -251,7 +251,7 @@ export class FollowService {
         return 'none';
       }
     } catch (error) {
-      console.error('检查关注状态失败:', error);
+      console.warn('检查关注状态失败:', error);
       return 'none';
     }
   }
@@ -269,7 +269,7 @@ export class FollowService {
         throw new Error(response.message || '屏蔽推荐用户失败');
       }
     } catch (error) {
-      console.error('屏蔽推荐用户失败:', error);
+      console.warn('屏蔽推荐用户失败:', error);
       throw error;
     }
   }

src/services/listApi.ts

@@ -27,7 +27,7 @@ export const getGamesList = async (params?: Record<string, any>) => {
     // const fetchApi = isIntegrate ? '/games/integrate_list' : '/games/list'
     return httpService.post('/games/list', params, { showLoading: false })
   } catch (error) {
-    console.error("列表数据获取失败:", error);
+    console.warn("列表数据获取失败:", error);
     throw error;
   }
 };
@@ -41,7 +41,7 @@ export const getGamesIntegrateList = async (params?: Record<string, any>) => {
   try {
     return httpService.post('/games/integrate_list', params, { showLoading: false })
   } catch (error) {
-    console.error("列表数据获取失败:", error);
+    console.warn("列表数据获取失败:", error);
     throw error;
   }
 };
@@ -55,7 +55,7 @@ export const getGamesCount = async (params?: Record<string, any>) => {
   try {
     return httpService.post('/games/count', params, { showLoading: false })
   } catch (error) {
-    console.error("列表数量获取失败:", error);
+    console.warn("列表数量获取失败:", error);
     throw error;
   }
 };
@@ -71,7 +71,7 @@ export const getSearchHistory = async (params) => {
     return httpService.post('/games/search_history', params, { showLoading: false })
   } catch (error) {
     // 捕获并打印错误信息
-    console.error("历史记录获取失败:", error);
+    console.warn("历史记录获取失败:", error);
     // 抛出错误以便上层处理
     throw error;
   }
@@ -87,7 +87,7 @@ export const clearHistory = async (params) => {
     return httpService.post('/games/search_history/delete_all', params, { showLoading: false })
   } catch (error) {
     // 捕获并打印错误信息
-    console.error("清除历史记录失败:", error);
+    console.warn("清除历史记录失败:", error);
     // 抛出错误以便上层处理
     throw error;
   }
@@ -104,7 +104,7 @@ export const searchSuggestion = async (params) => {
     return httpService.post('/games/search_recommendations', params)
   } catch (error) {
     // 捕获并打印错误信息
-    console.error("搜索建议获取失败:", error);
+    console.warn("搜索建议获取失败:", error);
     // 抛出错误以便上层处理
     throw error;
   }
@@ -116,7 +116,7 @@ export const getCities = async () => {
     return httpService.post('/cities/tree', {})
   } catch (error) {
     // 捕获并打印错误信息
-    console.error("城市列表获取失败:", error);
+    console.warn("城市列表获取失败:", error);
     // 抛出错误以便上层处理
     throw error;
   }
@@ -127,7 +127,7 @@ export const getCityQrCode = async () => {
     return httpService.post('/hot_city_qr/list', {})
   } catch (error) {
     // 捕获并打印错误信息
-    console.error("城市二维码获取失败:", error);
+    console.warn("城市二维码获取失败:", error);
     // 抛出错误以便上层处理
     throw error;
   }
@@ -140,7 +140,7 @@ export const getDistricts = async (params: { province: string; city: string }) =
     return httpService.post('/cities/cities', params)
   } catch (error) {
     // 捕获并打印错误信息
-    console.error("行政区列表获取失败:", error);
+    console.warn("行政区列表获取失败:", error);
     // 抛出错误以便上层处理
     throw error;
   }

src/services/loginService.ts

@@ -122,7 +122,7 @@ export const wechat_auth_login = async (
       };
     }
   } catch (error) {
-    console.error("微信授权登录失败:", error);
+    console.warn("微信授权登录失败:", error);
     return {
       success: false,
       message: "微信授权失败，请重试",
@@ -160,7 +160,7 @@ export const phone_auth_login = async (
         await useUser.getState().fetchUserInfo();
         await useUser.getState().checkNicknameChangeStatus();
       } catch (error) {
-        console.error("更新用户信息到 store 失败:", error);
+        console.warn("更新用户信息到 store 失败:", error);
       }
 
       return {
@@ -178,7 +178,7 @@ export const phone_auth_login = async (
       };
     }
   } catch (error) {
-    console.error("手机号登录失败:", error);
+    console.warn("手机号登录失败:", error);
     return {
       success: false,
       message: error.message,
@@ -206,7 +206,7 @@ export const send_sms_code = async (phone: string): Promise<SmsResponse> => {
       };
     }
   } catch (error) {
-    console.error("发送短信失败:", error);
+    console.warn("发送短信失败:", error);
     return {
       success: false,
       message: error.message,
@@ -232,7 +232,7 @@ export const verify_sms_code = async (
       user_info: response.data?.userInfo,
     };
   } catch (error) {
-    console.error("验证验证码失败:", error);
+    console.warn("验证验证码失败:", error);
     return {
       success: false,
       message: error.message,
@@ -255,7 +255,7 @@ export const save_login_state = (token: string, user_info: WechatUserInfo) => {
     Taro.setStorageSync("is_logged_in", true);
     Taro.setStorageSync("login_time", Date.now());
   } catch (error) {
-    console.error("保存登录状态失败:", error);
+    console.warn("保存登录状态失败:", error);
   }
 };
 
@@ -270,7 +270,7 @@ export const clear_login_state = () => {
     Taro.removeStorageSync("is_logged_in");
     Taro.removeStorageSync("login_time");
   } catch (error) {
-    console.error("清除登录状态失败:", error);
+    console.warn("清除登录状态失败:", error);
   }
 };
 
@@ -374,7 +374,7 @@ export const refresh_login_status = async (): Promise<boolean> => {
     // 检查本地存储的登录状态
     return check_login_status();
   } catch (error) {
-    console.error("刷新登录状态失败:", error);
+    console.warn("刷新登录状态失败:", error);
     return false;
   }
 };
@@ -385,7 +385,7 @@ export const updateUserPhone = async (payload: ChangePhoneParams) => {
     const response = await httpService.post("/user/update_phone", payload);
     return response;
   } catch (error) {
-    console.error("更新用户手机号失败:", error);
+    console.warn("更新用户手机号失败:", error);
     throw error;
   }
 };
@@ -402,7 +402,7 @@ export const getUserInfoById = async (id) => {
     );
     return response;
   } catch (error) {
-    console.error("获取用户信息失败:", error);
+    console.warn("获取用户信息失败:", error);
     throw error;
   }
 };
@@ -415,7 +415,7 @@ export const followUser = async (following_id) => {
     });
     return response;
   } catch (error) {
-    console.error("关注失败:", error);
+    console.warn("关注失败:", error);
     throw error;
   }
 };
@@ -428,7 +428,7 @@ export const unFollowUser = async (following_id) => {
     });
     return response;
   } catch (error) {
-    console.error("取消关注失败:", error);
+    console.warn("取消关注失败:", error);
     throw error;
   }
 };
@@ -464,7 +464,7 @@ export const silentLogin = async (): Promise<LoginResponse> => {
       console.log("微信登录结果:", login_result);
 
       if (!login_result.code) {
-        console.error("微信登录失败：未获取到code");
+        console.warn("微信登录失败：未获取到code");
         return {
           success: false,
           message: "微信登录失败",
@@ -506,14 +506,14 @@ export const silentLogin = async (): Promise<LoginResponse> => {
           user_info,
         };
       } else {
-        console.error("静默登录失败:", auth_response.message);
+        console.warn("静默登录失败:", auth_response.message);
         return {
           success: false,
           message: auth_response.message || "静默登录失败",
         };
       }
     } catch (error) {
-      console.error("静默登录异常:", error);
+      console.warn("静默登录异常:", error);
       return {
         success: false,
         message: "静默登录失败，请重试",

src/services/orderService.ts

@@ -188,6 +188,21 @@ class OrderService {
       },
     );
   }
+
+  // 获取退款政策
+  async getRefundPolicy({
+    order_id,
+  }: {
+    order_id: number;
+  }): Promise<ApiResponse<any>> {
+    return httpService.post(
+      "/payment/order_refund_policy",
+      { order_id },
+      {
+        showLoading: true,
+      },
+    );
+  }
 }
 
 // 导出认证服务实例

src/services/uploadFiles.ts

@@ -39,19 +39,28 @@ export interface uploadFileResponseData {
   updated_at: string,
 }
 
+// 从上传错误中取出可展示的文案
+function get_upload_error_msg(error: any): string {
+  if (!error) return "上传失败";
+  const msg =
+    error?.message ||
+    (typeof error?.error === "string" ? error.error : error?.error?.message) ||
+    (error?.data?.message ?? error?.data?.msg) ||
+    "";
+  return (msg && String(msg).trim()) || "上传失败";
+}
+
 // 发布球局类
 class UploadApi {
   async upload(req: UploadFilesData): Promise<{ id: string, data: uploadFileResponseData }> {
-
+    const fullUrl = `${envConfig.apiBaseURL}/api/gallery/upload`;
-    let fullUrl = `${envConfig.apiBaseURL}/api/gallery/upload`
+    const authHeader = tokenManager.getAuthHeader();
-
+    const { id, ...rest } = req;
-    const authHeader = tokenManager.getAuthHeader()
-    const { id, ...rest } = req
     try {
       const res = await Taro.uploadFile({
         url: fullUrl,
         filePath: rest.filePath,
-        name: 'file',
+        name: "file",
         formData: {
           description: rest.description,
           tags: rest.tags,
@@ -59,12 +68,17 @@ class UploadApi {
         },
         header: authHeader,
       });
-      return {
+      const parsed = JSON.parse(res.data);
-        id,
+      if (parsed.code !== 0) {
-        data: JSON.parse(res.data).data,
+        const msg = get_upload_error_msg(parsed);
+        Taro.showToast({ title: msg, icon: "none" });
+        throw new Error(msg);
       }
+      return { id, data: parsed.data };
     } catch (error) {
-      throw { id, error }
+      const msg = get_upload_error_msg(error);
+      Taro.showToast({ title: msg, icon: "none" });
+      throw { id, error };
     }
   }
 
@@ -103,7 +117,7 @@ class UploadApi {
         throw new Error(result.message || '上传失败');
       }
     } catch (error) {
-      console.error('上传图片失败:', error);
+      console.warn('上传图片失败:', error);
       throw error;
     }
   }

src/services/userService.ts

@@ -151,6 +151,7 @@ interface BackendGameData {
     longitude: string;
     venue_type: string;
     surface_type: string;
+    distance_km: string;
   };
   participants: {
     user: {
@@ -206,7 +207,7 @@ export class UserService {
         latitude = parseFloat(game.venue_dtl.latitude) || latitude;
         longitude = parseFloat(game.venue_dtl.longitude) || longitude;
       }
-      const distance = this.calculate_distance(latitude, longitude);
+   
 
       // 处理地点信息 - 优先使用venue_dtl中的信息
       let location = game.location_name || game.location || "未知地点";
@@ -227,7 +228,7 @@ export class UserService {
         original_start_time: game.start_time,
         end_time: game.end_time || "",
         location: location,
-        distance_km: parseFloat(distance.replace("km", "")) || 0,
+        distance_km: game.venue_dtl?.distance_km ,
         current_players: registered_count,
         max_players: max_count,
         skill_level_min: parseInt(game.skill_level_min) || 0,
@@ -303,20 +304,7 @@ export class UserService {
     return `${date_str} ${time_str}`;
   }
 
-  // 计算距离（模拟实现，实际需要根据用户位置计算）
-  private static calculate_distance(
-    latitude: number,
-    longitude: number
-  ): string {
-    if (latitude === 0 && longitude === 0) {
-      return "未知距离";
-    }
 
-    // 这里应该根据用户当前位置计算实际距离
-    // 暂时返回模拟距离
-    const distances = ["1.2km", "2.5km", "3.8km", "5.1km", "7.3km"];
-    return distances[Math.floor(Math.random() * distances.length)];
-  }
   // 获取用户信息
   static async get_user_info(user_id?: string): Promise<UserInfo> {
     try {
@@ -359,13 +347,11 @@ export class UserService {
           last_location_province: userData.last_location_province || "",
           last_location_city: userData.last_location_city || "",
         };
-
-       
       } else {
         throw new Error(response.message || "获取用户信息失败");
       }
     } catch (error) {
-      console.error("获取用户信息失败:", error);
+      console.warn("获取用户信息失败:", error);
       // 返回默认用户信息
       return {} as UserInfo;
     }
@@ -406,7 +392,7 @@ export class UserService {
         throw new Error(response.message || "更新用户信息失败");
       }
     } catch (error) {
-      console.error("更新用户信息失败:", error);
+      console.warn("更新用户信息失败:", error);
       throw error;
     }
   }
@@ -431,7 +417,7 @@ export class UserService {
         throw new Error(response.message || "获取主办球局失败");
       }
     } catch (error) {
-      console.error("获取主办球局失败:", error);
+      console.warn("获取主办球局失败:", error);
       // 返回符合ListContainer data格式的模拟数据
       return [];
     }
@@ -457,7 +443,7 @@ export class UserService {
         throw new Error(response.message || "获取参与球局失败");
       }
     } catch (error) {
-      console.error("获取参与球局失败:", error);
+      console.warn("获取参与球局失败:", error);
       // 返回符合ListContainer data格式的模拟数据
       return [];
     }
@@ -499,7 +485,7 @@ export class UserService {
         throw new Error(response.message || "操作失败");
       }
     } catch (error) {
-      console.error("关注操作失败:", error);
+      console.warn("关注操作失败:", error);
       throw error;
     }
   }
@@ -557,7 +543,7 @@ export class UserService {
         throw new Error(response.message || "更新用户信息失败");
       }
     } catch (error) {
-      console.error("保存用户信息失败:", error);
+      console.warn("保存用户信息失败:", error);
       throw error;
     }
   }
@@ -587,26 +573,16 @@ export class UserService {
         throw new Error(response.message || "获取用户动态失败");
       }
     } catch (error) {
-      console.error("获取用户动态失败:", error);
+      console.warn("获取用户动态失败:", error);
       return [];
     }
   }
 
-  // 上传头像
+  // 上传头像：仅在上传成功且 save 成功时返回 ossPath；失败则抛出，由调用方处理，避免误调 user/update
   static async upload_avatar(file_path: string): Promise<string> {
-    try {
-      // 先上传文件到服务器
     const result = await uploadFiles.upload_oss_img(file_path);
-
     await this.save_user_info({ avatar: result.ossPath });
-
-      // 使用新的响应格式中的file_url字段
     return result.ossPath;
-    } catch (error) {
-      console.error("头像上传失败:", error);
-      // 如果上传失败，返回默认头像
-      return require("../static/userInfo/default_avatar.svg");
-    }
   }
 
   // 解析用户手机号
@@ -626,7 +602,7 @@ export class UserService {
         throw new Error(response.message || "获取手机号失败");
       }
     } catch (error) {
-      console.error("获取手机号失败:", error);
+      console.warn("获取手机号失败:", error);
       return "";
     }
   }
@@ -642,7 +618,7 @@ export class UserService {
         throw new Error(message || "获取职业树失败");
       }
     } catch (error) {
-      console.error("获取职业树失败:", error);
+      console.warn("获取职业树失败:", error);
       return [];
     }
   }
@@ -658,7 +634,7 @@ export class UserService {
         throw new Error(message || "获取城市树失败");
       }
     } catch (error) {
-      console.error("获取职业树失败:", error);
+      console.warn("获取职业树失败:", error);
       return [];
     }
   }
@@ -679,7 +655,7 @@ export class UserService {
         throw new Error(message || "注销账户失败");
       }
     } catch (error) {
-      console.error("注销账户失败:", error);
+      console.warn("注销账户失败:", error);
     }
   }
 }
@@ -694,7 +670,7 @@ export const fetchUserProfile = async (): Promise<
     const response = await httpService.post("user/detail");
     return response;
   } catch (error) {
-    console.error("获取用户信息失败:", error);
+    console.warn("获取用户信息失败:", error);
     throw error;
   }
 };
@@ -709,7 +685,7 @@ export const checkNicknameChangeStatus = async (): Promise<
     );
     return response;
   } catch (error) {
-    console.error("获取昵称修改状态失败:", error);
+    console.warn("获取昵称修改状态失败:", error);
     throw error;
   }
 };
@@ -721,7 +697,7 @@ export const updateNickname = async (nickname: string) => {
     });
     return response;
   } catch (error) {
-    console.error("昵称修改失败:", error);
+    console.warn("昵称修改失败:", error);
     throw error;
   }
 };
@@ -732,7 +708,7 @@ export const updateUserProfile = async (payload: Partial<UserInfoType>) => {
     const response = await httpService.post("/user/update", payload);
     return response;
   } catch (error) {
-    console.error("更新用户信息失败:", error);
+    console.warn("更新用户信息失败:", error);
     throw error;
   }
 };
@@ -747,11 +723,11 @@ export const updateUserLocation = async (
     const response = await httpService.post("/user/update_location", {
       latitude,
       longitude,
-      force
+      force,
     });
     return response;
   } catch (error) {
-    console.error("更新用户坐标位置失败:", error);
+    console.warn("更新用户坐标位置失败:", error);
     throw error;
   }
 };
@@ -788,13 +764,13 @@ export const handleCustomerService = async (): Promise<void> => {
         console.log("打开客服成功:", res);
       },
       fail: (error) => {
-        console.error("打开客服失败:", error);
+        console.warn("打开客服失败:", error);
         // 如果官方客服不可用，显示备用联系方式
         showCustomerServiceFallback(customerService);
       },
     });
   } catch (error) {
-    console.error("客服功能异常:", error);
+    console.warn("客服功能异常:", error);
     // 备用方案：显示联系信息
     showCustomerServiceFallback();
   }
@@ -824,7 +800,7 @@ const showCustomerServiceFallback = (customerInfo?: any) => {
             phoneNumber: customerInfo.phoneNumber,
           });
         } catch (error) {
-          console.error("拨打电话失败:", error);
+          console.warn("拨打电话失败:", error);
           Taro.showToast({
             title: "拨打电话失败",
             icon: "none",
@@ -841,7 +817,7 @@ const showCustomerServiceFallback = (customerInfo?: any) => {
             icon: "success",
           });
         } catch (error) {
-          console.error("复制邮箱失败:", error);
+          console.warn("复制邮箱失败:", error);
           Taro.showToast({
             title: "复制失败",
             icon: "none",

src/services/walletService.ts

@@ -39,7 +39,7 @@ export class WalletService {
         throw new Error(response.message || "获取钱包信息失败");
       }
     } catch (error) {
-      console.error("获取钱包信息失败:", error);
+      console.warn("获取钱包信息失败:", error);
       // 返回模拟数据
       return {
         balance: 1588.80,
@@ -62,7 +62,7 @@ export class WalletService {
         throw new Error(response.message || "获取交易记录失败");
       }
     } catch (error) {
-      console.error("获取交易记录失败:", error);
+      console.warn("获取交易记录失败:", error);
       // 返回模拟数据
       return [
         {
@@ -107,7 +107,7 @@ export class WalletService {
         throw new Error(response.message || "提现申请提交失败");
       }
     } catch (error) {
-      console.error("提现申请提交失败:", error);
+      console.warn("提现申请提交失败:", error);
       throw error;
     }
   }

src/static/list/icon_game_type.svg

@@ -0,0 +1,13 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g clip-path="url(#clip0_3006_15051)">
+<path d="M12.8375 3.17871C11.6157 2.03414 9.9731 1.33331 8.16683 1.33331C4.3929 1.33331 1.3335 4.39271 1.3335 8.16665C1.3335 11.9406 4.3929 15 8.16683 15C10.0384 15 11.7343 14.2475 12.9684 13.0287L8.00016 7.99998L12.8375 3.17871Z" stroke="black" stroke-width="1.33333" stroke-linejoin="round"/>
+<path d="M13.3333 9.33335C14.0697 9.33335 14.6667 8.73639 14.6667 8.00002C14.6667 7.26365 14.0697 6.66669 13.3333 6.66669C12.597 6.66669 12 7.26365 12 8.00002C12 8.73639 12.597 9.33335 13.3333 9.33335Z" stroke="black" stroke-width="1.33333" stroke-linejoin="round"/>
+<path d="M5.6665 4.33331V6.99998" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M4.3335 5.66669H7.00016" stroke="black" stroke-width="1.33333" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<clipPath id="clip0_3006_15051">
+<rect width="16" height="16" fill="white"/>
+</clipPath>
+</defs>
+</svg>

src/store/README.md

@@ -93,7 +93,7 @@ function MyComponent() {
 
       console.log('请求成功!')
     } catch (error) {
-      console.error('请求失败:', error)
+      console.warn('请求失败:', error)
     } finally {
       setLoading(false)
     }

src/store/dictionaryStore.ts

@@ -35,17 +35,22 @@ export const useDictionaryStore = create<DictionaryState>()((set, get) => ({
     set({ isLoading: true, error: null })
     
     try {
-      const keys = 'publishing_requirements,court_type,court_surface,supplementary_information,game_play,fabu_tip,supported_cities,bannerListImage,bannerDetailImage,bannerListIndex';
+      const keys = 'publishing_requirements,court_type,court_surface,supplementary_information,game_play,fabu_tip,supported_cities,show_home_qrcode,bannerListImage,bannerDetailImage,bannerListIndex';
       const response = await commonApi.getDictionaryManyKey(keys)
       
       if (response.code === 0 && response.data) {
-        const dictionaryData = {};
+        const dictionaryData: DictionaryData = {};
         keys.split(',').forEach(key => {
-          const list = response.data[key];
+          const raw = response.data[key];
+          // 单值配置：首页是否展示二维码（1/0 或 true/false）
+          if (key === 'show_home_qrcode') {
+            dictionaryData[key] = raw === '1' || raw === 1 || raw === true;
+            return;
+          }
           // supported_cities 格式如 "上海市||北京市"，用 || 分割
           const listData = key === 'supported_cities'
-            ? (list ? String(list).split('||').map((s) => s.trim()).filter(Boolean) : [])
+            ? (raw ? String(raw).split('||').map((s) => s.trim()).filter(Boolean) : [])
-            : (list ? list.split('|') : []);
+            : (raw ? String(raw).split('|') : []);
           dictionaryData[key] = listData;
         })
         set({ 
@@ -71,7 +76,7 @@ export const useDictionaryStore = create<DictionaryState>()((set, get) => ({
         error: errorMessage,
         isLoading: false 
       })
-      console.error('获取字典数据失败:', error)
+      console.warn('获取字典数据失败:', error)
     }
   },
 

src/store/keyboardStore.ts

@@ -76,7 +76,7 @@ export const useKeyboardStore = create<KeyboardStore>((set, get) => ({
             try {
               listener(height, true)
             } catch (error) {
-              console.error('键盘监听器执行错误:', error)
+              console.warn('键盘监听器执行错误:', error)
             }
           })
         })
@@ -92,7 +92,7 @@ export const useKeyboardStore = create<KeyboardStore>((set, get) => ({
             try {
               listener(0, false)
             } catch (error) {
-              console.error('键盘监听器执行错误:', error)
+              console.warn('键盘监听器执行错误:', error)
             }
           })
         })
@@ -150,12 +150,13 @@ export const useKeyboardStore = create<KeyboardStore>((set, get) => ({
 
 // 导出便捷的 hooks
 export const useKeyboardHeight = () => {
-  const { keyboardHeight, isKeyboardVisible, addListener, initializeKeyboardListener } = useKeyboardStore()
+  const { keyboardHeight, isKeyboardVisible, addListener, initializeKeyboardListener, setKeyboardVisible } = useKeyboardStore()
   
   return {
     keyboardHeight,
     isKeyboardVisible,
     addListener,
-    initializeKeyboardListener
+    initializeKeyboardListener,
+    setKeyboardVisible
   }
 }

src/store/listStore.ts

@@ -410,7 +410,7 @@ export const useListStore = create<TennisStore>()((set, get) => ({
 
       return Promise.resolve();
     } catch (error) {
-      console.error("更新列表数据失败:", error);
+      console.warn("更新列表数据失败:", error);
       return Promise.reject(error);
     }
   },
@@ -724,7 +724,7 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       }
       return [];
     } catch (error) {
-      console.error("获取行政区列表失败:", error);
+      console.warn("获取行政区列表失败:", error);
       return [];
     }
   },

src/store/messageStore.ts

@@ -46,7 +46,7 @@ export const useMessageStore = create<MessageStore>()((set, get) => ({
         set({ loading: false });
       }
     } catch (e) {
-      console.error("获取红点信息失败:", e);
+      console.warn("获取红点信息失败:", e);
       set({ loading: false });
     }
   },

src/store/pickerOptionsStore.ts

@@ -5,7 +5,7 @@ import { UserService } from "@/services/userService";
 export interface PickerOptionState {
   cities: any[];
   professions: any[];
-  ntrpLevels: string[];
+  ntrpLevels: any[];
   getCities: () => Promise<any>;
   getProfessions: () => Promise<any>;
 }
@@ -13,7 +13,40 @@ export interface PickerOptionState {
 export const usePickerOption = create<PickerOptionState>((set) => ({
   cities: [],
   professions: [],
-  ntrpLevels: ["1.5", "2.0", "2.5", "3.0", "3.5", "4.0", "4.5", "4.5+"],
+  ntrpLevels: [
+    {
+      text: "1.5",
+      value: "1.5",
+    },
+    {
+      text: "2.0",
+      value: "2.0",
+    },
+    {
+      text: "2.5",
+      value: "2.5",
+    },
+    {
+      text: "3.0",
+      value: "3.0",
+    },
+    {
+      text: "3.5",
+      value: "3.5",
+    },
+    {
+      text: "4.0",
+      value: "4.0",
+    },
+    {
+      text: "4.5",
+      value: "4.5",
+    },
+    {
+      text: "4.5+",
+      value: "4.5+",
+    },
+  ],
   getCities: async () => {
     try {
       const res = await UserService.getCities();

src/store/storage.ts

@@ -5,7 +5,7 @@ export const setStorage = (key: string, data: any) => {
   try {
     Taro.setStorageSync(key, JSON.stringify(data))
   } catch (error) {
-    console.error('保存数据失败:', error)
+    console.warn('保存数据失败:', error)
   }
 }
 
@@ -17,7 +17,7 @@ export const getStorage = <T>(key: string): T | null => {
     }
     return null
   } catch (error) {
-    console.error('读取数据失败:', error)
+    console.warn('读取数据失败:', error)
     return null
   }
 }
@@ -26,7 +26,7 @@ export const removeStorage = (key: string) => {
   try {
     Taro.removeStorageSync(key)
   } catch (error) {
-    console.error('清除数据失败:', error)
+    console.warn('清除数据失败:', error)
   }
 }
 
@@ -34,6 +34,6 @@ export const clearAllStorage = () => {
   try {
     Taro.clearStorageSync()
   } catch (error) {
-    console.error('清除所有数据失败:', error)
+    console.warn('清除所有数据失败:', error)
   }
 } 

src/store/userStore.ts

@@ -8,8 +8,11 @@ import {
   NicknameChangeStatus,
   updateNickname as updateNicknameApi,
 } from "@/services/userService";
-import evaluateService, { LastTimeTestResult } from "@/services/evaluateService";
+import evaluateService, {
+  LastTimeTestResult,
+} from "@/services/evaluateService";
 import { useListStore } from "./listStore";
+import { getBackendErrorMsg } from "@/utils/helper";
 
 export interface UserState {
   user: UserInfoType | {};
@@ -23,7 +26,6 @@ export interface UserState {
   fetchLastTestResult: () => Promise<LastTimeTestResult | null>;
 }
 
-
 const getTimeNextDate = (time: string) => {
   const date = new Date(time);
   date.setDate(date.getDate() + 1);
@@ -51,8 +53,6 @@ export const useUser = create<UserState>()((set) => ({
 
       const cachedCity = (Taro as any).getStorageSync?.(CITY_CACHE_KEY);
 
-
-
       if (cachedCity && Array.isArray(cachedCity) && cachedCity.length === 2) {
         // 如果有缓存的城市，使用缓存，不更新 area
         console.log("[userStore] 检测到缓存的城市，使用缓存，不更新 area");
@@ -66,7 +66,10 @@ export const useUser = create<UserState>()((set) => ({
 
         // 只有当 area 不存在时才使用用户信息中的位置
         if (!currentArea) {
-          const newArea: [string, string] = [userData.last_location_province||"", userData.last_location_city||""];
+          const newArea: [string, string] = [
+            userData.last_location_province || "",
+            userData.last_location_city || "",
+          ];
           listStore.updateArea(newArea);
           // 保存到缓存
           useUser.getState().updateCache(newArea);
@@ -75,7 +78,7 @@ export const useUser = create<UserState>()((set) => ({
 
       return userData;
     } catch (error) {
-      console.error("获取用户信息失败:", error);
+      console.warn("获取用户信息失败:", error);
       return undefined;
     }
   },
@@ -85,7 +88,7 @@ export const useUser = create<UserState>()((set) => ({
     try {
       (Taro as any).setStorageSync?.(CITY_CACHE_KEY, newArea);
     } catch (error) {
-      console.error("保存城市缓存失败:", error);
+      console.warn("保存城市缓存失败:", error);
     }
   },
 
@@ -102,8 +105,14 @@ export const useUser = create<UserState>()((set) => ({
           const listStore = useListStore.getState();
           const currentArea = listStore.area;
           // 只有当 area 不存在或与 userLastLocationProvince 不一致时才更新
-          if (!currentArea || currentArea[1] !== userInfo.last_location_province) {
+          if (
-            const newArea: [string, string] = [userInfo.last_location_province || "", userInfo.last_location_city || ""];
+            !currentArea ||
+            currentArea[1] !== userInfo.last_location_province
+          ) {
+            const newArea: [string, string] = [
+              userInfo.last_location_province || "",
+              userInfo.last_location_city || "",
+            ];
             listStore.updateArea(newArea);
           }
         }
@@ -114,7 +123,11 @@ export const useUser = create<UserState>()((set) => ({
       // 只有在更新头像等需要服务器返回新URL的字段时才需要重新获取
       // 如果需要确保数据一致性，可以在特定场景下手动调用 fetchUserInfo
     } catch (error) {
-      console.error("更新用户信息失败:", error);
+      console.warn("更新用户信息失败:", error);
+      Taro.showToast({
+        title: getBackendErrorMsg(error, "保存失败"),
+        icon: "none",
+      });
       throw error;
     }
   },
@@ -127,7 +140,10 @@ export const useUser = create<UserState>()((set) => ({
     // 如果已经有状态数据且不是强制更新，跳过，避免重复调用
     if (!force) {
       const currentState = useUser.getState();
-      if (currentState.nicknameChangeStatus && Object.keys(currentState.nicknameChangeStatus).length > 0) {
+      if (
+        currentState.nicknameChangeStatus &&
+        Object.keys(currentState.nicknameChangeStatus).length > 0
+      ) {
         return;
       }
     }
@@ -142,7 +158,7 @@ export const useUser = create<UserState>()((set) => ({
         },
       });
     } catch (error) {
-      console.error("检查昵称变更状态失败:", error);
+      console.warn("检查昵称变更状态失败:", error);
     } finally {
       isCheckingNicknameStatus = false;
     }
@@ -156,7 +172,7 @@ export const useUser = create<UserState>()((set) => ({
         user: { ...state.user, nickname },
       }));
     } catch (error) {
-      console.error("更新用户昵称失败:", error);
+      console.warn("更新用户昵称失败:", error);
     }
   },
   // NTRP 测试结果缓存
@@ -190,7 +206,7 @@ export const useUser = create<UserState>()((set) => ({
       }
       return null;
     } catch (error) {
-      console.error("获取NTRP测试结果失败:", error);
+      console.warn("获取NTRP测试结果失败:", error);
       return null;
     } finally {
       isFetchingLastTestResult = false;

src/test_pages/index.tsx

@@ -25,7 +25,7 @@ const TestPage: React.FC = () => {
         }
       },
       fail(err) {
-        console.error('订阅失败:', err);
+        console.warn('订阅失败:', err);
         Taro.showToast({
           title: '订阅失败',
           icon: 'error',

src/user_pages/downloadBill/index.tsx

@@ -206,11 +206,11 @@ const DownloadBill: React.FC = () => {
           }
         },
         fail: function (err) {
-          console.error("文件下载失败：", err);
+          console.warn("文件下载失败：", err);
         },
       });
     } catch (error) {
-      console.error(error);
+      console.warn(error);
     }
   };
   const handleDownloadBill = async () => {
@@ -240,11 +240,11 @@ const DownloadBill: React.FC = () => {
           }
         },
         fail: function (err) {
-          console.error("文件下载失败：", err);
+          console.warn("文件下载失败：", err);
         },
       });
     } catch (error) {
-      console.error(error);
+      console.warn(error);
     }
   };
   return (

src/user_pages/downloadBillRecords/index.tsx

@@ -82,15 +82,15 @@ const DownloadBillRecords: React.FC = () => {
               console.log('打开文档成功');
             },
             fail: (err) => {
-              console.error('打开文档失败', err);
+              console.warn('打开文档失败', err);
             }
           });
         } else {
-          console.error('下载失败，状态码:', res.statusCode);
+          console.warn('下载失败，状态码:', res.statusCode);
         }
       },
       fail: (err) => {
-        console.error('下载失败', err);
+        console.warn('下载失败', err);
       }
     });
   }

src/user_pages/edit/index.tsx

@@ -22,6 +22,7 @@ import {
 } from "@/store/pickerOptionsStore";
 import { handleCustomerService } from "@/services/userService";
 import evaluateService from "@/services/evaluateService";
+import { getBackendErrorMsg } from "@/utils/helper";
 
 const EditProfilePage: React.FC = () => {
   const { updateUserInfo, updateNickname } = useUserActions();
@@ -44,6 +45,7 @@ const EditProfilePage: React.FC = () => {
       country: info?.country ?? "",
       province: info?.province ?? "",
       city: info?.city ?? "",
+      district: info?.district ?? "",
     };
   };
   const [form_data, setFormData] = useState(getInitialFormData());
@@ -85,6 +87,7 @@ const EditProfilePage: React.FC = () => {
         country: info?.country ?? "",
         province: info?.province ?? "",
         city: info?.city ?? "",
+        district: info?.district ?? "",
       });
     }
 
@@ -140,7 +143,7 @@ const EditProfilePage: React.FC = () => {
   //       city: user_data.city || "",
   //     });
   //   } catch (error) {
-  //     console.error("加载用户信息失败:", error);
+  //     console.warn("加载用户信息失败:", error);
   //     Taro.showToast({
   //       title: "加载用户信息失败",
   //       icon: "error",
@@ -167,9 +170,9 @@ const EditProfilePage: React.FC = () => {
             icon: "success",
           });
         } catch (error) {
-          console.error("头像上传失败:", error);
+          console.warn("头像上传失败:", error);
           Taro.showToast({
-            title: "头像上传失败",
+            title: error.message,
             icon: "none",
           });
         }
@@ -244,10 +247,10 @@ const EditProfilePage: React.FC = () => {
         icon: "success",
       });
     } catch (error) {
-      console.error("保存失败:", error);
+      console.warn("保存失败:", error);
       Taro.showToast({
-        title: "保存失败",
+        title: getBackendErrorMsg(error, "保存失败"),
-        icon: "error",
+        icon: "none",
       });
     }
   };
@@ -305,10 +308,10 @@ const EditProfilePage: React.FC = () => {
         icon: "success",
       });
     } catch (error) {
-      console.error("保存失败:", error);
+      console.warn("保存失败:", error);
       Taro.showToast({
-        title: "保存失败",
+        title: getBackendErrorMsg(error, "保存失败"),
-        icon: "error",
+        icon: "none",
       });
     }
   };
@@ -358,11 +361,11 @@ const EditProfilePage: React.FC = () => {
       });
       return;
     }
-    const [country, province, city] = e;
+    const [province, city, district] = e;
     handle_field_edit({
-      country: String(country ?? ""),
       province: String(province ?? ""),
       city: String(city ?? ""),
+      district: String(district ?? ""),
     });
   };
 
@@ -436,7 +439,7 @@ const EditProfilePage: React.FC = () => {
       const phone = await UserService.parse_phone(e.detail.code);
       handle_field_edit("phone", phone);
     } catch (e) {
-      console.error("解析手机号失败:", e);
+      console.warn("解析手机号失败:", e);
       Taro.showToast({
         title: "解析手机号失败，请重试",
         icon: "none",
@@ -562,8 +565,7 @@ const EditProfilePage: React.FC = () => {
                   </View>
                   <View className="item_right">
                     <Text
-                      className={`item_value ${
+                      className={`item_value ${form_data.gender ? "" : "placeholder"
-                        form_data.gender ? "" : "placeholder"
                         }`}
                     >
                       {convert_db_gender_to_display(form_data.gender)}
@@ -595,8 +597,7 @@ const EditProfilePage: React.FC = () => {
                   </View>
                   <View className="item_right">
                     <Text
-                      className={`item_value ${
+                      className={`item_value ${form_data.birthday ? "" : "placeholder"
-                        form_data.birthday ? "" : "placeholder"
                         }`}
                     >
                       {form_data.birthday || "选择生日"}
@@ -626,8 +627,7 @@ const EditProfilePage: React.FC = () => {
                   </View>
                   <View className="item_right">
                     <Text
-                      className={`item_value ${
+                      className={`item_value ${form_data.personal_profile ? "" : "placeholder"
-                        form_data.personal_profile ? "" : "placeholder"
                         }`}
                     >
                       {form_data.personal_profile.replace(/\n/g, " ") ||
@@ -659,16 +659,17 @@ const EditProfilePage: React.FC = () => {
                   </View>
                   <View className="item_right">
                     <Text
-                      className={`item_value ${
+                      className={`item_value ${form_data.province ||
-                        form_data.country ||
+                        form_data.city ||
-                        form_data.province ||
+                        form_data.district
-                        form_data.city
                         ? ""
                         : "placehoder"
                         }`}
                     >
-                      {form_data.country || form_data.province || form_data.city
+                      {form_data.province ||
-                        ? `${form_data.country} ${form_data.province} ${form_data.city}`
+                        form_data.city ||
+                        form_data.district
+                        ? `${form_data.province} ${form_data.city} ${form_data.district}`
                         : "选择所在地区"}
                     </Text>
                     <Image
@@ -693,8 +694,7 @@ const EditProfilePage: React.FC = () => {
                   </View>
                   <View className="item_right">
                     <Text
-                      className={`item_value ${
+                      className={`item_value ${form_data.ntrp_level ? "" : "placeholder"
-                        form_data.ntrp_level ? "" : "placeholder"
                         }`}
                     >
                       {form_data.ntrp_level || "测测你的 NTRP 水平"}
@@ -720,13 +720,11 @@ const EditProfilePage: React.FC = () => {
                     <Text className="item_label">职业</Text>
                   </View>
                   <View
-                    className={`item_right ${
+                    className={`item_right ${form_data.occupation ? "" : "placeholder"
-                      form_data.occupation ? "" : "placeholder"
                       }`}
                   >
                     <Text
-                      className={`item_value ${
+                      className={`item_value ${form_data.occupation ? "" : "placeholder"
-                        form_data.occupation ? "" : "placeholder"
                         }`}
                     >
                       {form_data.occupation || "填写你的职业"}
@@ -885,8 +883,8 @@ const EditProfilePage: React.FC = () => {
           visible={location_picker_visible}
           setvisible={setLocationPickerVisible}
           value={
-            form_data.country
+            form_data.province
-              ? [form_data.country, form_data.province, form_data.city]
+              ? [form_data.province, form_data.city, form_data.district]
               : getDefaultOption(cities)
           }
           onChange={handle_location_change}
@@ -899,15 +897,12 @@ const EditProfilePage: React.FC = () => {
           title="选择 NTRP 自评水平"
           confirmText="保存"
           ntrpTested={ntrpTested}
-          options={ntrpLevels.map((level) => ({
+          options={ntrpLevels}
-            text: level,
-            value: level,
-          }))}
           type="ntrp"
           // img={(user_info as UserInfoType)?.avatar_url}
           visible={ntrp_picker_visible}
           setvisible={setNtrpPickerVisible}
-          value={[form_data.ntrp_level || "2.5"]}
+          value={!form_data.ntrp_level ? ["2.5"] : [form_data.ntrp_level]}
           onChange={handle_ntrp_level_change}
         />
       )}

src/user_pages/follow/index.tsx

@@ -85,7 +85,7 @@ const FollowPage: React.FC = () => {
       }));
 
     } catch (error) {
-      console.error(`加载${TAB_CONFIG.find(t => t.key === tab)?.label}列表失败:`, error);
+      console.warn(`加载${TAB_CONFIG.find(t => t.key === tab)?.label}列表失败:`, error);
       Taro.showToast({
         title: '加载失败',
         icon: 'none'
@@ -163,7 +163,7 @@ const FollowPage: React.FC = () => {
       }
 
     } catch (error) {
-      console.error('关注操作失败:', error);
+      console.warn('关注操作失败:', error);
       Taro.showToast({
         title: '操作失败',
         icon: 'none'
@@ -202,7 +202,7 @@ const FollowPage: React.FC = () => {
     try {
       load_user_list(default_tab, true);
     } catch (error) {
-      console.error('初始化加载失败:', error);
+      console.warn('初始化加载失败:', error);
       Taro.showToast({
         title: '初始化失败',
         icon: 'none'
@@ -243,7 +243,7 @@ const FollowPage: React.FC = () => {
       //   icon: 'success'
       // });
     } catch (error) {
-      console.error('取消关注失败:', error);
+      console.warn('取消关注失败:', error);
       Taro.showToast({
         title: '操作失败',
         icon: 'none'

src/user_pages/myself/index.tsx

@@ -62,7 +62,7 @@ const MyselfPage: React.FC = () => {
   //     // }
   //     // set_game_records(games_data);
   //   } catch (error) {
-  //     console.error("加载用户数据失败:", error);
+  //     console.warn("加载用户数据失败:", error);
   //     Taro.showToast({
   //       title: "加载失败，请重试",
   //       icon: "error",
@@ -89,11 +89,10 @@ const MyselfPage: React.FC = () => {
         await fetchUserInfo();
       }
 
-      
       // 获取测试结果
       const res = await evaluateService.getLastResult();
       if (res.code === 0) {
-        console.log( "getLastResult", res.data);
+        console.log("getLastResult", res.data);
         setHasTestInLastMonth(res.data.has_test_in_last_month);
       }
     };
@@ -110,7 +109,8 @@ const MyselfPage: React.FC = () => {
   });
 
   // 分类球局数据（使用 useCallback 包装，避免每次渲染都创建新函数）
-  const classifyGameRecords = useCallback((
+  const classifyGameRecords = useCallback(
+    (
       game_records: TennisMatch[]
     ): { notEndGames: TennisMatch[]; finishedGames: TennisMatch[] } => {
       const now = new Date().getTime();
@@ -120,7 +120,7 @@ const MyselfPage: React.FC = () => {
           end_time = end_time.replace(/\s/, "T");
           new Date(end_time).getTime() > now
             ? result.notEndGames.push(cur)
-          : result.finishedGames.push(cur);
+            : result.finishedGames.unshift(cur);
           return result;
         },
         {
@@ -128,7 +128,9 @@ const MyselfPage: React.FC = () => {
           finishedGames: [] as TennisMatch[],
         }
       );
-  }, []);
+    },
+    []
+  );
 
   // 加载球局数据（使用 useCallback 包装，避免每次渲染都创建新函数）
   const load_game_data = useCallback(async () => {
@@ -150,7 +152,7 @@ const MyselfPage: React.FC = () => {
       setEndedGameRecords(finishedGames);
       // set_game_records(games_data);
     } catch (error) {
-      console.error("加载球局数据失败:", error);
+      console.warn("加载球局数据失败:", error);
     }
   }, [active_tab, user_info, classifyGameRecords]);
 
@@ -176,7 +178,7 @@ const MyselfPage: React.FC = () => {
         duration: 1500,
       });
     } catch (error) {
-      console.error("关注操作失败:", error);
+      console.warn("关注操作失败:", error);
       Taro.showToast({
         title: "操作失败，请重试",
         icon: "error",
@@ -272,7 +274,7 @@ const MyselfPage: React.FC = () => {
         </View>
 
         {/* 球局列表 */}
-        <View className="game_list_section" >
+        <View className="game_list_section">
           <ScrollView scrollY refresherBackground="#FAFAFA">
             <ListContainer
               data={game_records}

src/user_pages/other/index.tsx

@@ -117,7 +117,7 @@ const OtherUserPage: React.FC = () => {
       });
       setIsFollowing(userData.is_following || false);
     } catch (error) {
-      console.error("加载用户数据失败:", error);
+      console.warn("加载用户数据失败:", error);
       Taro.showToast({
         title: "加载失败",
         icon: "none",
@@ -141,7 +141,7 @@ const OtherUserPage: React.FC = () => {
           end_time = end_time.replace(/\s/, "T");
           new Date(end_time).getTime() > now
             ? result.notEndGames.push(cur)
-            : result.finishedGames.push(cur);
+            : result.finishedGames.unshift(cur);
           return result;
         },
         {
@@ -169,7 +169,7 @@ const OtherUserPage: React.FC = () => {
       setGameRecords(notEndGames);
       setEndedGameRecords(finishedGames);
     } catch (error) {
-      console.error("加载球局数据失败:", error);
+      console.warn("加载球局数据失败:", error);
       Taro.showToast({
         title: "加载失败，请重试",
         icon: "error",
@@ -200,7 +200,7 @@ const OtherUserPage: React.FC = () => {
         duration: 1500,
       });
     } catch (error) {
-      console.error("关注操作失败:", error);
+      console.warn("关注操作失败:", error);
       Taro.showToast({
         title: "操作失败",
         icon: "none",
@@ -235,7 +235,7 @@ const OtherUserPage: React.FC = () => {
     try {
       await Promise.all([load_user_data(), load_game_data()]);
     } catch (error) {
-      console.error("刷新失败:", error);
+      console.warn("刷新失败:", error);
     } finally {
       setRefreshing(false);
     }
@@ -329,9 +329,8 @@ const OtherUserPage: React.FC = () => {
                 overflow: "hidden",
               }}
               listLoadErrorWrapperHeight="fit-content"
-              listLoadErrorWidth="320px"
+              listLoadErrorWidth="410px"
-              listLoadErrorHeight="152px"
+              listLoadErrorHeight="185px"
-              listLoadErrorScale="1.2"
               defaultShowNum={3}
             />
           </ScrollView>
@@ -375,9 +374,8 @@ const OtherUserPage: React.FC = () => {
                   collapse={true}
                   style={{ paddingBottom: "90px", overflow: "hidden" }}
                   listLoadErrorWrapperHeight="fit-content"
-                  listLoadErrorWidth="320px"
+                  listLoadErrorWidth="410px"
-                  listLoadErrorHeight="152px"
+                  listLoadErrorHeight="185px"
-                  listLoadErrorScale="1.2"
                   defaultShowNum={3}
                 />
               </ScrollView>

src/user_pages/queryTransactions/index.tsx

@@ -84,7 +84,7 @@ const QueryTransactions = () => {
         setSearchHistory(response.data);
       }
     } catch (e) {
-      console.error(e);
+      console.warn(e);
     }
   };
   /**

src/user_pages/setTransactionPassword/index.scss

@@ -3,6 +3,7 @@
   background-color: #f5f5f5;
   box-sizing: border-box;
   overflow: hidden;
+  padding: 0 20px;
   .custom-navbar {
     height: 56px;
     /* 通常与原生导航栏高度一致 */
@@ -17,6 +18,7 @@
     top: 0;
     z-index: 100;
     background-color: #f5f5f5;
+    padding: 0 20px;
   }
 
   .detail-navigator {
@@ -48,18 +50,22 @@
   }
 
   .form-item {
-    padding: 20px;
+    padding: 16px 0;
     box-sizing: border-box;
     height: 50px;
     display: flex;
-    gap: 10px;
+    gap: 20px;
     align-items: center;
     border-bottom: 1px solid #0000000d;
     font-size: 14px;
 
     .form-label {
-      width: 56px;
       text-align: right;
+      font-weight: 600;
+    }
+
+    Input {
+      flex: 1;
     }
   }
 
@@ -72,7 +78,6 @@
     letter-spacing: 0px;
     vertical-align: middle;
     color: #3c3c4366;
-    padding: 0 20px;
   }
 
   .btn {
@@ -106,6 +111,5 @@
     border-radius: 16px;
     font-size: 16px;
     font-weight: 600;
-    transform: translateX(20px);
   }
 }

src/user_pages/setTransactionPassword/index.tsx

@@ -67,10 +67,12 @@ const SetTransactionPassword: React.FC = () => {
     const { new_password, confirm_password, sms_code } = formData;
     if (handleType === "set") {
       setValid(
-        (sms_code !== "") && (new_password.length === 6) && (confirm_password.length === 6)
+        sms_code !== "" &&
+          new_password.length === 6 &&
+          confirm_password.length === 6
       );
     } else {
-      setValid((new_password.length === 6) && (confirm_password.length === 6));
+      setValid(new_password.length === 6 && confirm_password.length === 6);
     }
   }, [formData]);
 
@@ -97,7 +99,7 @@ const SetTransactionPassword: React.FC = () => {
         icon: "success",
       });
       let delta = handleType === "set" ? 1 : 2;
-      Taro.navigateBack({ delta })
+      Taro.navigateBack({ delta });
     } catch (error) {
       Taro.showToast({
         title: "设置交易密码失败",
@@ -166,13 +168,11 @@ const SetTransactionPassword: React.FC = () => {
           Taro.navigateBack();
         }}
       />
-      <View 
+      <View className="form-item" style={{ marginTop: `${totalHeight}px` }}>
-        className="form-item"
-        style={{ marginTop: `${totalHeight}px` }}
-      >
         <Text className="form-label">交易密码</Text>
         <Input
           placeholder="请输入交易密码"
+          placeholderStyle="color: #d9d9d9;"
           password
           type="number"
           maxlength={6}
@@ -185,6 +185,7 @@ const SetTransactionPassword: React.FC = () => {
         <Text className="form-label">重复密码</Text>
         <Input
           placeholder="请再次输入交易密码"
+          placeholderStyle="color: #d9d9d9;"
           password
           type="number"
           maxlength={6}
@@ -198,6 +199,7 @@ const SetTransactionPassword: React.FC = () => {
           <Text className="form-label">手机验证</Text>
           <Input
             placeholder="请输入验证码"
+            placeholderStyle="color: #d9d9d9;"
             type="number"
             onInput={(e) => {
               handleInput(e, "sms_code");

src/user_pages/validPhone/index.scss

@@ -3,6 +3,7 @@
   box-sizing: border-box;
   height: 100vh;
   overflow-y: hidden;
+  padding: 0 20px;
   .custom-navbar {
     height: 56px;
     /* 通常与原生导航栏高度一致 */
@@ -48,18 +49,22 @@
   }
 
   .form-item {
-    padding: 20px;
+    padding: 16px 0;
     box-sizing: border-box;
     height: 50px;
     display: flex;
-    gap: 10px;
+    gap: 20px;
     align-items: center;
     border-bottom: 1px solid #0000000d;
     font-size: 14px;
 
     .form-label {
-      width: 56px;
       text-align: right;
+      font-weight: 600;
+    }
+
+    Input {
+      flex: 1;
     }
   }
 
@@ -95,6 +100,5 @@
     border-radius: 16px;
     font-size: 16px;
     font-weight: 600;
-    transform: translateX(20px);
   }
 }

src/user_pages/validPhone/index.tsx

@@ -139,10 +139,7 @@ const ValidPhone: React.FC = () => {
           Taro.navigateBack();
         }}
       />
-      <View 
+      <View className="form-item" style={{ marginTop: `${totalHeight}px` }}>
-        className="form-item"
-        style={{ marginTop: `${totalHeight}px` }}
-      >
         <Text className="form-label">手机号</Text>
         <Input defaultValue={formData.phone} type="number" disabled></Input>
       </View>
@@ -150,6 +147,7 @@ const ValidPhone: React.FC = () => {
         <Text className="form-label">验证码</Text>
         <Input
           placeholder="请输入验证码"
+          placeholderStyle="color: #d9d9d9;"
           type="number"
           onInput={(e) => {
             handleInput(e, "sms_code");

src/user_pages/wallet/index.tsx

@@ -195,7 +195,7 @@ const WalletPage: React.FC = () => {
       const res = await httpService.post("/wallet/check_password_status");
       set_password_status(res.data.is_password_set);
     } catch (e) {
-      console.error("检查交易密码状态失败:", e);
+      console.warn("检查交易密码状态失败:", e);
     }
   };
 
@@ -218,7 +218,7 @@ const WalletPage: React.FC = () => {
         total_withdraw,
       });
     } catch (error: any) {
-      console.error("加载钱包数据失败:", error);
+      console.warn("加载钱包数据失败:", error);
 
       let errorMessage = "加载失败，请重试";
       if (
@@ -262,7 +262,7 @@ const WalletPage: React.FC = () => {
         set_transactions([]);
       }
     } catch (error: any) {
-      console.error("加载交易记录失败:", error);
+      console.warn("加载交易记录失败:", error);
       set_transactions([]);
 
       let errorMessage = "加载交易记录失败";
@@ -500,6 +500,7 @@ const WalletPage: React.FC = () => {
       {/* 顶部导航栏 */}
       <GeneralNavbar
         title={pageTitle}
+        backgroundColor="#ffffff"
         showBack={true}
         showAvatar={false}
         onBack={() => {

src/user_pages/withdrawal/index.tsx

@@ -49,7 +49,7 @@ const Withdrawal: React.FC = () => {
   }, [initializeKeyboardListener, addListener]);
   const [showTips, setShowTips] = useState(false);
   const [tipsText, setTipsText] = useState<string>("");
-  const [inputValue, setInputValue] = useState<string>("0.00");
+  const [inputValue, setInputValue] = useState<string>("");
   const [walletInfo, setWalletInfo] = useState<WalletInfo>({
     balance: "0.00",
   });
@@ -65,8 +65,8 @@ const Withdrawal: React.FC = () => {
 
   const [inputValueObj, setInputValueObj] = useState({
     integer: "0",
-    decimal: "00"
+    decimal: "00",
-  })
+  });
 
   useDidShow(() => {
     load_wallet_data();
@@ -87,11 +87,11 @@ const Withdrawal: React.FC = () => {
   }, [show_withdraw_popup]);
 
   useEffect(() => {
-    const value = Number(inputValue).toFixed(2).split(".")
+    const value = Number(inputValue).toFixed(2).split(".");
-    const integer = value[0]
+    const integer = value[0];
-    const decimal = value[1]
+    const decimal = value[1];
-    setInputValueObj({ integer, decimal })
+    setInputValueObj({ integer, decimal });
-  }, [inputValue])
+  }, [inputValue]);
 
   const validateWithdrawAmount = (amount: string) => {
     if (Number(amount) > Number(walletInfo.balance)) {
@@ -135,7 +135,7 @@ const Withdrawal: React.FC = () => {
         total_withdraw,
       });
     } catch (error: any) {
-      console.error("加载钱包数据失败:", error);
+      console.warn("加载钱包数据失败:", error);
 
       let errorMessage = "加载失败，请重试";
       if (
@@ -171,7 +171,7 @@ const Withdrawal: React.FC = () => {
         setMapErrorCodes(mapErrorCodes);
       }
     } catch (error: any) {
-      console.error("获取提现错误码失败:", error);
+      console.warn("获取提现错误码失败:", error);
     }
   };
   const handleWithdraw = async () => {
@@ -307,11 +307,11 @@ const Withdrawal: React.FC = () => {
         showBack={true}
         showAvatar={false}
         onBack={() => {
-          const pages = Taro.getCurrentPages()
+          const pages = Taro.getCurrentPages();
-          const prevPage = pages[pages.length - 2]
+          const prevPage = pages[pages.length - 2];
           prevPage.setData({
-            updateList: withdrawSuccess
+            updateList: withdrawSuccess,
-          })
+          });
           Taro.navigateBack();
         }}
       />
@@ -325,6 +325,7 @@ const Withdrawal: React.FC = () => {
           <Input
             type="digit"
             placeholder="0.00"
+            placeholderStyle="color:rgba(120, 120, 128, 0.12);"
             cursorColor="#000"
             value={inputValue}
             onInput={handleInput}

src/utils/authInit.ts

@@ -33,7 +33,7 @@ const initUserAuthCore = async (): Promise<void> => {
           await fetchUserInfo();
           await checkNicknameChangeStatus();
         } catch (error) {
-          console.error("获取用户信息失败:", error);
+          console.warn("获取用户信息失败:", error);
         }
       } else {
         // 未登录，尝试静默登录
@@ -45,12 +45,12 @@ const initUserAuthCore = async (): Promise<void> => {
             await checkNicknameChangeStatus();
           }
         } catch (error) {
-          console.error("静默登录失败:", error);
+          console.warn("静默登录失败:", error);
           // 静默登录失败不影响使用
         }
       }
     } catch (error) {
-      console.error("初始化用户授权失败:", error);
+      console.warn("初始化用户授权失败:", error);
     } finally {
       isInitializingAuth = false;
       authInitPromise = null;

src/utils/genPoster.ts

@@ -35,21 +35,48 @@ export function base64ToTempFilePath(base64Data: string): Promise<string> {
 }
 
 
+interface TaroGetImageInfo {
+  getImageInfo(option: {
+    src: string;
+    success?: (res: { width: number; height: number }) => void;
+    fail?: (err: unknown) => void;
+  }): void;
+}
+
 /** 获取图片宽高 */
 function getImageWh(src: string): Promise<{ width: number; height: number }> {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
-    Taro.getImageInfo({
+    (Taro as TaroGetImageInfo).getImageInfo({
       src,
       success: ({ width, height }) => resolve({ width, height }),
+      fail: (e) => reject(e),
     });
   });
 }
 
 /** 加载图片 */
 function loadImage(canvas: any, src: string): Promise<any> {
-  return new Promise((resolve) => {
+  return new Promise((resolve, reject) => {
+
+    let timer: any;
     const img = canvas.createImage();
-    img.onload = () => resolve(img);
+
+    img.crossOrigin = "anonymous" 
+
+    img.onload = () => {
+      clearTimeout(timer);
+      resolve(img);
+    };
+    img.onerror = () => {
+      clearTimeout(timer);
+      console.log('img error', src)
+    }
+
+
+    timer = setTimeout(() => {
+      reject(new Error(`Image load timeout: ${src}`));
+    }, 8000);
+
     img.src = src;
   });
 }
@@ -137,6 +164,7 @@ async function drawRotateCoverImage(
   rotate = 0 // 旋转角度（弧度）
 ) {
   const { width, height } = await getImageWh(src);
+  console.log('width', width, 'height', height)
   const scale = Math.max(w / width, h / height);
   const newW = width * scale;
   const newH = height * scale;
@@ -170,6 +198,7 @@ async function drawRotateCoverImage(
 
   // 绘制 cover
   ctx.drawImage(img, offsetX, offsetY, newW, newH);
+  console.log('drawImage', offsetX, offsetY, newW, newH)
 
   ctx.restore();
 }
@@ -281,6 +310,8 @@ function drawTextWrap(
 
 /** 核心纯函数：生成海报图片 */
 export async function generatePosterImage(data: any): Promise<string> {
+
+
   console.log("start !!!!");
   // const dpr = Taro.getWindowInfo().pixelRatio;
   const dpr = 1;
@@ -288,19 +319,30 @@ export async function generatePosterImage(data: any): Promise<string> {
   const width = 600;
   const height = 1000;
 
+  console.log('width', width, 'height', height)
   const canvas = Taro.createOffscreenCanvas({ type: "2d", width: width * dpr, height: height * dpr });
   const ctx = canvas.getContext("2d");
   ctx.scale(dpr, dpr);
 
+
+  console.log('ctx', ctx)
+
+  
   // 背景渐变
   roundRectGradient(ctx, 0, 0, width, height, 24, "#BFFFEF", "#F2FFFC");
 
+  console.log('bgUrl', bgUrl)
   const bgImg = await loadImage(canvas, bgUrl);
   ctx.drawImage(bgImg, 0, 0, width, height);
+  console.log('bgUrlend', )
+
 
   roundRotateRect(ctx, 70, 100, width - 140, width - 140, 20, '#fff', deg2rad(-6));
+
+
   // 顶部图片
   const mainImg = await loadImage(canvas, data.mainCoursal);
+  console.log('mainCoursal', data.mainCoursal)
   await drawRotateCoverImage(
     ctx,
     canvas,
@@ -369,6 +411,8 @@ export async function generatePosterImage(data: any): Promise<string> {
   left = 20;
 
   const dateImg = await loadImage(canvas, dateIcon);
+
+  console.log('dateIcon', dateIcon)
   await drawCoverImage(
     ctx,
     canvas,
@@ -395,6 +439,7 @@ export async function generatePosterImage(data: any): Promise<string> {
   left = 20;
   top += 24;
 
+
   const mapImg = await loadImage(canvas, mapIcon);
   await drawCoverImage(ctx, canvas, mapIcon, mapImg, left, top, 40, 40, 12);
 
@@ -431,11 +476,13 @@ export async function generatePosterImage(data: any): Promise<string> {
   ctx.font = "400 20px sans-serif";
   ctx.fillText("长按识别二维码，快来加入，有你就有场！", left, height - 30/* top */);
 
+  console.log('canvas', canvas)
   // 导出图片
   const { tempFilePath } = await Taro.canvasToTempFilePath({
     canvas,
     fileType: 'png',
     quality: 0.7,
   });
+  console.log('tempFilePath', tempFilePath)
   return tempFilePath;
 }

src/utils/helper.ts

@@ -23,7 +23,7 @@ export const sceneRedirectLogic = (options, defaultPage: string) => {
       url: query ? `/${defaultPage}?${query}` : `/${defaultPage}`,
     });
   } catch (e) {
-    console.error(e);
+    console.warn(e);
   }
 };
 
@@ -94,6 +94,19 @@ export function toast(message) {
   Taro.showToast({ title: message, icon: "none" });
 }
 
+/** 从接口/请求错误中取出后端返回的文案，用于保存失败等场景的 toast */
+export function getBackendErrorMsg(error: any, fallback = "操作失败"): string {
+  if (error == null) return fallback;
+  const msg =
+    error?.message ||
+    (typeof error?.error === "string" ? error.error : error?.error?.message) ||
+    error?.data?.message ||
+    error?.data?.msg ||
+    "";
+  const s = String(msg).trim();
+  return s || fallback;
+}
+
 // 将·作为连接符插入到标签文本之间
 export function insertDotInTags(tags: string[]) {
   if (!tags) return [];

src/utils/share.ts

@@ -533,7 +533,6 @@ const drawShareCard = async (ctx: any, data: ShareCardData, offscreen: any): Pro
             const locationPath = await loadImage(`${OSS_BASE}/front/ball/images/adc9a167-2ea9-4e3b-b963-6a894a1fd91b.jpg`)
             ctx.drawImage(locationPath, iconX, locationInfoY, iconSize, iconSize)
             drawBoldText(ctx, data.venueName, danDaX, locationInfoY + 10, locationFontSize, '#000000')
-
             try {
                 const wxAny: any = (typeof (globalThis as any) !== 'undefined' && (globalThis as any).wx) ? (globalThis as any).wx : null
                 if (wxAny && typeof wxAny.canvasToTempFilePath === 'function') {
@@ -554,7 +553,7 @@ const drawShareCard = async (ctx: any, data: ShareCardData, offscreen: any): Pro
             console.log('Canvas绘制命令已发送')
 
         } catch (error) {
-            console.error('绘制分享卡片失败:', error)
+            console.warn('绘制分享卡片失败:', error)
             Taro.showToast({
                 title: '生成分享卡片失败',
                 icon: 'none'

src/utils/tokenManager.ts

@@ -16,7 +16,7 @@ class TokenManager {
     try {
       return Taro.getStorageSync(TOKEN_KEY)
     } catch (error) {
-      console.error('获取访问令牌失败:', error)
+      console.warn('获取访问令牌失败:', error)
       return null
     }
   }
@@ -26,7 +26,7 @@ class TokenManager {
     try {
       return Taro.getStorageSync(REFRESH_TOKEN_KEY)
     } catch (error) {
-      console.error('获取刷新令牌失败:', error)
+      console.warn('获取刷新令牌失败:', error)
       return null
     }
   }
@@ -36,7 +36,7 @@ class TokenManager {
     try {
       return Taro.getStorageSync(TOKEN_EXPIRES_KEY)
     } catch (error) {
-      console.error('获取令牌过期时间失败:', error)
+      console.warn('获取令牌过期时间失败:', error)
       return null
     }
   }
@@ -54,7 +54,7 @@ class TokenManager {
         Taro.setStorageSync(TOKEN_EXPIRES_KEY, tokenInfo.expiresAt)
       }
     } catch (error) {
-      console.error('设置令牌失败:', error)
+      console.warn('设置令牌失败:', error)
     }
   }
 
@@ -65,7 +65,7 @@ class TokenManager {
       Taro.removeStorageSync(REFRESH_TOKEN_KEY)
       Taro.removeStorageSync(TOKEN_EXPIRES_KEY)
     } catch (error) {
-      console.error('清除令牌失败:', error)
+      console.warn('清除令牌失败:', error)
     }
   }
 

src/utils/wx_helper.ts

@@ -17,7 +17,7 @@ export function saveImage(url) {
       await Taro.saveImageToPhotosAlbum({ filePath })
       Taro.showToast({ title: "保存成功" })
     } catch (e) {
-      console.error(e)
+      console.warn(e)
       Taro.showToast({ title: "图片保存失败", icon: "none" })
     }
   }