fix

config/routes.tsx

@@ -146,7 +146,7 @@ export default [
   },
   {
     path: '/',
-    redirect: '/distributor/wxMiniApp',
+    redirect: '/distributor/account',
   },
   {
     path: '*',

src/app.tsx

@@ -137,7 +137,7 @@ export const layout: RunTimeLayoutConfig = ({ initialState, setInitialState }) =
         return false
       } else if (initialState?.selectApp) {
         return <Space>
-          <MyIcon type={initialState?.selectApp?.appType === 1 ? "icon-weixin" : "icon-douyinzhanghao"} style={{ fontSize: 30 }} />
+          <MyIcon type={initialState?.selectApp?.appType == 1 ? "icon-weixin" : "icon-douyinzhanghao"} style={{ fontSize: 30 }} />
           <strong style={{ fontSize: 18 }}>{initialState?.selectApp?.appName}</strong>
         </Space>
       } else {

src/locales/zh-CN/menu.ts

@@ -65,7 +65,7 @@ export default {
   "menu.miniApp.dataManage":"数据统计",
   "menu.miniApp.dataManage.payLog":"充值记录",
   "menu.miniApp.dataManage.readLog":"阅读记录",
-  "menu.miniApp.dataManage.consume":"书币消耗记录",
+  "menu.miniApp.dataManage.consume":"书币变更记录",
   // 授权
   "menu.miniApp.adBack":"广告回传",
 };

src/pages/Distributor/AppList/index.tsx

@@ -34,20 +34,20 @@ const Page: React.FC = () => {
                 }
             }}
             columns={columns({ appType: key })}
-            expandable={{
-                rowExpandable: (record) => record?.appCarrierList?.length > 0,
-                expandRowByClick: true,
-                expandedRowRender: (record) => {
-                    return <Table
-                        columns={childrenColumns}
-                        dataSource={record.appCarrierList}
-                        rowKey={(r) => r.id}
-                        pagination={false}
-                        size='small'
-                        bordered
-                    />
-                },
-            }}
+            // expandable={{
+            //     rowExpandable: (record) => record?.appCarrierList?.length > 0,
+            //     expandRowByClick: true,
+            //     expandedRowRender: (record) => {
+            //         return <Table
+            //             columns={childrenColumns}
+            //             dataSource={record.appCarrierList}
+            //             rowKey={(r) => r.id}
+            //             pagination={false}
+            //             size='small'
+            //             bordered
+            //         />
+            //     },
+            // }}
         />
     </PageContainer>
 

src/pages/Distributor/AppList/tableConfig.tsx

@@ -54,28 +54,28 @@ export const columns = (props: { appType: any}): ProColumns<any>[] => {
             align: "center",
             hideInSearch: true,
         },
-        {
-            title: '小程序配置信息（json）',
-            dataIndex: 'configParamList',
-            key: 'configParamList',
-            align: 'center',
-            hideInSearch: true,
-            render: (a, b) => {
-                return (
-                    <Space size={[0, 0]} wrap>
-                        {b?.configParamList?.map((item: any, index: number) => {
-                            return (
-                                <Tooltip title={JSON.stringify(item['additionalProp' + (index + 1)])} key={index}>
-                                    <Button type="link" size="small">
-                                        配置{index + 1}
-                                    </Button>
-                                </Tooltip>
-                            );
-                        })}
-                    </Space>
-                );
-            },
-        },
+        // {
+        //     title: '小程序配置信息（json）',
+        //     dataIndex: 'configParamList',
+        //     key: 'configParamList',
+        //     align: 'center',
+        //     hideInSearch: true,
+        //     render: (a, b) => {
+        //         return (
+        //             <Space size={[0, 0]} wrap>
+        //                 {b?.configParamList?.map((item: any, index: number) => {
+        //                     return (
+        //                         <Tooltip title={JSON.stringify(item['additionalProp' + (index + 1)])} key={index}>
+        //                             <Button type="link" size="small">
+        //                                 配置{index + 1}
+        //                             </Button>
+        //                         </Tooltip>
+        //                     );
+        //                 })}
+        //             </Space>
+        //         );
+        //     },
+        // },
         {
             title: 'ios支付版本号',
             tooltip: "ios的特殊性,此版本号与IOS支付模块关联,小程序版本号<=此版本号IOS才会出现支付功能,(微信)小程序发布线上后必须设置",
@@ -112,17 +112,17 @@ export const columns = (props: { appType: any}): ProColumns<any>[] => {
                 );
             },
         },
-        {
-            title: "运营载体状态",
-            dataIndex: 'appCarrierList',
-            key: "appCarrierList",
-            hideInSearch: true,
-            align: "center",
-            render: (a, b: any) => {
-                let isTrue = b?.appCarrierList?.length > 0
-                return <Badge status={isTrue ? "processing" : "error"} text={isTrue ? "有" : "无"} />
-            }
-        },
+        // {
+        //     title: "运营载体状态",
+        //     dataIndex: 'appCarrierList',
+        //     key: "appCarrierList",
+        //     hideInSearch: true,
+        //     align: "center",
+        //     render: (a, b: any) => {
+        //         let isTrue = b?.appCarrierList?.length > 0
+        //         return <Badge status={isTrue ? "processing" : "error"} text={isTrue ? "有" : "无"} />
+        //     }
+        // },
         {
             title: "操作",
             dataIndex: 'option',

src/pages/Distributor/AppManage/index.tsx

@@ -62,20 +62,20 @@ const Page: React.FC = () => {
                 }
             }}
             columns={columns({ appType: key, setOpenTalbe })}
-            expandable={{
-                rowExpandable: (record) => record?.appCarrierList?.length > 0,
-                expandRowByClick: true,
-                expandedRowRender: (record) => {
-                    return <Table
-                        columns={childrenColumns}
-                        dataSource={record.appCarrierList}
-                        rowKey={(r) => r.id}
-                        pagination={false}
-                        size='small'
-                        bordered
-                    />
-                },
-            }}
+            // expandable={{
+            //     rowExpandable: (record) => record?.appCarrierList?.length > 0,
+            //     expandRowByClick: true,
+            //     expandedRowRender: (record) => {
+            //         return <Table
+            //             columns={childrenColumns}
+            //             dataSource={record.appCarrierList}
+            //             rowKey={(r) => r.id}
+            //             pagination={false}
+            //             size='small'
+            //             bordered
+            //         />
+            //     },
+            // }}
         />
         <Drawer
             open={!!openTable}

src/pages/Distributor/AppManage/tableConfig.tsx

@@ -54,28 +54,6 @@ export const columns = (props: { appType: any, setOpenTalbe: (v: any) => void })
             align: "center",
             hideInSearch: true,
         },
-        {
-            title: '小程序配置信息（json）',
-            dataIndex: 'configParamList',
-            key: 'configParamList',
-            align: 'center',
-            hideInSearch: true,
-            render: (a, b) => {
-                return (
-                    <Space size={[0, 0]} wrap>
-                        {b?.configParamList?.map((item: any, index: number) => {
-                            return (
-                                <Tooltip title={JSON.stringify(item['additionalProp' + (index + 1)])} key={index}>
-                                    <Button type="link" size="small">
-                                        配置{index + 1}
-                                    </Button>
-                                </Tooltip>
-                            );
-                        })}
-                    </Space>
-                );
-            },
-        },
         {
             title: 'ios支付版本号',
             tooltip: "ios的特殊性,此版本号与IOS支付模块关联,小程序版本号<=此版本号IOS才会出现支付功能,(微信)小程序发布线上后必须设置",
@@ -112,17 +90,17 @@ export const columns = (props: { appType: any, setOpenTalbe: (v: any) => void })
                 );
             },
         },
-        {
-            title: "运营载体状态",
-            dataIndex: 'appCarrierList',
-            key: "appCarrierList",
-            hideInSearch: true,
-            align: "center",
-            render: (a, b: any) => {
-                let isTrue = b?.appCarrierList?.length > 0
-                return <Badge status={isTrue ? "processing" : "error"} text={isTrue ? "有" : "无"} />
-            }
-        },
+        // {
+        //     title: "运营载体状态",
+        //     dataIndex: 'appCarrierList',
+        //     key: "appCarrierList",
+        //     hideInSearch: true,
+        //     align: "center",
+        //     render: (a, b: any) => {
+        //         let isTrue = b?.appCarrierList?.length > 0
+        //         return <Badge status={isTrue ? "processing" : "error"} text={isTrue ? "有" : "无"} />
+        //     }
+        // },
         {
             title: "操作",
             dataIndex: 'option',

src/pages/MiniApp/Consume/index.tsx

@@ -28,7 +28,7 @@ const Page: React.FC = () => {
                 appType: initialState?.selectApp?.appType || ""
             }}
             scroll={{ x: true, y: 500 }}
-            headerTitle={"书币消耗列表"}
+            headerTitle={"书币变更列表"}
             rowKey={(r) => r.id}
             search={{
                 labelWidth: 120,

src/pages/MiniApp/MiniAppUser/WeChat/tableConfig.tsx

@@ -92,20 +92,20 @@ export const columns = (params: { enumList: { [key: string]: any }, del: (id: an
                 return <Switch checked={b.enabled} size="default" checkedChildren="正常" unCheckedChildren="禁用" onChange={(enabled) => { upDate({ id: b.id, enabled }) }} />
             }
         },
-        {
-            title: '操作',
-            dataIndex: 'cz',
-            key: 'cz',
-            width: 90,
-            ellipsis: true,
-            align: 'center',
-            hideInSearch: true,
-            render: (a: any, b: any) => {
-                return <Popconfirm title="确定要删除此用户?" onConfirm={() => { del(b?.id) }}>
-                    <a style={{ color: 'red' }}>删除</a>
-                </Popconfirm>
-            }
-        },
+        // {
+        //     title: '操作',
+        //     dataIndex: 'cz',
+        //     key: 'cz',
+        //     width: 90,
+        //     ellipsis: true,
+        //     align: 'center',
+        //     hideInSearch: true,
+        //     render: (a: any, b: any) => {
+        //         return <Popconfirm title="确定要删除此用户?" onConfirm={() => { del(b?.id) }}>
+        //             <a style={{ color: 'red' }}>删除</a>
+        //         </Popconfirm>
+        //     }
+        // },
         // 搜索条件
         {
             title: "最早登录时间",