增加banneer占位图

src/store/listStore.ts

@@ -11,6 +11,7 @@ import {
   getCityQrCode,
   getDistricts,
 } from "../services/listApi";
+import commonApi from "../services/commonApi";
 import {
   ListActions,
   IFilterOptions,
@@ -18,6 +19,27 @@ import {
   IPayload,
 } from "../../types/list/types";
 
+// 将 banner 按索引插入到 rows 的工具方法
+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];
+  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;
@@ -296,7 +318,31 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         }
       }
 
-      const resData = (await fetchFn(reqParams)) || {};
+      // 并发请求：列表接口 + 字典接口（仅第一页且非追加时插入 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)) || {};
+      }
+
       const { data = {}, code } = resData;
       if (code !== 0) {
         setListData({
@@ -308,7 +354,14 @@ export const useListStore = create<TennisStore>()((set, get) => ({
         });
         return Promise.reject(new Error('获取数据失败'));
       }
-      const { count, rows } = data;
+      const { count } = data;
+      let { rows } = data as any;
+
+      // 将 banner 插入到指定位置（仅第一页且非追加）
+      if (shouldInsertBanner && Array.isArray(rows) && dictData) {
+        rows = insertBannersToRows(rows, dictData);
+      }
+
       setListData({
         error: '',
         data: rows || [],
@@ -344,24 +397,30 @@ export const useListStore = create<TennisStore>()((set, get) => ({
 
     try {
       const searchParams = getSearchParams() || {};
+      const keys = "bannerListImage,bannerDetailImage,bannerListIndex";
       
-      // 调用常规列表接口
-      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, dictSettled] = await Promise.allSettled([
+        getGamesList({
+          ...searchParams,
+          order: searchParams.order || "distance",
+        }),
+        getGamesIntegrateList({
+          ...searchParams,
+          order: "",
+          seachOption: {
+            ...searchParams.seachOption,
+            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;
@@ -369,7 +428,12 @@ 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;
+        // 插入 banner（当为第一页时）
+        if ((currentPageState?.pageOption?.page || 1) === 1 && Array.isArray(rows) && dictData) {
+          rows = insertBannersToRows(rows, dictData);
+        }
         if (!isIntegrate) {
           // 如果当前是常规排序，更新常规列表数据
           setListData({
@@ -383,7 +447,12 @@ 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;
+        // 插入 banner（当为第一页时）
+        if ((currentPageState?.pageOption?.page || 1) === 1 && Array.isArray(rows) && dictData) {
+          rows = insertBannersToRows(rows, dictData);
+        }
         if (isIntegrate) {
           // 如果当前是智能排序，更新智能排序列表数据
           setListData({