优化banner逻辑

src/store/listStore.ts

@@ -11,7 +11,8 @@ import {
   getCityQrCode,
   getDistricts,
 } from "../services/listApi";
-import commonApi from "../services/commonApi";
+// 不再在这里请求 banner 字典，统一由 dictionaryStore 启动时获取
+import { useDictionaryStore } from "./dictionaryStore";
 import {
   ListActions,
   IFilterOptions,
@@ -19,17 +20,16 @@ import {
   IPayload,
 } from "../../types/list/types";
 
-// 将 banner 按索引插入到 rows 的工具方法
+// 将 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;
-  // 固定采用 0 基索引
   const parsed = parseInt(indexRaw, 10);
   const normalized = Number.isFinite(parsed) ? parsed : 0;
-  const resultRows = [...rows];
+  // 先移除已有的 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",
@@ -272,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({
@@ -318,30 +322,8 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         }
       }
 
-      // 并发请求：列表接口 + 字典接口（仅第一页且非追加时插入 Banner）
-      const shouldInsertBanner = (currentPageState?.pageOption?.page || 1) === 1 && !isAppend;
-      const keys = "bannerListImage,bannerDetailImage,bannerListIndex";
       let resData: any = {};
-      let dictData: any = null;
-
-      if (shouldInsertBanner) {
-        const [listResult, dictResult] = await Promise.allSettled([
-          fetchFn(reqParams),
-          commonApi.getDictionaryManyKey(keys),
-        ]);
-        // 列表接口请求成功
-        if (listResult.status === "fulfilled") {
-          resData = listResult.value || {};
-        } else {
-          throw listResult.reason || new Error("获取数据失败");
-        }
-        // 字典接口请求成功
-        if (dictResult.status === "fulfilled" && (dictResult.value as any)?.code === 0) {
-          dictData = (dictResult.value as any)?.data || null;
-        }
-      } else {
-        resData = (await fetchFn(reqParams)) || {};
-      }
+      resData = (await fetchFn(reqParams)) || {};
 
       const { data = {}, code } = resData;
       if (code !== 0) {
@@ -357,11 +339,6 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       const { count } = data;
       let { rows } = data as any;
 
-      // 将 banner 插入到指定位置（仅第一页且非追加）
-      if (shouldInsertBanner && Array.isArray(rows) && dictData) {
-        rows = insertBannersToRows(rows, dictData);
-      }
-
       setListData({
         error: '',
         data: rows || [],
@@ -397,10 +374,9 @@ export const useListStore = create<TennisStore>()((set, get) => ({
 
     try {
       const searchParams = getSearchParams() || {};
-      const keys = "bannerListImage,bannerDetailImage,bannerListIndex";
       
-      // 并发请求：常规列表、智能排序列表、字典
-      const [listResSettled, integrateResSettled, dictSettled] = await Promise.allSettled([
+      // 并发请求：常规列表、智能排序列表
+      const [listResSettled, integrateResSettled] = await Promise.allSettled([
         getGamesList({
           ...searchParams,
           order: searchParams.order || "distance",
@@ -413,14 +389,10 @@ export const useListStore = create<TennisStore>()((set, get) => ({
             isRefresh: true,
           },
         }),
-        commonApi.getDictionaryManyKey(keys),
       ]);
 
       const listRes = listResSettled.status === "fulfilled" ? listResSettled.value : null;
       const integrateRes = integrateResSettled.status === "fulfilled" ? integrateResSettled.value : null;
-      const dictData = dictSettled.status === "fulfilled" && (dictSettled.value as any)?.code === 0
-        ? (dictSettled.value as any)?.data
-        : null;
 
       // 根据当前排序方式更新对应的数据
       const currentPageState = state.isSearchResult ? state.searchPageState : state.listPageState;
@@ -430,10 +402,6 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       if (listRes?.code === 0 && listRes?.data) {
         const { count } = listRes.data;
         let { rows } = listRes.data as any;
-        // 插入 banner（当为第一页时）
-        if ((currentPageState?.pageOption?.page || 1) === 1 && Array.isArray(rows) && dictData) {
-          rows = insertBannersToRows(rows, dictData);
-        }
         if (!isIntegrate) {
           // 如果当前是常规排序，更新常规列表数据
           setListData({
@@ -449,10 +417,6 @@ export const useListStore = create<TennisStore>()((set, get) => ({
       if (integrateRes?.code === 0 && integrateRes?.data) {
         const { count } = integrateRes.data;
         let { rows, recommendList } = integrateRes.data as any;
-        // 插入 banner（当为第一页时）
-        if ((currentPageState?.pageOption?.page || 1) === 1 && Array.isArray(rows) && dictData) {
-          rows = insertBannersToRows(rows, dictData);
-        }
         if (isIntegrate) {
           // 如果当前是智能排序，更新智能排序列表数据
           setListData({