处理列表请求

project.config.json

@@ -2,7 +2,7 @@
   "miniprogramRoot": "dist/",
   "projectname": "playBallTogether",
   "description": "playBallTogether",
-  "appid": "wx815b533167eb7b53",
+  "appid": "wx915ecf6c01bea4ec",
   "setting": {
     "urlCheck": true,
     "es6": true,

src/app.config.ts

@@ -57,6 +57,7 @@ export default defineAppConfig({
         "ntrp-evaluate/index", // NTRP评估页
         "enable_notification/index", // 开启消息通知
         "emptyState/index", // 空状态页面
+        "bannerDetail/index", // Banner 图片详情页
       ],
     },
   ],

src/app.scss

@@ -21,6 +21,6 @@ page {
   font-family: "Quicksand";
   // 注意：此路径来自 @/config/api.ts 中的 OSS_BASE_URL 配置
   // 如需修改，请更新配置文件中的 OSS_BASE_URL
-  src: url("https://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/other/57dc951f-f10e-45b7-9157-0b1e468187fd.ttf") format("truetype");
+  src: url("https://youchang2026.oss-cn-shanghai.aliyuncs.com/front/ball/other/57dc951f-f10e-45b7-9157-0b1e468187fd.ttf") format("truetype");
   font-display: swap;
 }

src/components/CommonPopup/index.module.scss

@@ -7,7 +7,8 @@
     border-radius: 20px 20px 0 0 !important;
   }
   .common-popup__drag-handle-container {
-    position: position;
+    position: relative;
+    height: 0;
   }
 
   .common-popup__drag-handle {

src/components/PublishMenu/PublishMenu.tsx

@@ -7,6 +7,8 @@ import {
   EvaluateCallback,
   EvaluateScene,
 } from "@/store/evaluateStore";
+import { useListState } from "@/store/listStore";
+
 import { navigateTo, redirectTo, navigateBack } from "@/utils/navigation";
 import { requireLoginWithPhone } from "@/utils/helper";
 import styles from "./index.module.scss";
@@ -24,6 +26,11 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
   const { onVisibleChange } = props;
   const [isVisible, setIsVisible] = useState(false);
 
+  const {
+    area
+  } = useListState();
+
+
   // 使用 useEffect 监听 isVisible 变化，确保所有情况都能触发回调
   useEffect(() => {
     onVisibleChange?.(isVisible);
@@ -59,6 +66,16 @@ const PublishMenu: React.FC<PublishMenuProps> = (props) => {
     });
   };
   const handleMenuItemClick = (type: "individual" | "group" | "ai") => {
+    const [_, address] = area;
+    if (address !== '上海') {
+      (Taro as any).showModal({
+        title: '提示',
+        content: '仅上海地区开放，您可加入社群或切换城市',
+        showCancel: false,
+        confirmText: '知道了'
+      })
+      return;
+    }
     if (!userInfo.ntrp_level) {
       ntrpRef.current.show({
         type: EvaluateScene.publish,

src/components/TextareaTag/TextareaTag.tsx

@@ -29,8 +29,10 @@ const TextareaTag: React.FC<TextareaTagProps> = ({
   // 处理文本输入变化
   const handleTextChange = useCallback((val: string) => {
     console.log(val,'e.detail.value')
-    onChange({...value, description: val})
-  }, [onChange])
+    const maxAllowedLength = Math.floor(maxLength * 1.2)
+    const truncatedVal = val.length > maxAllowedLength ? val.slice(0, maxAllowedLength) : val
+    onChange({...value, description: truncatedVal})
+  }, [onChange, maxLength, value])
 
   // 处理标签选择变化
   const handleTagChange = useCallback((selectedTags: string[]) => {

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

@@ -33,7 +33,7 @@ async function convert_to_jpg_and_compress(
   return new Promise((resolve, reject) => {
     Taro.canvasToTempFilePath({
       canvas: canvas as unknown as Taro.Canvas,
-      fileType: "jpg",
+      fileType: "png",
       quality: 0.7,
       success: (res) => resolve(res.tempFilePath),
       fail: reject,

src/config/api.ts

@@ -1,7 +1,7 @@
 import envConfig from './env'// API配置
 
 // OSS 基础路径配置
-export const OSS_BASE_URL = 'https://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball'
+export const OSS_BASE_URL = 'https://youchang2026.oss-cn-shanghai.aliyuncs.com/front/ball'
 
 export const API_CONFIG = {
   // 基础URL

src/container/listContainer/index.tsx

@@ -3,6 +3,7 @@ import ListCard from "@/components/ListCard";
 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 { NTRPTestEntryCard } from "@/components";
 import { EvaluateScene } from "@/store/evaluateStore";
@@ -158,6 +159,35 @@ const ListContainer = (props) => {
     [evaluateFlag, data, hasTestInLastMonth, showNumber]
   );
 
+  // 渲染 banner 卡片
+  const renderBanner = (item, index) => {
+    if (!item?.banner_image_url) return null;
+    return (
+      <View
+        key={item.id || `banner-${index}`}
+        style={{
+          maxHeight: "122px",
+          overflow: "hidden",
+          borderRadius: "12px",
+        }}
+      >
+        <Image
+          src={item.banner_image_url}
+          mode="widthFix"
+          style={{ width: "100%", display: "block", maxHeight: "122px" }}
+          onClick={() => {
+            const target = item.banner_detail_url;
+            if (target) {
+              (Taro as any).navigateTo({
+                url: `/other_pages/bannerDetail/index?img=${encodeURIComponent(target)}`,
+              });
+            }
+          }}
+        />
+      </View>
+    );
+  };
+
   // 渲染列表
   const renderList = () => {
     // 请求数据为空
@@ -181,6 +211,9 @@ const ListContainer = (props) => {
     return (
       <>
         {memoizedList.map((match, index) => {
+          if (match.type === "banner") {
+            return renderBanner(match, index);
+          }
           if (match.type === "evaluateCard") {
             return (
               <NTRPTestEntryCard key="evaluate" type={EvaluateScene.list} />

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

@@ -85,7 +85,7 @@ export default function Participants(props) {
   //       id: 18,
   //       nickname: "小猫开刀削面店往猫毛里面下面条",
   //       avatar_url:
-  //         "https://bimwe.oss-cn-shanghai.aliyuncs.com/front/ball/images/d284060f-248b-4d58-a153-4d37c0ca77c8.jpg",
+  //         "https://youchang2026.oss-cn-shanghai.aliyuncs.com/front/ball/images/d284060f-248b-4d58-a153-4d37c0ca77c8.jpg",
   //       phone: "18513125687",
   //       ntrp_level: "1.5",
   //     },

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

@@ -1,4 +1,32 @@
 .shareContainer {
+  .opacityContainer {
+    height: 140px;
+    width: 100%;
+  }
+  .shareImageContainer {
+    position: absolute;
+    top: 10px;
+    left: 50%;
+    width: 220px;
+    height: 180px;
+    padding: 6px;
+    background-color: #fafafa;
+    border-radius: 16px;
+    transform: rotateZ(-5deg) translateX(-50%);
+    box-shadow: 0 3px 32px 0 rgba(0, 0, 0, 0.16);
+
+    .shareImage {
+      width: 100%;
+      height: 100%;
+      border-radius: 12px;
+    }
+  }
+  .contentContainer {
+    background-color: #fafafa;
+    border-top-left-radius: 16px;
+    border-top-right-radius: 16px;
+  }
+
   .title {
     padding: 20px 20px 16px;
     color: #000;
@@ -12,6 +40,18 @@
     align-items: center;
     justify-content: space-between;
 
+    &.publishTitle {
+      height: 100px;
+
+      .publishText {
+        align-self: flex-end;
+      }
+
+      .closeIconWrap {
+        align-self: flex-start;
+      }
+    }
+
     .publishText {
       color: #2a4d44;
       font-family: "Noto Sans SC";
@@ -62,6 +102,21 @@
     padding-top: 12px;
     padding-bottom: 60px;
 
+    .customBtnWrapper {
+      position: relative;
+    }
+
+    .button {
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      opacity: 0;
+      z-index: 1;
+    }
+
+    .customButton,
     .button {
       display: flex;
       flex-direction: column;
@@ -76,7 +131,7 @@
       font-weight: 600;
       line-height: normal;
 
-      background-color: #fff;
+      // background-color: #fff;
       border: none;
       padding: 0;
       margin: 0;

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

@@ -26,6 +26,7 @@ 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 posterRef = useRef();
   const { max_participants, participant_count } = detail || {};
@@ -56,13 +57,17 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
   }
 
   useImperativeHandle(ref, () => ({
-    show: (publish_flag = false) => {
+    show: async (publish_flag = false) => {
       setPublishFlag(publish_flag);
+      if (publish_flag) {
+        const url = await generateShareImageUrl();
+        setShareImageUrl(url);
+      }
       setVisible(true);
     },
   }));
 
-  useShareAppMessage(async (res) => {
+  async function generateShareImageUrl() {
     const {
       play_type,
       skill_level_max,
@@ -76,7 +81,6 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
     const endTime = dayjs(end_time);
     const dayofWeek = DayOfWeekMap.get(startTime.day());
     const gameLength = `${endTime.diff(startTime, "hour")}小时`;
-    await changeMessageType();
     const url = await generateShareImage({
       userAvatar: userInfo.avatar_url,
       userNickname: userInfo.nickname,
@@ -90,6 +94,12 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
       venueName: location_name,
       venueImages: image_list ? image_list : [],
     });
+    return url;
+  }
+
+  useShareAppMessage(async (res) => {
+    await changeMessageType();
+    const url = await generateShareImageUrl();
     // console.log(res, "res");
     return {
       title: detail.title,
@@ -168,51 +178,96 @@ export default forwardRef(({ id, from, detail, userInfo }, ref) => {
         showHeader={false}
         hideFooter
         enableDragToClose={false}
-        style={{ minHeight: "100px" }}
+        style={{ minHeight: "100px", background: "unset" }}
         zIndex={1000}
       >
         <View className={styles.shareContainer}>
-          <View catchMove className={styles.title}>
-            {publishFlag ? (
-              <Text className={styles.publishText}>球局发布成功 🎉</Text>
-            ) : (
-              <Text>分享至</Text>
-            )}
-            <View className={styles.closeIconWrap} onClick={onClose}>
-              <Image className={styles.closeIcon} src={CrossIcon} />
-            </View>
-          </View>
           {publishFlag && (
-            <View className={styles.shareTip}>
-              <Text>
-                还剩
-                <Text className={styles.specialCount}>
-                  {" "}
-                  {max_participants - participant_count}{" "}
-                </Text>
-                人加入完成组局， 去邀请好友加入吧～
-              </Text>
-            </View>
+            <>
+              <View className={styles.opacityContainer} />
+              <View className={styles.shareImageContainer}>
+                <Image className={styles.shareImage} src={shareImageUrl} />
+              </View>
+            </>
           )}
-          <View className={styles.shareItems}>
-            <Button className={styles.button} openType="share">
-              <View className={classnames(styles.icon, styles.wechatIcon)}>
-                <Image className={styles.wechat} src={WechatLogo} />
+          <View
+            className={styles.contentContainer}
+            style={{
+              backgroundImage: `url(${OSS_BASE_URL}/images/215f1ce1-be52-4a92-8250-5a4a69e7f2b3.png)`,
+            }}
+          >
+            <View
+              catchMove
+              className={classnames(
+                styles.title,
+                publishFlag ? styles.publishTitle : ""
+              )}
+            >
+              {publishFlag ? (
+                <Text className={styles.publishText}>球局发布成功 🎉</Text>
+              ) : (
+                <Text>分享至</Text>
+              )}
+              <View className={styles.closeIconWrap} onClick={onClose}>
+                <Image className={styles.closeIcon} src={CrossIcon} />
               </View>
-              <Text>微信好友</Text>
-            </Button>
-            <Button className={styles.button} onClick={handlePost}>
-              <View className={styles.icon}>
-                <Image className={styles.download} src={DownloadIcon} />
+            </View>
+            {publishFlag && (
+              <View className={styles.shareTip}>
+                <Text>
+                  还剩
+                  <Text className={styles.specialCount}>
+                    {" "}
+                    {max_participants - participant_count}{" "}
+                  </Text>
+                  人加入完成组局， 去邀请好友加入吧～
+                </Text>
               </View>
-              <Text>生成分享图</Text>
-            </Button>
-            <Button className={styles.button}>
-              <View className={styles.icon}>
-                <Image className={styles.linkIcon} src={LinkIcon} />
+            )}
+            <View className={styles.shareItems}>
+              <View className={styles.customBtnWrapper}>
+                <Button className={styles.button} openType="share">
+                  <View className={classnames(styles.icon, styles.wechatIcon)}>
+                    <Image className={styles.wechat} src={WechatLogo} />
+                  </View>
+                  <Text>微信好友</Text>
+                </Button>
+                <View className={styles.customButton}>
+                  <View className={classnames(styles.icon, styles.wechatIcon)}>
+                    <Image className={styles.wechat} src={WechatLogo} />
+                  </View>
+                  <Text>微信好友</Text>
+                </View>
               </View>
-              <Text>复制链接</Text>
-            </Button>
+              <View className={styles.customBtnWrapper}>
+                <Button className={styles.button} onClick={handlePost}>
+                  <View className={styles.icon}>
+                    <Image className={styles.download} src={DownloadIcon} />
+                  </View>
+                  <Text>生成分享图</Text>
+                </Button>
+                <View className={styles.customButton}>
+                  <View className={styles.icon}>
+                    <Image className={styles.download} src={DownloadIcon} />
+                  </View>
+                  <Text>生成分享图</Text>
+                </View>
+              </View>
+              <View className={styles.customBtnWrapper}>
+                <Button className={styles.button}>
+                  <View className={styles.icon}>
+                    <Image className={styles.linkIcon} src={LinkIcon} />
+                  </View>
+                  <Text>复制链接</Text>
+                </Button>
+                <View className={styles.customButton}>
+                  <View className={styles.icon}>
+                    <Image className={styles.linkIcon} src={LinkIcon} />
+                  </View>
+                  <Text>复制链接</Text>
+                </View>
+              </View>
+            </View>
           </View>
         </View>
       </CommonPopup>

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

@@ -2,6 +2,7 @@ import { useEffect, useRef, useState } from "react";
 import Taro from "@tarojs/taro";
 import classnames from "classnames";
 import dayjs from "dayjs";
+import { debounce } from "@tarojs/runtime";
 import { Text, View, Image } from "@tarojs/components";
 import OrderService from "@/services/orderService";
 import { EvaluateCallback, EvaluateScene } from "@/store/evaluateStore";
@@ -348,6 +349,8 @@ export default function StickyButton(props) {
     };
   }
 
+  const debounceAction = debounce(action, 300);
+
   return (
     <>
       <View className={styles["sticky-bottom-bar"]}>
@@ -390,7 +393,7 @@ export default function StickyButton(props) {
           <View
             style={is_organizer ? {} : { margin: "auto" }}
             className={styles["sticky-bottom-bar-join-game"]}
-            onClick={action}
+            onClick={debounceAction}
           >
             <ActionText />
           </View>

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

@@ -81,9 +81,10 @@
   }
 
   .venue-screenshot-scroll-view {
-    max-height: calc(100vh - 260px);
+    max-height: calc(100dvh - 260px);
     overflow-y: auto;
     padding-bottom: 40px;
+    box-sizing: border-box;
 
     .venue-screenshot-image-list {
       width: 100%;
@@ -92,9 +93,11 @@
       display: grid;
       grid-template-columns: repeat(3, 1fr);
       gap: 10px 10px;
+      overflow: hidden;
 
       .venue-screenshot-image-item {
         aspect-ratio: 1/1;
+        min-height: 100%;
         border-radius: 9px;
         border: 1px solid rgba(0, 0, 0, 0.12);
         box-sizing: border-box;

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

@@ -26,8 +26,7 @@ export default function VenueInfo(props) {
   function previewImage(current_url) {
     Taro.previewImage({
       current: current_url,
-      urls:
-        venue_image_list?.length > 0 ? venue_image_list.map((c) => c.url) : [],
+      urls: venue_image_list || [],
     });
   }
   return (
@@ -83,16 +82,17 @@ export default function VenueInfo(props) {
         <ScrollView scrollY className={styles["venue-screenshot-scroll-view"]}>
           <View className={styles["venue-screenshot-image-list"]}>
             {venue_image_list?.length > 0 &&
-              venue_image_list.map((item) => {
+              venue_image_list.map((url, index) => {
                 return (
                   <View
                     className={styles["venue-screenshot-image-item"]}
-                    onClick={previewImage.bind(null, item.url)}
+                    onClick={previewImage.bind(null, url)}
+                    key={index}
                   >
                     <Image
                       className={styles["venue-screenshot-image-item-image"]}
                       mode="aspectFill"
-                      src={item.url}
+                      src={url}
                     />
                   </View>
                 );

src/game_pages/detail/index.tsx

@@ -159,7 +159,7 @@ function Index() {
 
   function handleViewUserInfo(userId) {
     navto(
-      isMyOwn
+      userId === myInfo.id
         ? "/user_pages/myself/index"
         : `/user_pages/other/index?userid=${userId}`
     );

src/main_pages/components/ListPageContent.tsx

@@ -63,6 +63,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
     area,
     cityQrCode,
     districts,
+    fetchMatches,
     gamesNum, // 新增：获取球局数量
   } = store;
 
@@ -77,6 +78,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
     pageOption,
     isShowNoData,
   } = listPageState || {};
+  console.log('===matches', matches)
 
   const scrollContextRef = useRef(null);
   const scrollViewRef = useRef(null);
@@ -92,6 +94,8 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
   // 记录上一次加载数据时的城市，用于检测城市变化
   const lastLoadedAreaRef = useRef<[string, string] | null>(null);
   const prevIsActiveRef = useRef(isActive);
+  // 首次加载标记：避免切回 tab 时使用 isRefresh 导致智能排序顺序抖动
+  const hasLoadedOnceRef = useRef(false);
 
   // 处理距离筛选显示/隐藏
   const handleDistanceFilterVisibleChange = useCallback(
@@ -230,9 +234,16 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
    
     // 只有当页面激活时才加载位置和列表数据
     if (isActive) {
-      getLocation().catch((error) => {
-        console.error('获取位置信息失败:', error);
-      });
+      const firstLoad = !hasLoadedOnceRef.current;
+      getLocation(firstLoad)
+        .then(() => {
+          if (firstLoad) {
+            hasLoadedOnceRef.current = true;
+          }
+        })
+        .catch((error) => {
+          console.error('获取位置信息失败:', error);
+        });
     }
   }, [isActive]);
 
@@ -359,7 +370,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
     };
   }, []);
 
-  const getLocation = async () => {
+  const getLocation = async (useRefresh = true) => {
     const location = await getCurrentLocationInfo();
     updateState({ location });
     if (location && location.latitude && location.longitude) {
@@ -370,7 +381,7 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
       }
     }
     // 先调用列表接口
-    await getMatchesData();
+    await fetchMatches({}, useRefresh);
     // 列表接口完成后，再调用数量接口
     await fetchGetGamesCount();
     // 初始数据加载完成后，记录当前城市
@@ -385,7 +396,9 @@ const ListPageContent: React.FC<ListPageContentProps> = ({
   };
 
   const handleRefresh = async () => {
-
+    if (refreshing) {
+      return;
+    }
 
     setRefreshing(true);
     try {

src/main_pages/components/MessagePageContent.tsx

@@ -64,11 +64,17 @@ const MessagePageContent: React.FC<MessagePageContentProps> = ({ isActive = true
     }
   };
 
-  // 只有当页面激活且未加载过数据时才加载接口
+  // 当切换到消息 tab 时，调用红点信息接口
+  useEffect(() => {
+    if (isActive) {
+      fetchReddotInfo();
+    }
+  }, [isActive]);
+
+  // 只有当页面激活且未加载过数据时才加载通知列表
   useEffect(() => {
     if (isActive && !hasLoaded) {
       getNoticeList();
-      fetchReddotInfo();
       setHasLoaded(true);
     }
   }, [isActive, hasLoaded]);

src/main_pages/index.tsx

@@ -13,6 +13,7 @@ import MessagePageContent from "./components/MessagePageContent";
 import MyselfPageContent from "./components/MyselfPageContent";
 import "./index.scss";
 import FamilyContext from "@/context";
+import { useDictionaryStore } from "@/store/dictionaryStore";
 
 type TabType = "list" | "message" | "personal";
 
@@ -66,6 +67,12 @@ const MainPage: React.FC = () => {
         try {
           await fetchUserInfo();
           await checkNicknameChangeStatus();
+          // 启动时预取 Banner 字典（与业务无强依赖，失败不影响主流程）
+          try {
+            await useDictionaryStore.getState().fetchBannerDictionary();
+          } catch (e) {
+            console.error("预取 Banner 字典失败:", e);
+          }
         } catch (error) {
           console.error("获取用户信息失败:", error);
         }

src/order_pages/orderDetail/index.tsx

@@ -11,6 +11,7 @@ import orderService, {
   OrderStatus,
   refundTextMap,
 } from "@/services/orderService";
+import { debounce } from "@tarojs/runtime";
 import {
   payOrder,
   delay,
@@ -615,7 +616,7 @@ const OrderCheck = () => {
   }
 
   //TODO: get order msg from id
-  const handlePay = async () => {
+  const handlePay = debounce(async () => {
     // 检查登录状态和手机号
     if (!requireLoginWithPhone()) {
       return; // 未登录或未绑定手机号，已跳转到登录页
@@ -654,7 +655,8 @@ const OrderCheck = () => {
       init();
       setPaying(false);
     }
-  };
+  }, 300);
+
   if (!id && !gameId) {
     return (
       <View className={styles.errorTip}>

src/other_pages/bannerDetail/index.config.ts

@@ -0,0 +1,8 @@
+export default definePageConfig({
+  navigationBarTitleText: '',
+  navigationStyle: 'custom',
+  navigationBarBackgroundColor: '#FFFFFF',
+  backgroundColor: '#FFFFFF',
+});
+
+

src/other_pages/bannerDetail/index.scss

@@ -0,0 +1,16 @@
+.banner_detail_page {
+  min-height: 100vh;
+  background: #ffffff;
+}
+
+.banner_detail_content {
+  padding: 12px;
+}
+
+.banner_detail_image {
+  width: 100%;
+  border-radius: 12px;
+  display: block;
+}
+
+

src/other_pages/bannerDetail/index.tsx

@@ -0,0 +1,36 @@
+import { useEffect, useState } from 'react';
+import { View, Image } from '@tarojs/components';
+import Taro from '@tarojs/taro';
+import { GeneralNavbar } from '@/components';
+import './index.scss';
+
+function Index() {
+  const [imgUrl, setImgUrl] = useState<string>('');
+
+  useEffect(() => {
+    const instance = (Taro as any).getCurrentInstance?.();
+    const params = instance?.router?.params || {};
+    const url = params?.img ? decodeURIComponent(params.img) : '';
+    setImgUrl(url);
+  }, []);
+
+  return (
+    <View className="banner_detail_page">
+      <GeneralNavbar title="" showBack={true} />
+      <View className="banner_detail_content">
+        {imgUrl ? (
+          <Image
+            className="banner_detail_image"
+            src={imgUrl}
+            mode="widthFix"
+            showMenuByLongpress
+          />
+        ) : null}
+      </View>
+    </View>
+  );
+}
+
+export default Index;
+
+

src/other_pages/comment_reply/index.tsx

@@ -71,14 +71,12 @@ const CommentReply = () => {
 
         setCommentList(mappedList);
 
-        // 获取未读评论ID并标记已读
-        const unreadIds = res.data.rows
-          .filter((item: any) => item.is_read === 0)
-          .map((item: any) => item.id);
+        // 获取所有评论ID列表并标记已读（传入所有ID，包括已读和未读）
+        const allCommentIds = res.data.rows.map((item: any) => item.id);
 
-        if (unreadIds.length > 0) {
-          // 使用统一接口标记已读
-          messageService.markAsRead('comment', unreadIds).catch(e => {
+        if (allCommentIds.length > 0) {
+          // 使用统一接口标记已读，传入所有评论ID
+          messageService.markAsRead('comment', allCommentIds).catch(e => {
             console.error("标记评论已读失败:", e);
           });
         }
@@ -217,6 +215,15 @@ const CommentReply = () => {
         }));
 
         setCommentList(mappedList);
+
+        // 获取所有评论ID列表并标记已读（传入所有ID）
+        const allCommentIds = res.data.rows.map((item: any) => item.id);
+
+        if (allCommentIds.length > 0) {
+          messageService.markAsRead('comment', allCommentIds).catch(e => {
+            console.error("标记评论已读失败:", e);
+          });
+        }
       }
     } catch (e) {
       Taro.showToast({

src/other_pages/new_follow/index.tsx

@@ -56,14 +56,12 @@ const NewFollow = () => {
 
         setFollowList(mappedList);
 
-        // 获取未读关注ID并标记已读
-        const unreadFanIds = res.list
-          .filter((item: any) => item.is_read === 0)
-          .map((item: any) => item.id);
+        // 获取所有关注者ID列表并标记已读（传入所有ID，包括已读和未读）
+        const allFanIds = res.list.map((item: any) => item.id);
 
-        if (unreadFanIds.length > 0) {
-          // 使用统一接口标记已读
-          messageService.markAsRead('follow', unreadFanIds).catch(e => {
+        if (allFanIds.length > 0) {
+          // 使用统一接口标记已读，传入所有关注者ID
+          messageService.markAsRead('follow', allFanIds).catch(e => {
             console.error("标记关注已读失败:", e);
           });
         }
@@ -164,6 +162,15 @@ const NewFollow = () => {
         }));
         
         setFollowList(mappedList);
+
+        // 获取所有关注者ID列表并标记已读（传入所有ID）
+        const allFanIds = res.list.map((item: any) => item.id);
+
+        if (allFanIds.length > 0) {
+          messageService.markAsRead('follow', allFanIds).catch(e => {
+            console.error("标记关注已读失败:", e);
+          });
+        }
       } else {
         // 如果没有数据，设置为空数组以显示空状态
         setFollowList([]);

src/other_pages/ntrp-evaluate/index.module.scss

@@ -146,8 +146,22 @@
 .introContainer {
   width: 100vw;
   height: 100vh;
-  background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
-    #fafafa;
+  background-size: cover;
+  background-repeat: no-repeat;
+  position: relative;
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
+      #fafafa;
+    z-index: -1;
+    pointer-events: none;
+  }
 
   .result {
     .avatarWrap {
@@ -235,6 +249,8 @@
         height: 52px;
         border-radius: 16px;
         border: 1px solid rgba(0, 0, 0, 0.06);
+        background: #fff;
+        box-shadow: 0 8px 64px 0 rgba(0, 0, 0, 0.1);
         overflow: hidden;
         position: relative;
 
@@ -258,6 +274,16 @@
             font-style: normal;
             font-weight: 600;
             line-height: normal;
+
+            &.primary {
+              color: #fff;
+              background: #000;
+
+              .arrowImage {
+                width: 20px;
+                height: 20px;
+              }
+            }
           }
         }
 
@@ -363,8 +389,23 @@
 .testContainer {
   width: 100vw;
   height: 100vh;
-  background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
-    #fafafa;
+  background-repeat: no-repeat;
+  background-size: cover;
+  background-position: center;
+  position: relative;
+
+  &::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background: radial-gradient(227.15% 100% at 50% 0%, #bfffef 0%, #fff 36.58%),
+      #fafafa;
+    z-index: -1;
+    pointer-events: none;
+  }
 
   .bar {
     margin: 12px 20px 36px;

src/other_pages/ntrp-evaluate/index.tsx

@@ -223,7 +223,12 @@ function Intro() {
   }
 
   return (
-    <View className={styles.introContainer}>
+    <View
+      className={styles.introContainer}
+      style={{
+        backgroundImage: `url(${OSS_BASE_URL}/images/215f1ce1-be52-4a92-8250-5a4a69e7f2b3.png)`,
+      }}
+    >
       <CommonGuideBar />
       {ntrpData?.has_test_record ? (
         <View className={styles.result}>
@@ -271,7 +276,7 @@ function Intro() {
             </View>
           </View>
           <View className={styles.actions}>
-            <View className={styles.buttonWrap}>
+            <View className={classnames(styles.buttonWrap, styles.customBtn)}>
               <Button
                 className={classnames(styles.button, styles.primary)}
                 type="primary"
@@ -280,6 +285,12 @@ function Intro() {
                 <Text>再次测试</Text>
                 <Image className={styles.arrowImage} src={ArrowRight} />
               </Button>
+              <View
+                className={classnames(styles.customBtnCover, styles.primary)}
+              >
+                <Text>再次测试</Text>
+                <Image className={styles.arrowImage} src={ArrowRight} />
+              </View>
             </View>
             <View className={classnames(styles.buttonWrap, styles.customBtn)}>
               <Button
@@ -414,7 +425,12 @@ function Test() {
     return "";
   }
   return (
-    <View className={styles.testContainer}>
+    <View
+      className={styles.testContainer}
+      style={{
+        backgroundImage: `url(${OSS_BASE_URL}/images/215f1ce1-be52-4a92-8250-5a4a69e7f2b3.png)`,
+      }}
+    >
       <CommonGuideBar confirm title={`${index + 1} / ${questions.length}`} />
       <View className={styles.bar}>
         <View

src/publish_pages/publishBall/components/SelectStadium/SelectStadium.scss

@@ -9,7 +9,7 @@
   flex-direction: column;
   overflow: hidden;
   padding-bottom: env(safe-area-inset-bottom);
- 
+  box-sizing: border-box;
   // 搜索区域
   .search-section {
     background: #f5f5f5;

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

@@ -106,8 +106,15 @@ const SelectStadium: React.FC<SelectStadiumProps> = ({
         })
         setShowDetail(true)
       },
-      fail: (err) => {
+      fail: (err: { errMsg: string }) => {
         console.error('选择位置失败:', err)
+        const { errMsg } = err || {};
+        if (!errMsg.includes('fail cancel')) {
+          Taro.showToast({
+            title: errMsg,
+            icon: "none",
+          });
+        }
       }
     })
   }

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

@@ -145,12 +145,15 @@ const StadiumDetail = forwardRef<StadiumDetailRef, StadiumDetailProps>(({
           istance: null
         })
       },
-      fail: (err) => {
+      fail: (err: { errMsg: string }) => {
         console.error('选择位置失败:', err)
-        Taro.showToast({
-          title: '位置选择失败',
-          icon: 'error'
-        })
+        const { errMsg } = err || {};
+        if (!errMsg.includes('fail cancel')) {
+          Taro.showToast({
+            title: errMsg,
+            icon: "none",
+          });
+        }
       }
     })
   }

src/publish_pages/publishBall/index.config.ts

@@ -1,3 +1,5 @@
 export default definePageConfig({
-  navigationStyle: 'custom'
-}) 
+  navigationStyle: 'custom',
+  // 禁止原生页面滚动，改用内部自定义滚动容器，避免顶部/底部回弹后中间无法继续滚动的问题
+  disableScroll: true,
+})

src/publish_pages/publishBall/index.tsx

@@ -85,6 +85,7 @@ const PublishBall: React.FC = () => {
     defaultFormData,
   ]);
   const [checked, setChecked] = useState(true);
+  const [publishLoading, setPublishLoading] = useState(false);
   const [titleBar, setTitleBar] = useState("发布球局");
   // 控制是否响应全局键盘（由具体输入框 focus/blur 控制）
   const [shouldReactToKeyboard, setShouldReactToKeyboard] = useState(false);
@@ -372,9 +373,10 @@ const PublishBall: React.FC = () => {
     const { republish } = params || {};
     if (activityType === "individual") {
       const isValid = validateFormData(formData[0]);
-      if (!isValid) {
+      if (!isValid || publishLoading) {
         return;
       }
+      setPublishLoading(true);
       const {
         activityInfo,
         descriptionInfo,
@@ -435,13 +437,15 @@ const PublishBall: React.FC = () => {
           title: res.message,
           icon: "none",
         });
+        setPublishLoading(false);
       }
     }
     if (activityType === "group") {
       const isValid = formData.every((item) => validateFormData(item));
-      if (!isValid) {
+      if (!isValid || publishLoading) {
         return;
       }
+      setPublishLoading(true);
       if (checkAdjacentDataSame(formData)) {
         Taro.showToast({
           title: "信息不可与前序场完全一致",
@@ -505,6 +509,7 @@ const PublishBall: React.FC = () => {
           title: res.message,
           icon: "none",
         });
+        setPublishLoading(false);
       }
     }
   };

src/store/dictionaryStore.ts

@@ -14,6 +14,13 @@ interface DictionaryState {
   fetchDictionary: () => Promise<void>
   getDictionaryValue: (key: string, defaultValue?: any) => any
   clearDictionary: () => void
+  // banner 字典（单独管理，保持原始值）
+  bannerDict: {
+    bannerListImage: string
+    bannerDetailImage: string
+    bannerListIndex: string
+  } | null
+  fetchBannerDictionary: () => Promise<void>
 }
 
 // 创建字典Store
@@ -22,6 +29,7 @@ export const useDictionaryStore = create<DictionaryState>()((set, get) => ({
   dictionaryData: {},
   isLoading: false,
   error: null,
+  bannerDict: null,
 
   // 获取字典数据
   fetchDictionary: async () => {
@@ -56,6 +64,27 @@ export const useDictionaryStore = create<DictionaryState>()((set, get) => ({
     }
   },
 
+  // 获取 Banner 字典（启动时或手动调用）
+  fetchBannerDictionary: async () => {
+    try {
+      const keys = 'bannerListImage,bannerDetailImage,bannerListIndex';
+      const response = await commonApi.getDictionaryManyKey(keys)
+      if (response.code === 0 && response.data) {
+        const data = response.data || {};
+        set({
+          bannerDict: {
+            bannerListImage: data.bannerListImage || '',
+            bannerDetailImage: data.bannerDetailImage || '',
+            bannerListIndex: (data.bannerListIndex ?? '').toString(),
+          }
+        })
+      }
+    } catch (error) {
+      // 保持静默，避免影响启动流程
+      console.error('获取 Banner 字典失败:', error)
+    }
+  },
+
   // 获取字典值
   getDictionaryValue: (key: string, defaultValue?: any) => {
     const { dictionaryData } = get()

src/store/listStore.ts

@@ -11,6 +11,8 @@ import {
   getCityQrCode,
   getDistricts,
 } from "../services/listApi";
+// 不再在这里请求 banner 字典，统一由 dictionaryStore 启动时获取
+import { useDictionaryStore } from "./dictionaryStore";
 import {
   ListActions,
   IFilterOptions,
@@ -18,6 +20,26 @@ import {
   IPayload,
 } from "../../types/list/types";
 
+// 将 banner 按索引插入到列表的工具方法（0基；长度不足则插末尾；先移除已存在的 banner）
+function insertBannersToRows(rows: any[], dictData: any) {
+  if (!Array.isArray(rows) || !dictData) return rows;
+  const img = (dictData?.bannerListImage || "").trim();
+  const indexRaw = (dictData?.bannerListIndex || "").toString().trim();
+  if (!img) return rows;
+  const parsed = parseInt(indexRaw, 10);
+  const normalized = Number.isFinite(parsed) ? parsed : 0;
+  // 先移除已有的 banner，确保列表中仅一条 banner
+  const resultRows = rows?.filter((item) => item?.type !== "banner") || [];
+  const target = Math.max(0, Math.min(normalized, resultRows.length));
+  resultRows.splice(target, 0, {
+    type: "banner",
+    id: `banner-${target}`,
+    banner_image_url: img,
+    banner_detail_url: (dictData?.bannerDetailImage || "").trim(),
+  } as any);
+  return resultRows;
+}
+
 function translateCityData(dataTree) {
   return dataTree.map((item) => {
     const { children, ...rest } = item;
@@ -250,10 +272,14 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     const currentPageState = state.isSearchResult ? state.searchPageState : state.listPageState;
     const currentData = currentPageState?.data || [];
     const newData = isAppend ? [...currentData, ...(data || [])] : (data || []);
+    // 从字典缓存获取 banner，并将其插入到最终列表指定位置（全局索引）
+    const dictData = useDictionaryStore.getState().bannerDict;
+    const processedData = dictData ? insertBannersToRows(newData, dictData) : newData;
     state.updateCurrentPageState({
-      data: newData,
+      data: processedData,
       isHasMoreData,
-      isShowNoData: newData?.length === 0,
+      // 使用插入后的最终数据判断是否显示空状态，避免有 banner 时仍显示空
+      isShowNoData: processedData?.length === 0,
     });
 
     set({
@@ -296,7 +322,9 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         }
       }
 
-      const resData = (await fetchFn(reqParams)) || {};
+      let resData: any = {};
+      resData = (await fetchFn(reqParams)) || {};
+
       const { data = {}, code } = resData;
       if (code !== 0) {
         setListData({
@@ -308,7 +336,9 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         });
         return Promise.reject(new Error('获取数据失败'));
       }
-      const { count, rows } = data;
+      const { count } = data;
+      let { rows } = data as any;
+
       setListData({
         error: '',
         data: rows || [],
@@ -319,7 +349,7 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       return Promise.resolve();
     } catch (error) {
       setListData({
-        error: "-1",
+        error: "",
         data: [],
         loading: false,
         count: 0,
@@ -345,23 +375,24 @@ export const useListStore = create<TennisStore>()((set, get) => ({
     try {
       const searchParams = getSearchParams() || {};
       
-      // 调用常规列表接口
-      const listParams = {
-        ...searchParams,
-        order: searchParams.order || "distance",
-      };
-      const listRes = await getGamesList(listParams);
-      
-      // 调用智能排序列表接口
-      const integrateParams = {
-        ...searchParams,
-        order: "",
-        seachOption: {
-          ...searchParams.seachOption,
-          isRefresh: true,
-        },
-      };
-      const integrateRes = await getGamesIntegrateList(integrateParams);
+      // 并发请求：常规列表、智能排序列表
+      const [listResSettled, integrateResSettled] = await Promise.allSettled([
+        getGamesList({
+          ...searchParams,
+          order: searchParams.order || "distance",
+        }),
+        getGamesIntegrateList({
+          ...searchParams,
+          order: "",
+          seachOption: {
+            ...searchParams.seachOption,
+            isRefresh: true,
+          },
+        }),
+      ]);
+
+      const listRes = listResSettled.status === "fulfilled" ? listResSettled.value : null;
+      const integrateRes = integrateResSettled.status === "fulfilled" ? integrateResSettled.value : null;
 
       // 根据当前排序方式更新对应的数据
       const currentPageState = state.isSearchResult ? state.searchPageState : state.listPageState;
@@ -369,7 +400,8 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       const isIntegrate = distanceQuickFilter?.order === "0";
 
       if (listRes?.code === 0 && listRes?.data) {
-        const { count, rows } = listRes.data;
+        const { count } = listRes.data;
+        let { rows } = listRes.data as any;
         if (!isIntegrate) {
           // 如果当前是常规排序，更新常规列表数据
           setListData({
@@ -383,7 +415,8 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       }
 
       if (integrateRes?.code === 0 && integrateRes?.data) {
-        const { count, rows, recommendList } = integrateRes.data;
+        const { count } = integrateRes.data;
+        let { rows, recommendList } = integrateRes.data as any;
         if (isIntegrate) {
           // 如果当前是智能排序，更新智能排序列表数据
           setListData({

src/user_pages/downloadBill/index.tsx

@@ -275,10 +275,7 @@ const DownloadBill: React.FC = () => {
           Taro.navigateBack();
         }}
       />
-      <View 
-        className="hint_content"
-        style={{ marginTop: `${totalHeight}px` }}
-      >
+      <View className="hint_content" style={{ marginTop: `147px` }}>
         <Text>最长可导出三个月的账单 </Text>
         <Text className="button_text" onClick={downloadExample}>
           示例文件
@@ -322,8 +319,9 @@ const DownloadBill: React.FC = () => {
               近一周
             </View>
             <View
-              className={`option_button ${dateType === "month" ? "active" : ""
-                }`}
+              className={`option_button ${
+                dateType === "month" ? "active" : ""
+              }`}
               onClick={() => {
                 selectDateRange("month");
               }}
@@ -331,8 +329,9 @@ const DownloadBill: React.FC = () => {
               近一月
             </View>
             <View
-              className={`option_button ${dateType === "custom" ? "active" : ""
-                }`}
+              className={`option_button ${
+                dateType === "custom" ? "active" : ""
+              }`}
               onClick={() => {
                 selectDateRange("custom");
               }}

src/user_pages/setTransactionPassword/index.scss

@@ -76,7 +76,7 @@
   }
 
   .btn {
-    width: 78px;
+    width: 90px;
     height: 24px;
     border: 1px solid rgba(0, 0, 0, 0.06);
     display: flex;

src/user_pages/validPhone/index.scss

@@ -64,7 +64,7 @@
   }
 
   .btn {
-    width: 78px;
+    width: 90px;
     height: 24px;
     border: 1px solid rgba(0, 0, 0, 0.06);
     display: flex;