fix

src/app.tsx

@@ -22,7 +22,7 @@ export async function getInitialState(): Promise<{
   loading?: boolean;
   menuType: "distributor" | "miniApp",
   navTheme?: "2" | "3",
-  selectApp?: { appId: string, id: string, appName: string, appType: number } | null,
+  selectApp?: { appId: string, id: string, appName: string, appType: number, appCategory: 1 | 2 } | null,
   token: any,
 }> {
   // 如果不是登录页面，执行
@@ -97,13 +97,13 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
       hasHandledCode300 = false
       // const { location } = history;
       // // 在小程序页面禁止用户点击回退按钮返回分享页面
-      if(sessionStorage.getItem("menuType") == 'miniApp' && location?.pathname?.match(/^\/distributor/)){
-        console.log("miniApp",location)
+      if (sessionStorage.getItem("menuType") == 'miniApp' && location?.pathname?.match(/^\/distributor/)) {
+        console.log("miniApp", location)
         history.replace('/miniApp');
       }
       // 在分销平台首页禁止用户点击回退按钮返回到小程序页面
-      if(sessionStorage.getItem("menuType")=='distributor' && location?.pathname?.match(/^\/miniApp/)){
-        console.log("distributor",location)
+      if (sessionStorage.getItem("menuType") == 'distributor' && location?.pathname?.match(/^\/miniApp/)) {
+        console.log("distributor", location)
         history.replace('/distributor');
       }
       // 如果没有登录，重定向到 login

src/pages/Distributor/DyMiniApp/tableConfig.tsx

@@ -51,7 +51,7 @@ export const columns = (): ProColumns<any>[] => {
             valueType: 'option',
             align: "center",
             render: (_, record) => {
-                return <MenuChange menuType="miniApp" data={{ ...record, appType: record?.appCategory || 2 }}><a type='primary'>管理</a></MenuChange>
+                return <MenuChange menuType="miniApp" data={{ ...record, appType: 2 }}><a type='primary'>管理</a></MenuChange>
             },
         },
     ];

src/pages/Distributor/WxMiniApp/tableConfig.tsx

@@ -50,7 +50,7 @@ export const columns = (): ProColumns<any>[] => {
             valueType: 'option',
             align: "center",
             render: (_, record) => {
-                return <MenuChange menuType="miniApp" data={{ ...record, appType:record?.appCategory || 1}}><a type='primary'>管理</a></MenuChange>
+                return <MenuChange menuType="miniApp" data={{ ...record, appType:1}}><a type='primary'>管理</a></MenuChange>
             },
         },
     ];

src/pages/MiniApp/BookManage/index.tsx

@@ -6,6 +6,6 @@ function Index() {
         selectApp: model.initialState?.selectApp
     }))
     // 临时条件后期从selectApp中获取参数判断小程序是长篇还是短篇
-    return selectApp?.id % 2 !== 0 ? <LongPage /> : <ShortPage />
+    return selectApp?.appCategory === 1? <LongPage /> : <ShortPage />
 }
 export default Index

src/pages/MiniApp/Consume/index.tsx

@@ -1,8 +1,9 @@
 import { PageContainer, ProTable } from "@ant-design/pro-components"
 import { columns } from "./tableConfig"
 import { useAjax } from "@/Hook/useAjax"
-import { bookCoinList } from "@/services/miniApp/consume"
+import { shortBookCoinList, longBookCoinList } from "@/services/miniApp/consume"
 import { useModel } from "@umijs/max"
+import { useMemo } from "react"
 
 const Page: React.FC = () => {
     let { initialState } = useModel("@@initialState")
@@ -11,7 +12,12 @@ const Page: React.FC = () => {
             enumList: global.state.enumList
         }
     })
-    let getList = useAjax((params) => bookCoinList(params), { type: 'table' })
+    let getShortList = useAjax((params) => shortBookCoinList(params), { type: 'table' })
+    let getLongList = useAjax((params) => longBookCoinList(params), { type: 'table' })
+
+    let api = useMemo(() => {
+        return initialState?.selectApp?.appCategory === 1 ? getLongList : getShortList
+    }, [initialState?.selectApp?.appCategory])
     return <PageContainer
         tabProps={{ type: 'card' }}
     >
@@ -21,14 +27,14 @@ const Page: React.FC = () => {
                 distributorId: initialState?.currentUser?.distributorId,
                 appType: initialState?.selectApp?.appType || ""
             }}
-            scroll={{x:true,y:500}}
+            scroll={{ x: true, y: 500 }}
             headerTitle={"书币消耗列表"}
             rowKey={(r) => r.id}
             search={{
                 labelWidth: 120,
             }}
             request={async (params) => {
-                return await getList.run(params)
+                return await api.run(params)
             }}
             columns={columns(enumList)}
         // bordered

src/pages/MiniApp/Consume/tableConfig.tsx

@@ -19,12 +19,12 @@ export const columns = (enumList:any): ProColumns<any>[] => {
         },
         {
             title: "小说名称",
-            dataIndex: 'longBookName',
-            key: "longBookName",
+            dataIndex: 'bookInfo',
+            key: "bookInfo",
             align: "center",
             hideInSearch: true,
             render: (a, b) => {
-                return b?.longBookName || b?.shortBookName
+                return b?.bookInfo?.bookName || b?.bookInfo?.bookName
             },
         },
         {
@@ -34,7 +34,7 @@ export const columns = (enumList:any): ProColumns<any>[] => {
             align: "center",
             hideInSearch: true,
             render: (a, b) => {
-                return b?.longBookChapterName || b?.shortBookParagraphId
+                return b?.paragraphId || b?.chapterInfo?.chapterName
             },
         },
         {

src/pages/MiniApp/PayLog/index.tsx

@@ -6,6 +6,6 @@ function Index() {
         selectApp: model.initialState?.selectApp
     }))
     // 临时条件后期从selectApp中获取参数判断小程序是长篇还是短篇
-    return selectApp?.id % 2 !== 0 ? <LongPage /> : <ShortPage />
+    return selectApp?.appCategory === 1? <LongPage /> : <ShortPage />
 }
 export default Index

src/pages/MiniApp/ReadLog/Long/tableConfig.tsx

@@ -31,6 +31,9 @@ export const columns = (): ProColumns<any>[] => {
             key: "bookChapterName",
             hideInSearch: true,
             align: "center",
+            render:(a,b)=>{
+                return b?.chapterInfo?.chapterName
+            }
         },
         {
             title: "阅读时间",

src/pages/MiniApp/ReadLog/index.tsx

@@ -6,6 +6,6 @@ function Index() {
         selectApp: model.initialState?.selectApp
     }))
     // 临时条件后期从selectApp中获取参数判断小程序是长篇还是短篇
-    return selectApp?.id % 2 !== 0 ? <LongPage /> : <ShortPage />
+    return selectApp?.appCategory === 1? <LongPage /> : <ShortPage />
 }
 export default Index

src/services/miniApp/consume/index.tsx

@@ -13,9 +13,16 @@ export interface Params extends Page{
     endTime?:string,//结束时间
     changeType?:string,//书币变更类型（1：书币充值、2：参加活动获取、3：抽奖获取 、-1：阅读长篇小说消费、-2：阅读短篇小说消费）
 }
-/**获取分销商账号列表 */
-export async function bookCoinList(params:Params) {
-  return request(api+'/admin/bookCoin/list', {
+/**短篇小说书币消耗记录 */
+export async function shortBookCoinList(params:Params) {
+  return request(api+'/admin/shortBookCoinChangeLog/list', {
+    method: 'GET',
+    params
+  });
+}
+/**长篇小说书币消耗记录 */
+export async function longBookCoinList(params:Params) {
+  return request(api+'/admin/longBookCoinChangeLog/list', {
     method: 'GET',
     params
   });