fix

src/pages/book/bookManage/author/index.tsx

@@ -85,7 +85,7 @@ const Page: React.FC = () => {
         request={async (params) => {
           return await bookAuthorList.run(params);
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         toolBarRender={() => {
           return [
             <Button

src/pages/book/bookManage/bookTags/index.tsx

@@ -124,7 +124,7 @@ const Page: React.FC = () => {
         request={async (params) => {
           return await BookContentLabelList.run(params);
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         toolBarRender={() => {
           return [
             <Button

src/pages/book/bookManage/classifyList/index.tsx

@@ -102,7 +102,7 @@ const Page: React.FC = () => {
         search={{
           labelWidth: 120,
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         request={async (params) => {
           return await bookCategoryList.run(params);
         }}

src/pages/book/bookManage/longbookList/item.tsx

@@ -101,7 +101,7 @@ const Page: React.FC<Props> = (props) => {
             return await LongBookParagraphList.run(params);
           }
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         toolBarRender={() => {
           return [
             <Button

src/pages/book/bookManage/shortbookList/item.tsx

@@ -96,7 +96,7 @@ const Page: React.FC<Props> = (props) => {
         rowKey={(r) => r.id}
         search={false}
         params={{ bookId: data?.id }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         request={async (params) => {
           if (params.bookId) {
             return await ShortBookParagraphList.run(params);

src/pages/distribution/book/longBook/index.tsx

@@ -119,7 +119,7 @@ const Page: React.FC<Porps> = (props) => {
         request={async (params) => {
           return await BookInfoList.run(wechatAppId ? { ...params, appId: wechatAppId } : params);
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         columns={columns({
           authList: state?.authList,
           labelList: state.labelList,

src/pages/distribution/book/shortBook/index.tsx

@@ -121,7 +121,7 @@ const Page: React.FC<Porps> = (props) => {
         request={async (params) => {
           return await BookInfoList.run(wechatAppId ? { ...params, appId:wechatAppId } : params);
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         columns={columns({
           authList: state?.authList,
           labelList: state.labelList,

src/pages/distribution/distributor/info/item.tsx

@@ -122,7 +122,7 @@ const Page: React.FC<Props> = (props) => {
         search={{
           labelWidth: 120,
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         params={{ distributorId: data?.id }}
         request={async (params) => {
           if (params.distributorId) {

src/pages/distribution/miniprogram/mimiModule/index.tsx

@@ -96,7 +96,7 @@ const Page = forwardRef((props: any, ref?: any) =>{
         actionRef={actionRef}
         rowKey={(r) => r.id}
         search={false}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         dataSource={data}
         toolBarRender={false}
         columns={columns(closeForm, del, stateUpdata, state?.enumList)}

src/pages/distribution/miniprogram/pagesManage/index.tsx

@@ -71,7 +71,7 @@ const Page: React.FC = () => {
         request={async (params) => {
           return await appPageListApi.run(params);
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         toolBarRender={() => {
           return [
             <Button

src/pages/distribution/miniprogram/weChatInfo/index.tsx

@@ -133,7 +133,7 @@ const Page: React.FC = () => {
           labelWidth: 120,
           span: 5
         }}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         request={async (params) => {
           return await WxAppInfoPageList.run(params);
         }}

src/pages/distribution/orderLog/long/index.tsx

@@ -37,7 +37,7 @@ const Page: React.FC = () => {
           return await LongBookOrderListOfPage.run(params);
         }}
         columns={columns()}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         // bordered
       />
     </PageContainer>

src/pages/distribution/orderLog/long/tableConfig.tsx

@@ -1,5 +1,6 @@
 import { ProColumns } from '@ant-design/pro-components';
 import { useModel } from '@umijs/max';
+import { Space } from 'antd';
 
 export const columns = (): ProColumns<any>[] => {
   let { getEnum } = useModel('global')
@@ -8,10 +9,9 @@ export const columns = (): ProColumns<any>[] => {
       title: 'openId',
       dataIndex: 'openId',
       align: 'center',
-      width: 70,
       ellipsis: true,
       render: (_, row) => {
-        return row?.wechatMiniappUser?.openId
+        return row?.wechatMiniappUser?.openId || "-"
       }
     },
     {
@@ -19,17 +19,15 @@ export const columns = (): ProColumns<any>[] => {
       dataIndex: 'bookName',
       key: 'bookName',
       align: 'center',
-      width: 150,
       ellipsis: true,
       render: (a, b) => {
-        return b?.bookInfo?.bookName;
+        return b?.bookInfo?.bookName || "-"
       },
     },
     {
       title: '应用名称',
       dataIndex: 'appName',
       key: 'appName',
-      width: 120,
       align: 'center',
       ellipsis: true,
       render: (a, b) => {
@@ -40,7 +38,6 @@ export const columns = (): ProColumns<any>[] => {
       title: '分销商名称',
       dataIndex: 'companyName',
       key: 'companyName',
-      width: 120,
       align: 'center',
       ellipsis: true,
       render: (a, b) => {
@@ -50,29 +47,25 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '订单号',
       dataIndex: 'orderNo',
-      width: 170,
       align: 'center',
       ellipsis: true,
     },
     {
       title: '商户订单号',
       dataIndex: 'merchantOrderId',
-      width: 170,
       align: 'center',
       ellipsis: true,
     },
     {
       title: '订单类型',
       dataIndex: 'orderType',
-      width: 170,
       align: 'center',
       ellipsis: true,
-      valueEnum:getEnum("ORDER_TYPE","map")
+      valueEnum: getEnum("ORDER_TYPE", "map")
     },
     {
       title: '充值金额',
       dataIndex: 'amount',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -80,7 +73,6 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '实际支付金额',
       dataIndex: 'payAmount',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -88,16 +80,14 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '支付渠道',
       dataIndex: 'payChannel',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
-      valueEnum:getEnum("PAY_CHANNEL","map")
+      valueEnum: getEnum("PAY_CHANNEL", "map")
     },
     {
       title: '支付状态',
       dataIndex: 'orderStatus',
-      width: 170,
       align: 'center',
       ellipsis: true,
       valueEnum: getEnum("ORDER_STATUS", "stateObj", { "2": "success", "1": "processing", "3": "warning", "-2": "error", " -1": "default" })
@@ -105,14 +95,12 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '支付场景',
       dataIndex: 'orderCondition',
-      width: 170,
       align: 'center',
       ellipsis: true,
     },
     {
       title: '下单时间',
       dataIndex: 'orderTime',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -120,15 +108,42 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '支付时间',
       dataIndex: 'payTime',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
     },
+    {
+      title: "充值次数",
+      dataIndex: 'chargeNum',
+      key: "chargeNum",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+        return row?.wechatMiniappUser?.chargeNum
+      }
+    },
+    {
+      title: "上报金额",
+      dataIndex: 'backMoney',
+      key: "backMoney",
+      hideInSearch: true,
+      align: "center",
+    },
+    {
+      title: "上报状态",
+      dataIndex: 'backStatus',
+      key: "backStatus",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+        let obj = getEnum("BACK_STATUS", "stateObj", { "0": 'default', "-1": "error", "1": "processing", "2": "success", "3": "warning" })
+        let isShowBtn = [1, -1].includes(row?.backStatus)
+        return <Space>{obj[row.backStatus]?.text}{isShowBtn}</Space>
+      }
+    },
     {
       title: '归因渠道',
       dataIndex: 'userChannel',
-      width: 170,
       align: 'center',
       ellipsis: true,
       valueType: 'select',
@@ -138,6 +153,25 @@ export const columns = (): ProColumns<any>[] => {
         return str
       }
     },
+    {
+      title: '渠道名称',
+      dataIndex: 'userSource',
+      align: 'center',
+      ellipsis: true,
+      render: (_, row) => {
+          return row?.wechatMiniappUser?.userSource
+      }
+  },
+  {
+      title: "用户注册时间",
+      dataIndex: 'createTime',
+      key: "createTime",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+          return row?.wechatMiniappUser?.createTime
+      }
+  },
     // 搜索
     {
       title: '支付金额',

src/pages/distribution/orderLog/short/index.tsx

@@ -37,8 +37,8 @@ const Page: React.FC = () => {
           return await ShortBookOrderListOfPage.run(params);
         }}
         columns={columns()}
-        scroll={{ x: 'auto' }}
-        // bordered
+        scroll={{ x: 'max-content' }}
+      // bordered
       />
     </PageContainer>
   );

src/pages/distribution/orderLog/short/tableConfig.tsx

@@ -1,5 +1,6 @@
 import { ProColumns } from '@ant-design/pro-components';
 import { useModel } from '@umijs/max';
+import { Space } from 'antd';
 
 export const columns = (): ProColumns<any>[] => {
   let { getEnum } = useModel('global')
@@ -8,10 +9,9 @@ export const columns = (): ProColumns<any>[] => {
       title: 'openId',
       dataIndex: 'openId',
       align: 'center',
-      width: 70,
       ellipsis: true,
       render: (_, row) => {
-        return row?.wechatMiniappUser?.openId
+        return row?.wechatMiniappUser?.openId || "-"
       }
     },
     {
@@ -19,17 +19,15 @@ export const columns = (): ProColumns<any>[] => {
       dataIndex: 'bookName',
       key: 'bookName',
       align: 'center',
-      width: 150,
       ellipsis: true,
       render: (a, b) => {
-        return b?.bookInfo?.bookName;
+        return b?.bookInfo?.bookName || "-"
       },
     },
     {
       title: '应用名称',
       dataIndex: 'appName',
       key: 'appName',
-      width: 120,
       align: 'center',
       ellipsis: true,
       render: (a, b) => {
@@ -40,7 +38,6 @@ export const columns = (): ProColumns<any>[] => {
       title: '分销商名称',
       dataIndex: 'companyName',
       key: 'companyName',
-      width: 120,
       align: 'center',
       ellipsis: true,
       render: (a, b) => {
@@ -50,21 +47,18 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '订单号',
       dataIndex: 'orderNo',
-      width: 170,
       align: 'center',
       ellipsis: true,
     },
     {
       title: '商户订单号',
       dataIndex: 'merchantOrderId',
-      width: 170,
       align: 'center',
       ellipsis: true,
     },
     {
       title: '订单类型',
       dataIndex: 'orderType',
-      width: 170,
       align: 'center',
       ellipsis: true,
       valueEnum: getEnum("ORDER_TYPE", "map")
@@ -72,7 +66,6 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '充值金额',
       dataIndex: 'amount',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -80,7 +73,6 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '实际支付金额',
       dataIndex: 'payAmount',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -88,7 +80,6 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '支付渠道',
       dataIndex: 'payChannel',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -97,7 +88,6 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '支付状态',
       dataIndex: 'orderStatus',
-      width: 170,
       align: 'center',
       ellipsis: true,
       valueEnum: getEnum("ORDER_STATUS", "stateObj", { "2": "success", "1": "processing", "3": "warning", "-2": "error", " -1": "default" })
@@ -105,14 +95,12 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '支付场景',
       dataIndex: 'orderCondition',
-      width: 170,
       align: 'center',
       ellipsis: true,
     },
     {
       title: '下单时间',
       dataIndex: 'orderTime',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -120,15 +108,42 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '支付时间',
       dataIndex: 'payTime',
-      width: 170,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
     },
+    {
+      title: "充值次数",
+      dataIndex: 'chargeNum',
+      key: "chargeNum",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+        return row?.wechatMiniappUser?.chargeNum
+      }
+    },
+    {
+      title: "上报金额",
+      dataIndex: 'backMoney',
+      key: "backMoney",
+      hideInSearch: true,
+      align: "center",
+    },
+    {
+      title: "上报状态",
+      dataIndex: 'backStatus',
+      key: "backStatus",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+        let obj = getEnum("BACK_STATUS", "stateObj", { "0": 'default', "-1": "error", "1": "processing", "2": "success", "3": "warning" })
+        let isShowBtn = [1, -1].includes(row?.backStatus)
+        return <Space>{obj[row.backStatus]?.text}{isShowBtn}</Space>
+      }
+    },
     {
       title: '归因渠道',
       dataIndex: 'userChannel',
-      width: 170,
       align: 'center',
       ellipsis: true,
       valueType: 'select',
@@ -138,6 +153,25 @@ export const columns = (): ProColumns<any>[] => {
         return str
       }
     },
+    {
+      title: '渠道名称',
+      dataIndex: 'userSource',
+      align: 'center',
+      ellipsis: true,
+      render: (_, row) => {
+          return row?.wechatMiniappUser?.userSource
+      }
+  },
+  {
+      title: "用户注册时间",
+      dataIndex: 'createTime',
+      key: "createTime",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+          return row?.wechatMiniappUser?.createTime
+      }
+  },
     // 搜索
     {
       title: '支付金额',

src/pages/distribution/payLog/long/index.tsx

@@ -32,8 +32,8 @@ const Page: React.FC = () => {
           return await LongBookCoinChangeLogOfPage.run(params);
         }}
         columns={columns()}
-        scroll={{ x: 'auto' }}
-        // bordered
+       scroll={{ x: 'max-content' }}
+      // bordered
       />
     </PageContainer>
   );

src/pages/distribution/payLog/long/tableConfig.tsx

@@ -11,7 +11,7 @@ export const columns = (): ProColumns<any>[] => {
       width: 70,
       ellipsis: true,
       render: (_, row) => {
-        return row?.wechatMiniappUser?.openId
+        return row?.wechatMiniappUser?.openId || "-"
       }
     },
     {
@@ -22,7 +22,16 @@ export const columns = (): ProColumns<any>[] => {
       width: 150,
       ellipsis: true,
       render: (a, b) => {
-        return b?.bookInfo?.bookName;
+        return b?.bookInfo?.bookName || "-"
+      },
+    },
+    {
+      title: "作者笔名",
+      dataIndex: 'authorName',
+      key: "authorName",
+      align: "center",
+      render: (a, b) => {
+        return b?.bookInfo?.authorInfo?.authorName || "-"
       },
     },
     {
@@ -33,7 +42,7 @@ export const columns = (): ProColumns<any>[] => {
       ellipsis: true,
       hideInSearch: true,
       render: (a, b) => {
-        return b?.chapterInfo?.chapterName;
+        return b?.chapterInfo?.chapterName|| "-"
       },
     },
     {
@@ -64,7 +73,7 @@ export const columns = (): ProColumns<any>[] => {
       width: 120,
       align: 'center',
       ellipsis: true,
-      valueEnum:getEnum("CHANGE_TYPE","map")
+      valueEnum: getEnum("CHANGE_TYPE", "map")
     },
     {
       title: '变更数量',
@@ -90,6 +99,16 @@ export const columns = (): ProColumns<any>[] => {
       ellipsis: true,
       hideInSearch: true,
     },
+    {
+      title: "用户注册时间",
+      dataIndex: 'createTime',
+      key: "createTime",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+        return row?.wechatMiniappUser?.createTime
+      }
+    },
     //搜索
     {
       title: '变更时间',

src/pages/distribution/payLog/short/index.tsx

@@ -32,7 +32,7 @@ const Page: React.FC = () => {
           return await ShortBookCoinChangeLogOfPage.run(params);
         }}
         columns={columns()}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         // bordered
       />
     </PageContainer>

src/pages/distribution/payLog/short/tableConfig.tsx

@@ -8,10 +8,9 @@ export const columns = (): ProColumns<any>[] => {
       title: 'openId',
       dataIndex: 'openId',
       align: 'center',
-      width: 70,
       ellipsis: true,
       render: (_, row) => {
-        return row?.wechatMiniappUser?.openId
+        return row?.wechatMiniappUser?.openId || "-"
       }
     },
     {
@@ -19,17 +18,24 @@ export const columns = (): ProColumns<any>[] => {
       dataIndex: 'bookName',
       key: 'bookName',
       align: 'center',
-      width: 150,
       ellipsis: true,
       render: (a, b) => {
-        return b?.bookInfo?.bookName;
+        return b?.bookInfo?.bookName || "-";
+      },
+    },
+    {
+      title: "作者笔名",
+      dataIndex: 'authorName',
+      key: "authorName",
+      align: "center",
+      render: (a, b) => {
+        return b?.bookInfo?.authorInfo?.authorName || "-"
       },
     },
     {
       title: '短篇小说-段落',
       dataIndex: 'paragraphId',
       align: 'center',
-      width: 150,
       ellipsis: true,
       hideInSearch: true,
     },
@@ -37,7 +43,6 @@ export const columns = (): ProColumns<any>[] => {
       title: '应用名称',
       dataIndex: 'appName',
       key: 'appName',
-      width: 120,
       align: 'center',
       ellipsis: true,
       render: (a, b) => {
@@ -48,7 +53,6 @@ export const columns = (): ProColumns<any>[] => {
       title: '分销商名称',
       dataIndex: 'companyName',
       key: 'companyName',
-      width: 120,
       align: 'center',
       ellipsis: true,
       render: (a, b) => {
@@ -58,15 +62,13 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '变更类型',
       dataIndex: 'changeType',
-      width: 120,
       align: 'center',
       ellipsis: true,
-      valueEnum:getEnum("CHANGE_TYPE","map")
+      valueEnum: getEnum("CHANGE_TYPE", "map")
     },
     {
       title: '变更数量',
       dataIndex: 'coinChangeNum',
-      width: 120,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -74,7 +76,6 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '剩余书币',
       dataIndex: 'coinRemainingNum',
-      width: 120,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
@@ -82,11 +83,20 @@ export const columns = (): ProColumns<any>[] => {
     {
       title: '变更时间',
       dataIndex: 'createTime',
-      width: 120,
       align: 'center',
       ellipsis: true,
       hideInSearch: true,
     },
+    {
+      title: "用户注册时间",
+      dataIndex: 'createTime',
+      key: "createTime",
+      hideInSearch: true,
+      align: "center",
+      render: (_, row) => {
+        return row?.wechatMiniappUser?.createTime
+      }
+    },
     //搜索
     {
       title: '变更时间',

src/pages/distribution/readLog/long/index.tsx

@@ -29,7 +29,7 @@ const Page: React.FC = () => {
           return await LongBookReadLogListOfPage.run(params);
         }}
         columns={columns()}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         // bordered
       />
     </PageContainer>

src/pages/distribution/readLog/short/index.tsx

@@ -29,7 +29,7 @@ const Page: React.FC = () => {
           return await ShortBookReadLogListOfPage.run(params);
         }}
         columns={columns()}
-        scroll={{ x: 'auto' }}
+        scroll={{ x: 'max-content' }}
         // bordered
       />
     </PageContainer>

src/services/distribution/pagesManage/index.tsx

@@ -33,3 +33,6 @@ export async function appPageList(params?: any) {
     method: 'GET'
   });
 }
+/**
+ * 
+ * */