Merge branch 'feature-PrivatePocket' into dev

boyang
2 parents 0c438830 c816aaf1
Showing 20 changed files with 1660 additions and 497 deletions
.umirc.ts
src/pages/Order/FeedBack/OrderList.tsx
src/pages/Order/FeedBack/constant.ts
src/pages/Order/Order/components/CheckModal.tsx
src/pages/Order/OrderList/OrderDrawer.tsx
src/pages/Order/OrderList/OrderList.tsx
src/pages/Order/constant.ts
src/pages/Prepaid/PrepaidAccount/index.less
src/pages/Prepaid/PrepaidAccount/index.tsx
src/pages/Prepaid/PrepaidRecharge/index.less
src/pages/Prepaid/PrepaidRecharge/index.tsx
src/pages/Prepaid/PrivatePocket/components/AddPrivatePocketModal.tsx
src/pages/Prepaid/PrivatePocket/constant.tsx
src/pages/Prepaid/PrivatePocket/index.less
src/pages/Prepaid/PrivatePocket/index.tsx
src/pages/Prepaid/components/RechargePrepaymentModal.tsx
src/pages/Prepaid/index.less
src/pages/Prepaid/index.tsx
src/services/definition.ts
src/services/request.ts
@@ -131,10 +131,30 @@ export default defineConfig({
     },
     {
       name: '预存管理',
-      path: '/prepaidManage',
-      component: './Prepaid',
+      path: '/prepaid',
       icon: 'AccountBookOutlined',
       access: 'canReadAdminAndFinanceAndSales',
+      routes: [
+        {
+          path: '',
+          component: './Prepaid',
+        },
+        {
+          name: '预存充值',
+          path: 'recharge',
+          component: './Prepaid/PrepaidRecharge',
+        },
+        {
+          name: '账号列表',
+          path: 'account',
+          component: './Prepaid/PrepaidAccount',
+        },
+        {
+          name: '隐私钱包',
+          path: 'privatePocket',
+          component: './Prepaid/PrivatePocket',
+        },
+      ],
     },
     {
       name: '课题组管理',
@@ -1193,8 +1193,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                 <Tag
                   color={
-                    optRecord.invoicingTime === null ||
-                    optRecord.invoicingTime === undefined
+                    optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
+                    optRecord.afterInvoicingStatus !== 'PARTIAL_INVOICING'
                       ? TAGS_COLOR.get(optRecord.invoicingStatus)
                       : 'success'
                   }
@@ -121,10 +121,10 @@ export const CHECK_TYPE = {
  * @param subOrder
  */
 export const getNeedInvoicing = (subOrder: any) => {
-  if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
-    return '已开票';
-  }
-  if (subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING') {
+  if (
+    subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING' ||
+    subOrder.afterInvoicingStatus === 'PARTIAL_INVOICING'
+  ) {
     return '已开票';
   }
   if (subOrder.afterInvoicingStatus === 'REISSUE') {
@@ -133,6 +133,12 @@ export const getNeedInvoicing = (subOrder: any) =&gt; {
   if (subOrder.invoicingStatus === 'UN_INVOICE') {
     return '不需开票';
   }
+  if (subOrder.afterInvoicingStatus === 'WAIT_FLUSH') {
+    return '待冲红';
+  }
+  if (subOrder.afterInvoicingStatus === 'FLUSHED') {
+    return '已冲红';
+  }
   return '需要开票';
 };
@@ -85,12 +85,37 @@ export default ({
     //   data: { subOrderIds: subOrderIds },
     // });
+    // 检查subOrders是否存在且有元素
+    if (!subOrders || !subOrders.length) {
+      // 如果是预存审核类型，直接返回，不需要处理售后信息
+      if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
+        return;
+      }
+
+      // 对于其他类型，设置一个空的售后信息
+      setAfterSalesInfo(
+        <div className="my-5">
+          <Row gutter={[16, 24]}>
+            <Col span={24}>
+              <span>暂无售后信息</span>
+            </Col>
+          </Row>
+        </div>,
+      );
+      return;
+    }
+
     //附件
-    let annex = subOrders[0].afterSalesAnnexList;
+    let annex = subOrders[0]?.afterSalesAnnexList || [];
     let index = 1;
     let annexLinks = annex?.map((f) => {
       return (
-        <Button className="p-0 pr-1" type="link" key="key" href={f}>
+        <Button
+          className="p-0 pr-1"
+          type="link"
+          key={`annex-${index}`}
+          href={f}
+        >
           {'附件' + index++}
         </Button>
       );
@@ -126,27 +151,36 @@ export default ({
   useEffect(() => {
     if (checkType(CHECK_TYPE.CONFIRM_DELIVER)) {
       setAPopoverTitle('确认发货');
+    } else if (checkType(CHECK_TYPE.PREPAID_AUDIT)) {
+      setAPopoverTitle('预存审核');
     }
     getOrderAfterSalesInfo();
     let paymentReceiptsImagesList: any[] = [];
     subOrders?.forEach((item: any) => {
-      if (item.paymentReceiptAnnexList) {
-        paymentReceiptsImagesList.push(...item.paymentReceiptAnnexList);
+      if (
+        item?.paymentReceiptsImages !== null &&
+        item?.paymentReceiptsImages !== undefined
+      ) {
+        paymentReceiptsImagesList.push(...item.paymentReceiptsImages);
       }
     });
-    //去重
-    paymentReceiptsImagesList = [...new Set(paymentReceiptsImagesList)];
     setPymentReceiptsImages(paymentReceiptsImagesList);
-    //预存审核的凭证
     let proofImages: any[] = [];
+    // 从subOrders获取凭证图片
     subOrders?.forEach((item) => {
-      let images = item.proofImages;
+      let images = item?.proofImages;
       if (images !== null && images !== undefined) {
         proofImages.push(...images);
       }
     });
+
+    // 对于预存审核，从data对象中获取凭证图片
+    if (checkType(CHECK_TYPE.PREPAID_AUDIT) && data?.proofImages) {
+      proofImages = [...data.proofImages];
+    }
+
     setPrepaidProofImages(proofImages);
   }, []);
@@ -374,12 +408,25 @@ export default ({
    * @param body
    */
   async function doPrepaidAudit(body: any) {
-    const data = await postPrepaidAudit({
-      data: body,
+    // 确保传递了需要审核的记录ID
+    const auditData = {
+      ...body,
+      ids: [data?.id], // 使用当前记录的ID
+      checkPassOrReject: body.checkPassOrReject, // 通过或驳回
+      checkNotes: body.name, // 审核意见
+    };
+
+    console.log('预存审核参数:', auditData);
+
+    const result = await postPrepaidAudit({
+      data: auditData,
     });
-    if (data.result === RESPONSE_CODE.SUCCESS) {
-      message.success(data.message);
+
+    if (result.result === RESPONSE_CODE.SUCCESS) {
+      message.success(result.message);
       onClose();
+    } else {
+      message.error(result.message || '审核失败');
     }
   }
@@ -230,7 +230,11 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
     // 查询当前手机号允许使用的预存账号
     if (phone) {
-      let res = await postPrepaidPhoneAvailableList({ data: { phone: phone } });
+      // 从表单中获取 salesCode
+      const salesCode = form.getFieldValue('salesCode');
+      let res = await postPrepaidPhoneAvailableList({
+        data: { phone: phone, salesCode: salesCode },
+      });
       if (res && res.result === RESPONSE_CODE.SUCCESS) {
         let uidDetails = res.data;
         for (let detail of uidDetails) {
@@ -890,9 +894,44 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           if (typeof values.erpCustomerId !== 'string') {
             values.erpCustomerId = values.erpCustomerId?.id;
           }
-          values.province = province;
-          values.city = city;
-          values.district = district;
+
+          // Handle the prepaidUid and privatePocket values for API submission
+          if (
+            values.paymentMethod === 'WITHHOLDING_ADVANCE_DEPOSIT' &&
+            values.prepaidUid
+          ) {
+            console.log('5656原始表单数据:', {
+              prepaidUid: values.prepaidUid,
+              realPrepaidUid: values.realPrepaidUid,
+              privatePocket: values.privatePocket,
+            });
+
+            // 从选项值中提取原始UID (不包含索引后缀)
+            const prepaidUidParts = values.prepaidUid.split('_');
+            if (prepaidUidParts.length > 0) {
+              // 直接使用第一部分作为实际UID值 (不使用realPrepaidUid)
+              values.prepaidUid = parseInt(prepaidUidParts[0], 10);
+              console.log('5656使用原始UID进行API提交:', values.prepaidUid);
+            }
+
+            // 确保privatePocket字段被正确设置
+            // 表单中存储的是字符串'true'或'false'，需要转换成布尔值
+            if (values.privatePocket === 'true') {
+              values.privatePocket = true;
+              console.log('设置privatePocket=true用于API提交');
+            } else {
+              values.privatePocket = false;
+              console.log('设置privatePocket=false用于API提交');
+            }
+
+            console.log('最终API提交数据:', {
+              prepaidUid: values.prepaidUid,
+              privatePocket: values.privatePocket,
+            });
+          }
+
+          console.log(values, '5656values');
+
           //新增
           if (optType('add') || optType('copy')) {
             res = await postServiceOrderAddOrder({ data: values });
@@ -1709,6 +1748,10 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           rules={[{ required: true, message: '支付方式必填' }]}
           disabled={optType('after-sales-check')}
         />
+        {/* 隐藏字段用于存储真实UID和privatePocket标志 */}
+        <ProFormText name="realPrepaidUid" hidden />
+        <ProFormText name="privatePocket" hidden />
+
         <ProFormSelect
           name="prepaidUid"
           key="prepaidUid"
@@ -1716,15 +1759,55 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           hidden={paymentMethod !== 'WITHHOLDING_ADVANCE_DEPOSIT'}
           showSearch
           label="预存账号"
-          onChange={(value: any) => {
+          onChange={(value: any, option: any) => {
+            console.log(value, '5656value');
+            console.log(option, '5656option');
+
+            if (!option) {
+              form.setFieldValue('prepaidUid', undefined);
+              form.setFieldValue('privatePocket', false);
+              return;
+            }
+
+            // 从选项中获取真实UID和机构信息
+            const selectedData = option || {};
+            const realUid = selectedData.uid;
+            const institution = selectedData.institution;
+
+            console.log('选中账户信息:', {
+              value: value,
+              realUid: realUid,
+              institution: institution,
+            });
+
             //检查用户额度
             let valid = checkAccountMoney(
-              value,
+              realUid, // 使用真实UID检查额度
               form.getFieldValue('totalPayment'),
             );
+
             if (!valid) {
               form.setFieldValue('prepaidUid', undefined);
+              form.setFieldValue('privatePocket', false);
+              return;
             }
+
+            // 如果机构是"隐私钱包"，则设置privatePocket为true
+            const isPrivacyWallet = institution === '隐私钱包';
+
+            // 设置真实UID和privatePocket标志
+            form.setFieldValue('realPrepaidUid', realUid);
+            // 存储为字符串'true'或'false'，这样在表单中能正确保存
+            form.setFieldValue(
+              'privatePocket',
+              isPrivacyWallet ? 'true' : 'false',
+            );
+
+            console.log('设置表单数据:', {
+              prepaidUid: value,
+              realPrepaidUid: realUid,
+              privatePocket: isPrivacyWallet,
+            });
           }}
           placeholder="请选择预存账号"
           rules={[
@@ -1770,7 +1853,17 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
           //   });
           //   return options;
           // }}
-          options={accountOptions}
+          options={accountOptions.map((item, index) => ({
+            ...item,
+            // Use index to create unique value
+            value: `${item.value}_${index}`,
+            // Store original values as custom attributes
+            data: {
+              uid: item.value,
+              institution: item.institution,
+              index: index,
+            },
+          }))}
         />
         <ProFormSelect
           placeholder="选择是否需要开票"
@@ -2244,7 +2337,6 @@ export default ({ onClose, data, subOrders, orderOptType }) =&gt; {
                     name="proxy"
                     label="是否代买代购"
                     //hidden={true}
-                    initialValue={true}
                     options={[
                       {
                         label: '是',
@@ -1219,8 +1219,8 @@ const OrderList = ({ paramsNew, searchShow, toolbarShow }) =&gt; {
               <div className="overflow-hidden whitespace-no-wrap overflow-ellipsis">
                 <Tag
                   color={
-                    optRecord.invoicingTime === null ||
-                    optRecord.invoicingTime === undefined
+                    optRecord.afterInvoicingStatus !== 'COMPLETE_INVOICING' &&
+                    optRecord.afterInvoicingStatus !== 'PARTIAL_INVOICING'
                       ? TAGS_COLOR.get(optRecord.invoicingStatus)
                       : 'success'
                   }
@@ -74,6 +74,7 @@ export const PAYEE_OPTIONS = {
   INNOVATION_PUBLIC_ACCOUNT: '东莞科路得创新科技有限公司',
   JIANTU_PUBLIC_ACCOUNT: '东莞市坚途新材料科技有限公司',
   HUIZHOU_JIANTU_PUBLIC_ACCOUNT: '惠州市坚途新材料科技有限公司',
+  KEYAN_ACCOUNT: '东莞科沿科技有限公司',
   HUIZHOU_EXPERIMENT_PUBLIC_ACCOUNT: '惠州市科路得新材料科技有限公司',
   KNOWLEDGE_PUBLIC_ACCOUNT: '东莞市科路得知识产权代理有限公司',
   // ZHUGUANG_ACCEPTANCE_DRAFT: '烛光承兑汇票',
@@ -135,10 +136,10 @@ export const CHECK_TYPE = {
  * @param subOrder
  */
 export const getNeedInvoicing = (subOrder: any) => {
-  if (subOrder.invoicingTime !== null && subOrder.invoicingTime !== undefined) {
-    return '已开票';
-  }
-  if (subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING') {
+  if (
+    subOrder.afterInvoicingStatus === 'COMPLETE_INVOICING' ||
+    subOrder.afterInvoicingStatus === 'PARTIAL_INVOICING'
+  ) {
     return '已开票';
   }
   if (subOrder.afterInvoicingStatus === 'REISSUE') {
+.prepaid-account {
+  width: 100%;
+  padding: 24px;
+
+  td {
+    font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+      'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+      'WenQuanYi Micro Hei', sans-serif;
+    font-size: 13px;
+  }
+}
+import EllipsisDiv from '@/components/Div/EllipsisDiv';
+import { postCanrdApiUserList } from '@/services';
+import { getUserInfo } from '@/utils/user';
+import { ActionType, ProTable } from '@ant-design/pro-components';
+import { Button } from 'antd';
+import { useRef, useState } from 'react';
+import BalanceChangeRecordsModal from '../components/BalanceChangeRecordsModal';
+import PointsExchangeModal from '../components/PointsExchangeModal';
+import PointsExchangeRecordsModal from '../components/PointsExchangeRecordsModal';
+import { ACCOUNT_COLUMNS } from '../constant';
+import './index.less';
+
+const PrepaidAccountPage = () => {
+  const user = getUserInfo();
+  const accountActionRef = useRef<ActionType>();
+  const [currentOptUserObj, setCurrentOptUserObj] = useState(null);
+  const [
+    balanceChangeRecordsModalVisible,
+    setBalanceChangeRecordsModalVisible,
+  ] = useState<boolean>(false);
+  const [pointsExchangeModalVisible, setPointsExchangeModalVisible] =
+    useState<boolean>(false);
+  const [
+    pointsExchangeRecordsModalVisible,
+    setPointsExchangeRecordsModalVisible,
+  ] = useState<boolean>(false);
+
+  const reloadAccountTable = () => {
+    accountActionRef.current?.reload();
+  };
+
+  const getTableCellText = (target: any) => {
+    if (!target) {
+      return '';
+    }
+
+    if (target.props) {
+      return target.props.text;
+    }
+
+    return target;
+  };
+
+  const accountColumnsInit = () => {
+    let columns = ACCOUNT_COLUMNS.map((item) => {
+      let newItem = { ...item };
+      let dataIndex = item.dataIndex;
+
+      newItem.render = (text, record) => {
+        let textValue = record[dataIndex];
+        return <EllipsisDiv text={getTableCellText(textValue)} />;
+      };
+
+      return newItem;
+    });
+
+    columns.push({
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      fixed: 'right',
+      width: 240,
+      render: (text, record) => {
+        let btns = [];
+        btns.push(
+          <Button
+            className="p-0 ml-2"
+            key="points"
+            type="link"
+            onClick={() => {
+              setCurrentOptUserObj(record);
+              setPointsExchangeModalVisible(true);
+            }}
+          >
+            积分兑换
+          </Button>,
+        );
+        btns.push(
+          <Button
+            className="p-0"
+            key="view"
+            type="link"
+            onClick={() => {
+              setCurrentOptUserObj(record);
+              setBalanceChangeRecordsModalVisible(true);
+            }}
+          >
+            消费记录
+          </Button>,
+        );
+        btns.push(
+          <Button
+            className="p-0 ml-2"
+            key="pointsRecords"
+            type="link"
+            onClick={() => {
+              setCurrentOptUserObj(record);
+              setPointsExchangeRecordsModalVisible(true);
+            }}
+          >
+            积分兑换记录
+          </Button>,
+        );
+        return btns;
+      },
+    });
+
+    return columns;
+  };
+
+  return (
+    <div className="prepaid-account">
+      <ProTable
+        columns={accountColumnsInit()}
+        actionRef={accountActionRef}
+        cardBordered
+        pagination={{
+          pageSize: 10,
+        }}
+        request={async (params) => {
+          const res = await postCanrdApiUserList({
+            data: { ...params },
+          });
+          const data = res?.data?.data || [];
+          const targetPhones = [
+            '18550286106',
+            '15286038815',
+            '15202597163',
+            '13267086260',
+            '15900392469',
+            '13529047645',
+          ];
+
+          const processedData = data.map((item) => {
+            const isAdmin = user.roles.includes('ADMIN');
+            const isSalesManager = user.roles.includes('SALES_MANAGER');
+            if (
+              targetPhones.includes(item.phone) &&
+              !(isAdmin || isSalesManager)
+            ) {
+              return {
+                ...item,
+                nowMoney: '****',
+              };
+            }
+            return item;
+          });
+          return {
+            data: processedData,
+            total: res?.data?.total || 0,
+          };
+        }}
+        columnsState={{
+          persistenceKey: 'pro-table-singe-account',
+          persistenceType: 'localStorage',
+          defaultValue: {
+            option: { fixed: 'right', disable: true },
+          },
+          onChange(value) {
+            console.log('value: ', value);
+          },
+        }}
+        rowKey="id"
+        search={{
+          labelWidth: 'auto',
+        }}
+        options={{
+          setting: {
+            listsHeight: 400,
+          },
+        }}
+        form={{}}
+        dateFormatter="string"
+        headerTitle="账号列表"
+        scroll={{ x: 1400 }}
+        toolBarRender={() => []}
+      />
+
+      {balanceChangeRecordsModalVisible && (
+        <BalanceChangeRecordsModal
+          setVisible={setBalanceChangeRecordsModalVisible}
+          userInfoObj={currentOptUserObj}
+          onClose={() => {
+            setBalanceChangeRecordsModalVisible(false);
+            reloadAccountTable();
+          }}
+        />
+      )}
+
+      {pointsExchangeModalVisible && (
+        <PointsExchangeModal
+          setVisible={setPointsExchangeModalVisible}
+          userInfoObj={
+            currentOptUserObj
+              ? { ...currentOptUserObj, relationEntityType: 'USER' }
+              : { uid: '', relationEntityType: 'USER' }
+          }
+          onClose={() => {
+            setPointsExchangeModalVisible(false);
+            reloadAccountTable();
+          }}
+        />
+      )}
+
+      {pointsExchangeRecordsModalVisible && (
+        <PointsExchangeRecordsModal
+          setVisible={setPointsExchangeRecordsModalVisible}
+          userInfoObj={
+            currentOptUserObj
+              ? { ...currentOptUserObj, relationEntityType: 'USER' }
+              : { uid: '', relationEntityType: 'USER' }
+          }
+          onClose={() => {
+            setPointsExchangeRecordsModalVisible(false);
+          }}
+        />
+      )}
+    </div>
+  );
+};
+
+export default PrepaidAccountPage;
+.prepaid-recharge {
+  width: 100%;
+  padding: 24px;
+
+  td {
+    font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+      'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+      'WenQuanYi Micro Hei', sans-serif;
+    font-size: 13px;
+  }
+}
+import ButtonConfirm from '@/components/ButtomConfirm';
+import EllipsisDiv from '@/components/Div/EllipsisDiv';
+import { RESPONSE_CODE } from '@/constants/enum';
+import { postPrepaidDelete, postPrepaidList } from '@/services';
+import { enumValueToLabel, formatDateTime } from '@/utils';
+import { PlusOutlined } from '@ant-design/icons';
+import { ActionType, ProTable } from '@ant-design/pro-components';
+import { Button, Divider, Image, message } from 'antd';
+import { cloneDeep } from 'lodash';
+import React, { useRef, useState } from 'react';
+import CheckModal from '../../Order/Order/components/CheckModal';
+import { CHECK_TYPE } from '../../Order/constant';
+import RechargePrepaymentModal from '../components/RechargePrepaymentModal';
+import {
+  PREPAID_STATUS_OPTIONS,
+  SALES_RECHARGE_PREPAYMENT_COLUMNS,
+} from '../constant';
+import './index.less';
+
+const PrepaidRechargePage = () => {
+  const prepaidActionRef = useRef<ActionType>();
+  const [rechargePrepaymentModalVisible, setRechargePrepaymentModalVisible] =
+    useState<boolean>(false);
+  const [currentOptPrepaymentObj, setCurrentOptPrepaymentObj] = useState(null);
+  const [checkVisible, setCheckVisible] = useState<boolean>(false);
+
+  const reloadPrepaidTable = () => {
+    prepaidActionRef.current?.reload();
+  };
+
+  /**
+   * 加载预存充值表格的各个列格式
+   */
+  const prepaidColumnsInit = () => {
+    let columns = SALES_RECHARGE_PREPAYMENT_COLUMNS.map((item) => {
+      let newItem = { ...item };
+      let dataIndex = item.dataIndex;
+
+      newItem.render = (text, record) => {
+        let textValue = record[dataIndex];
+
+        if (dataIndex === 'status') {
+          textValue = enumValueToLabel(textValue, PREPAID_STATUS_OPTIONS);
+        }
+
+        if (dataIndex.endsWith('Time')) {
+          textValue = formatDateTime(textValue);
+        }
+
+        if (
+          dataIndex === 'proofImages' &&
+          textValue !== null &&
+          textValue !== undefined
+        ) {
+          return (
+            <Image.PreviewGroup
+              className="mr-10"
+              preview={{
+                onChange: (current, prev) =>
+                  console.log(`current index: ${current}, prev index: ${prev}`),
+              }}
+            >
+              {textValue.map((item, index) => (
+                <React.Fragment key={index}>
+                  {index > 0 ? <Divider type="vertical" /> : ''}
+                  <Image
+                    className="max-h-[35px] max-w-[45px]"
+                    src={item}
+                    title={item}
+                  />{' '}
+                </React.Fragment>
+              ))}
+            </Image.PreviewGroup>
+          );
+        }
+
+        return <EllipsisDiv text={textValue} />;
+      };
+
+      return newItem;
+    });
+
+    columns.push({
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      fixed: 'right',
+      width: 120,
+      render: (text, record) => {
+        let btns = [];
+        let opts = record.operations;
+        if (opts?.includes('modify')) {
+          btns.push(
+            <Button
+              className="p-0"
+              key="modify"
+              type="link"
+              onClick={() => {
+                setRechargePrepaymentModalVisible(true);
+                setCurrentOptPrepaymentObj(cloneDeep(record));
+              }}
+            >
+              编辑
+            </Button>,
+          );
+        }
+
+        if (opts?.includes('audit')) {
+          btns.push(
+            <Button
+              className="p-0"
+              key="view"
+              type="link"
+              onClick={() => {
+                setCurrentOptPrepaymentObj(record);
+                setCheckVisible(true);
+              }}
+            >
+              审核
+            </Button>,
+          );
+        }
+
+        if (opts?.includes('delete')) {
+          btns.push(
+            <ButtonConfirm
+              key="delete"
+              className="p-0"
+              title={'确认删除这条预存记录吗？'}
+              text="删除"
+              onConfirm={async () => {
+                let res = await postPrepaidDelete({
+                  data: { ids: [record.id] },
+                });
+                if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                  message.success(res.message);
+                  reloadPrepaidTable();
+                }
+              }}
+            />,
+          );
+        }
+        return btns;
+      },
+    });
+
+    return columns;
+  };
+
+  return (
+    <div className="prepaid-recharge">
+      <ProTable
+        columns={prepaidColumnsInit()}
+        actionRef={prepaidActionRef}
+        cardBordered
+        pagination={{
+          pageSize: 10,
+        }}
+        request={async (params) => {
+          const res = await postPrepaidList({
+            data: { ...params },
+          });
+          return {
+            data: res?.data?.data || [],
+            total: res?.data?.total || 0,
+          };
+        }}
+        columnsState={{
+          persistenceKey: 'pro-table-singe-prepaid',
+          persistenceType: 'localStorage',
+          defaultValue: {
+            option: { fixed: 'right', disable: true },
+          },
+          onChange(value) {
+            console.log('value: ', value);
+          },
+        }}
+        rowKey="id"
+        search={{
+          labelWidth: 'auto',
+        }}
+        options={{
+          setting: {
+            listsHeight: 400,
+          },
+        }}
+        form={{}}
+        dateFormatter="string"
+        headerTitle="预存充值"
+        scroll={{ x: 1400 }}
+        toolBarRender={() => [
+          <Button
+            key="button"
+            icon={<PlusOutlined />}
+            onClick={() => {
+              setCurrentOptPrepaymentObj(null);
+              setRechargePrepaymentModalVisible(true);
+            }}
+            type="primary"
+          >
+            新增充值
+          </Button>,
+        ]}
+      />
+
+      {rechargePrepaymentModalVisible && (
+        <RechargePrepaymentModal
+          setVisible={setRechargePrepaymentModalVisible}
+          prepaymentObject={currentOptPrepaymentObj}
+          onClose={() => {
+            setRechargePrepaymentModalVisible(false);
+            reloadPrepaidTable();
+          }}
+        />
+      )}
+
+      {checkVisible && (
+        <CheckModal
+          setCheckVisible={setCheckVisible}
+          data={currentOptPrepaymentObj}
+          subOrders={[]}
+          orderCheckType={CHECK_TYPE.PREPAID_AUDIT}
+          openOrderDrawer={null}
+          onClose={() => {
+            setCheckVisible(false);
+            reloadPrepaidTable();
+          }}
+        />
+      )}
+    </div>
+  );
+};
+
+export default PrepaidRechargePage;
+import {
+  postCanrdPrivatePocketSave,
+  postServiceOrderQuerySalesCode,
+} from '@/services';
+import { getUserInfo } from '@/utils/user';
+import { Form, Input, Modal, Select, message } from 'antd';
+import React, { useEffect, useState } from 'react';
+
+interface AddPrivatePocketModalProps {
+  visible: boolean;
+  onCancel: () => void;
+  onSuccess: () => void;
+}
+
+interface SalesCodeItem {
+  number: string | null;
+  userName: string;
+}
+
+const AddPrivatePocketModal: React.FC<AddPrivatePocketModalProps> = ({
+  visible,
+  onCancel,
+  onSuccess,
+}) => {
+  const [form] = Form.useForm();
+  const [salesCodeList, setSalesCodeList] = useState<SalesCodeItem[]>([]);
+  const [loading, setLoading] = useState<boolean>(false);
+  const userInfo = getUserInfo();
+  const userName = userInfo?.username || '';
+
+  const fetchSalesCodeList = async () => {
+    try {
+      const res = await postServiceOrderQuerySalesCode();
+      if (res?.data) {
+        setSalesCodeList(res.data);
+      }
+    } catch (error) {
+      console.error('获取销售编码列表失败:', error);
+      message.error('获取销售编码列表失败');
+    }
+  };
+
+  useEffect(() => {
+    if (visible) {
+      fetchSalesCodeList();
+      form.resetFields();
+    }
+  }, [visible, form]);
+
+  const handleSubmit = async () => {
+    try {
+      const values = await form.validateFields();
+      setLoading(true);
+
+      const res = await postCanrdPrivatePocketSave({
+        data: {
+          account: values.account,
+          salesCode: values.salesCode,
+          createByName: userName,
+        },
+      });
+
+      if (res?.result === 0 || res?.code === 200 || res?.success) {
+        message.success('添加隐私钱包成功');
+        onSuccess();
+      } else {
+        message.error(res?.message || '添加失败');
+      }
+    } catch (error) {
+      console.error('添加隐私钱包失败:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <Modal
+      title="添加隐私钱包"
+      open={visible}
+      onCancel={onCancel}
+      onOk={handleSubmit}
+      confirmLoading={loading}
+      destroyOnClose
+    >
+      <Form form={form} layout="vertical">
+        <Form.Item
+          name="account"
+          label="绑定普通账户"
+          rules={[{ required: true, message: '请输入手机号' }]}
+        >
+          <Input placeholder="请输入手机号" />
+        </Form.Item>
+        <Form.Item
+          name="salesCode"
+          label="负责销售"
+          rules={[{ required: true, message: '请选择负责销售' }]}
+        >
+          <Select
+            placeholder="请选择负责销售"
+            showSearch
+            optionFilterProp="children"
+            filterOption={(input, option) =>
+              (option?.label?.toString() || '')
+                .toLowerCase()
+                .includes(input.toLowerCase())
+            }
+            options={salesCodeList.map((item) => ({
+              value: item.userName,
+              label: item.userName,
+            }))}
+          />
+        </Form.Item>
+      </Form>
+    </Modal>
+  );
+};
+
+export default AddPrivatePocketModal;
+export const PRIVATE_POCKET_COLUMNS = [
+  {
+    title: '用户ID',
+    dataIndex: 'uid',
+    key: 'uid',
+    valueType: 'text',
+    hideInTable: true,
+    hideInSearch: true,
+  },
+  {
+    title: '用户账号',
+    dataIndex: 'account',
+    key: 'account',
+    valueType: 'text',
+    fieldProps: {
+      placeholder: '请输入用户账号',
+    },
+  },
+  {
+    title: '真实姓名',
+    dataIndex: 'realName',
+    key: 'realName',
+    valueType: 'text',
+    hideInSearch: true,
+  },
+  {
+    title: '用户余额',
+    dataIndex: 'nowMoney',
+    key: 'nowMoney',
+    valueType: 'money',
+    hideInSearch: true,
+  },
+  {
+    title: '隐私余额',
+    dataIndex: 'privateMoney',
+    key: 'privateMoney',
+    valueType: 'money',
+    hideInSearch: true,
+  },
+  {
+    title: '负责销售',
+    dataIndex: 'salesCode',
+    key: 'salesCode',
+    valueType: 'text',
+    fieldProps: {
+      placeholder: '请输入负责销售',
+    },
+  },
+  {
+    title: '创建人',
+    dataIndex: 'createByName',
+    key: 'createByName',
+    valueType: 'text',
+    hideInSearch: true,
+  },
+  {
+    title: '创建时间',
+    dataIndex: 'createTime',
+    key: 'createTime',
+    valueType: 'dateTime',
+    hideInSearch: true,
+  },
+  // {
+  //   title: '更新时间',
+  //   dataIndex: 'updateTime',
+  //   key: 'updateTime',
+  //   valueType: 'dateTime',
+  //   hideInSearch: true,
+  // },
+];
+.private-pocket-index {
+  width: 100%;
+  padding: 24px;
+
+  td {
+    font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+      'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+      'WenQuanYi Micro Hei', sans-serif;
+    font-size: 13px;
+  }
+}
+import ButtonConfirm from '@/components/ButtomConfirm';
+import EllipsisDiv from '@/components/Div/EllipsisDiv';
+import { RESPONSE_CODE } from '@/constants/enum';
+import {
+  postCanrdPrivatePocketDelete,
+  postCanrdPrivatePocketList,
+} from '@/services';
+import { formatDateTime } from '@/utils';
+import { ActionType, ProTable } from '@ant-design/pro-components';
+import { Button, message } from 'antd';
+import { useRef, useState } from 'react';
+import AddPrivatePocketModal from './components/AddPrivatePocketModal';
+import { PRIVATE_POCKET_COLUMNS } from './constant';
+import './index.less';
+
+const PrivatePocketPage = () => {
+  const actionRef = useRef<ActionType>();
+  const [addModalVisible, setAddModalVisible] = useState<boolean>(false);
+
+  const reloadTable = () => {
+    actionRef.current?.reload();
+  };
+
+  const getTableCellText = (target: any) => {
+    if (!target) {
+      return '';
+    }
+
+    if (target.props) {
+      return target.props.text;
+    }
+
+    return target;
+  };
+
+  const columnsInit = () => {
+    let columns = PRIVATE_POCKET_COLUMNS.map((item) => {
+      let newItem = { ...item };
+      let dataIndex = item.dataIndex;
+
+      newItem.render = (text: any, record: any) => {
+        let textValue = record[dataIndex];
+
+        if (dataIndex.endsWith('Time')) {
+          textValue = formatDateTime(textValue);
+        }
+
+        return <EllipsisDiv text={getTableCellText(textValue)} />;
+      };
+
+      return newItem;
+    });
+
+    columns.push({
+      title: '操作',
+      valueType: 'option',
+      key: 'option',
+      width: 120,
+      render: (text: any, record: any) => {
+        let btns = [];
+
+        btns.push(
+          <ButtonConfirm
+            key="delete"
+            className="p-0"
+            title={'确认删除这条隐私钱包记录吗？'}
+            text="删除"
+            onConfirm={async () => {
+              let res = await postCanrdPrivatePocketDelete({
+                data: { uid: record.uid },
+              });
+              if (res && res.result === RESPONSE_CODE.SUCCESS) {
+                message.success('删除成功');
+                reloadTable();
+              }
+            }}
+          />,
+        );
+
+        return btns;
+      },
+    });
+
+    return columns;
+  };
+
+  return (
+    <div className="private-pocket-index">
+      <ProTable
+        columns={columnsInit()}
+        actionRef={actionRef}
+        cardBordered
+        pagination={{
+          pageSize: 10,
+        }}
+        request={async (params) => {
+          const res = await postCanrdPrivatePocketList({
+            data: { ...params },
+          });
+          const list = res?.data?.data || [];
+          return {
+            data: list,
+            success: true,
+            total: res?.data?.total || 0,
+          };
+        }}
+        columnsState={{
+          persistenceKey: 'pro-table-private-pocket',
+          persistenceType: 'localStorage',
+          defaultValue: {
+            option: { fixed: 'right', disable: true },
+          },
+          onChange(value) {
+            console.log('value: ', value);
+          },
+        }}
+        rowKey="uid"
+        search={{
+          labelWidth: 'auto',
+        }}
+        options={{
+          setting: {
+            listsHeight: 400,
+          },
+        }}
+        form={{}}
+        dateFormatter="string"
+        headerTitle="隐私钱包"
+        scroll={{ x: 1400 }}
+        toolBarRender={() => [
+          <Button
+            key="add"
+            type="primary"
+            onClick={() => setAddModalVisible(true)}
+          >
+            添加
+          </Button>,
+        ]}
+      />
+
+      {addModalVisible && (
+        <AddPrivatePocketModal
+          visible={addModalVisible}
+          onCancel={() => setAddModalVisible(false)}
+          onSuccess={() => {
+            setAddModalVisible(false);
+            reloadTable();
+          }}
+        />
+      )}
+    </div>
+  );
+};
+
+export default PrivatePocketPage;
@@ -30,8 +30,10 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
     salesCode: string;
     rechargeAmount: number;
     notes: string;
+    rechargeType: string; // 充值类型
   }>();
   const [salesCodeOptions, setSalesCodeOptions] = useState([]);
+  const [setRechargeType] = useState<string>('normal'); // 默认普通充值
   const [isCreate, setIsCreate] = useState(true);
   const [fileList, setFileList] = useState<UploadFile[]>([]);
   const [previewOpen, setPreviewOpen] = useState(false);
@@ -243,7 +245,8 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
           },
         }}
         onFinish={async (values) => {
-          if (fileList.length <= 0) {
+          // 隐私钱包充值不需要凭证
+          if (values.rechargeType !== 'privatePocket' && fileList.length <= 0) {
             message.error('凭证不能为空');
             return;
           }
@@ -278,6 +281,12 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
               }
             }
           }
+          // 所有充值类型都传递rechargeType参数
+          // 如果是隐私钱包充值且不需要凭证，直接创建空凭证数组
+          if (values.rechargeType === 'privatePocket' && fileList.length <= 0) {
+            values.proofImages = [];
+          }
+          // 普通充值流程
           let res = await postServiceOrderFileProcess({
             data: formData,
           });
@@ -302,6 +311,8 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
                 data: {
                   ...values,
                   customerName: form.getFieldValue('customerNameString'),
+                  // 传递充值类型参数
+                  rechargeType: values.rechargeType || 'normal',
                 },
               });
             } else {
@@ -312,7 +323,11 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
                 body.customerName = customerNameString;
               }
               res = await postPrepaidUpdate({
-                data: body,
+                data: {
+                  ...body,
+                  // 传递充值类型参数
+                  rechargeType: values.rechargeType || 'normal',
+                },
               });
             }
@@ -416,6 +431,21 @@ export default ({ setVisible, prepaymentObject, onClose }) =&gt; {
           rules={[{ required: true, message: '销售代表必填' }]}
           options={salesCodeOptions}
         />
+        <ProFormSelect
+          name="rechargeType"
+          label="充值类型"
+          initialValue="normal"
+          valueEnum={{
+            normal: '普通充值',
+            privatePocket: '隐私钱包充值',
+          }}
+          fieldProps={{
+            onChange: (value) => {
+              setRechargeType(value);
+            },
+          }}
+          rules={[{ required: true, message: '请选择充值类型' }]}
+        />
         <ProFormDigit
           name="rechargeAmount"
           label="充值金额（￥）"
-.prepaid-index td {
-  font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
-    'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
-    'WenQuanYi Micro Hei', sans-serif;
-  font-size: 13px;
+.prepaid-index {
+  width: 100%;
+  padding: 24px;
+
+  .prepaid-card {
+    height: 180px;
+    transition: all 0.3s;
+
+    &:hover {
+      transform: translateY(-5px);
+      box-shadow: 0 5px 15px rgba(0, 0, 0, 10%);
+    }
+
+    .card-content {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+      justify-content: center;
+      height: 100%;
+
+      .card-icon {
+        font-size: 36px;
+        margin-bottom: 16px;
+        color: #1890ff;
+      }
+
+      .card-title {
+        font-size: 18px;
+        font-weight: 500;
+        margin-bottom: 12px;
+      }
+
+      .card-desc {
+        color: rgba(0, 0, 0, 45%);
+        text-align: center;
+        padding: 0 12px;
+      }
+    }
+  }
+
+  td {
+    font-family: 'San Francisco', 'Helvetica Neue', Helvetica, Arial,
+      'Microsoft YaHei', 'PingFang SC', 'Hiragino Sans GB', 'Heiti SC',
+      'WenQuanYi Micro Hei', sans-serif;
+    font-size: 13px;
+  }
 }
-import ButtonConfirm from '@/components/ButtomConfirm';
-import EllipsisDiv from '@/components/Div/EllipsisDiv';
-import { RESPONSE_CODE } from '@/constants/enum';
-import {} from '@/pages/Invoice/constant';
 import {
-  postCanrdApiUserList,
-  postPrepaidDelete,
-  postPrepaidList,
-} from '@/services';
-import { enumValueToLabel, formatDateTime } from '@/utils';
-import { getUserInfo } from '@/utils/user';
-import { PlusOutlined } from '@ant-design/icons';
-import { ActionType, ProTable } from '@ant-design/pro-components';
-import { Button, Divider, Image, Tabs, message } from 'antd';
-import { cloneDeep } from 'lodash';
-import React, { useRef, useState } from 'react';
-import CheckModal from '../Order/Order/components/CheckModal';
-import { CHECK_TYPE } from '../Order/constant';
-import BalanceChangeRecordsModal from './components/BalanceChangeRecordsModal';
-import PointsExchangeModal from './components/PointsExchangeModal';
-import PointsExchangeRecordsModal from './components/PointsExchangeRecordsModal';
-import RechargePrepaymentModal from './components/RechargePrepaymentModal';
-import {
-  ACCOUNT_COLUMNS,
-  PREPAID_STATUS_OPTIONS,
-  SALES_RECHARGE_PREPAYMENT_COLUMNS,
-} from './constant';
+  CreditCardOutlined,
+  MoneyCollectOutlined,
+  UserOutlined,
+} from '@ant-design/icons';
+import { Card, Col, Row } from 'antd';
+import { history } from 'umi';
 import './index.less';
 const PrepaidPage = () => {
-  const user = getUserInfo();
-  const prepaidActionRef = useRef<ActionType>();
-  const accountActionRef = useRef<ActionType>();
-  const [rechargePrepaymentModalVisible, setRechargePrepaymentModalVisible] =
-    useState<boolean>(false);
-  const [currentOptPrepaymentObj, setCurrentOptPrepaymentObj] = useState(null);
-  const [currentOptUserObj, setCurrentOptUserObj] = useState(null);
-  const [checkVisible, setCheckVisible] = useState<boolean>(false);
-  const [
-    balanceChangeRecordsModalVisible,
-    setBalanceChangeRecordsModalVisible,
-  ] = useState<boolean>(false);
-  const [pointsExchangeModalVisible, setPointsExchangeModalVisible] =
-    useState<boolean>(false);
-  const [
-    pointsExchangeRecordsModalVisible,
-    setPointsExchangeRecordsModalVisible,
-  ] = useState<boolean>(false);
-
-  const reloadPrepaidTable = () => {
-    prepaidActionRef.current?.reload();
-  };
-
-  const reloadAccountTable = () => {
-    accountActionRef.current?.reload();
-  };
-
-  const getTableCellText = (target: any) => {
-    if (!target) {
-      return '';
-    }
-
-    if (target.props) {
-      return target.props.text;
-    }
-
-    return target;
-  };
-
-  /**
-   * 加载发票列表表格的各个列格式
-   */
-  const prepaidColumnsInit = () => {
-    let columns = SALES_RECHARGE_PREPAYMENT_COLUMNS.map((item) => {
-      let newItem = { ...item };
-      let dataIndex = item.dataIndex;
-
-      newItem.render = (text, record) => {
-        let textValue = record[dataIndex];
-
-        if (dataIndex === 'status') {
-          textValue = enumValueToLabel(textValue, PREPAID_STATUS_OPTIONS);
-        }
-
-        if (dataIndex.endsWith('Time')) {
-          textValue = formatDateTime(textValue);
-        }
-
-        if (
-          dataIndex === 'proofImages' &&
-          textValue !== null &&
-          textValue !== undefined
-        ) {
-          console.log(textValue);
-          return (
-            <Image.PreviewGroup
-              className="mr-10"
-              preview={{
-                onChange: (current, prev) =>
-                  console.log(`current index: ${current}, prev index: ${prev}`),
-              }}
-            >
-              {textValue.map((item, index) => (
-                <React.Fragment key={index}>
-                  {index > 0 ? <Divider type="vertical" /> : ''}
-                  <Image
-                    className="max-h-[35px] max-w-[45px]"
-                    src={item}
-                    title={item}
-                  />{' '}
-                </React.Fragment>
-              ))}
-            </Image.PreviewGroup>
-          );
-        }
-
-        return <EllipsisDiv text={textValue} />;
-      };
-
-      return newItem;
-    });
-
-    columns.push({
-      title: '操作',
-      valueType: 'option',
-      key: 'option',
-      fixed: 'right',
-      width: 120,
-      render: (text, record) => {
-        let btns = [];
-        let opts = record.operations;
-        if (opts?.includes('modify')) {
-          btns.push(
-            <Button
-              className="p-0"
-              key="modify"
-              type="link"
-              onClick={() => {
-                setRechargePrepaymentModalVisible(true);
-                setCurrentOptPrepaymentObj(cloneDeep(record));
-              }}
-            >
-              编辑
-            </Button>,
-          );
-        }
-
-        if (opts?.includes('audit')) {
-          btns.push(
-            <Button
-              className="p-0"
-              key="view"
-              type="link"
-              onClick={() => {
-                setCurrentOptPrepaymentObj(record);
-                setCheckVisible(true);
-              }}
-            >
-              审核
-            </Button>,
-          );
-        }
-
-        if (opts?.includes('delete')) {
-          btns.push(
-            <ButtonConfirm
-              key="delete"
-              className="p-0"
-              title={'确认删除这条预存记录吗？'}
-              text="删除"
-              onConfirm={async () => {
-                let res = await postPrepaidDelete({
-                  data: { ids: [record.id] },
-                });
-                if (res && res.result === RESPONSE_CODE.SUCCESS) {
-                  message.success(res.message);
-                  reloadPrepaidTable();
-                }
-              }}
-            />,
-          );
-        }
-        return btns;
-      },
-    });
-
-    return columns;
+  const handleCardClick = (path: string) => {
+    history.push(path);
   };
-  const accountColumnsInit = () => {
-    let columns = ACCOUNT_COLUMNS.map((item) => {
-      let newItem = { ...item };
-      let dataIndex = item.dataIndex;
-
-      newItem.render = (text, record) => {
-        let textValue = record[dataIndex];
-        return <EllipsisDiv text={getTableCellText(textValue)} />;
-      };
-
-      return newItem;
-    });
-
-    columns.push({
-      title: '操作',
-      valueType: 'option',
-      key: 'option',
-      fixed: 'right',
-      width: 240,
-      render: (text, record) => {
-        let btns = [];
-        btns.push(
-          <Button
-            className="p-0 ml-2"
-            key="points"
-            type="link"
-            onClick={() => {
-              setCurrentOptUserObj(record);
-              setPointsExchangeModalVisible(true);
-            }}
+  return (
+    <div className="prepaid-index">
+      <Row gutter={16}>
+        <Col span={8}>
+          <Card
+            hoverable
+            className="prepaid-card"
+            onClick={() => handleCardClick('/prepaid/recharge')}
           >
-            积分兑换
-          </Button>,
-        );
-        btns.push(
-          <Button
-            className="p-0"
-            key="view"
-            type="link"
-            onClick={() => {
-              setCurrentOptUserObj(record);
-              setBalanceChangeRecordsModalVisible(true);
-            }}
+            <div className="card-content">
+              <CreditCardOutlined className="card-icon" />
+              <div className="card-title">预存充值</div>
+              <div className="card-desc">管理预存充值记录、审核及编辑操作</div>
+            </div>
+          </Card>
+        </Col>
+        <Col span={8}>
+          <Card
+            hoverable
+            className="prepaid-card"
+            onClick={() => handleCardClick('/prepaid/account')}
           >
-            消费记录
-          </Button>,
-        );
-        btns.push(
-          <Button
-            className="p-0 ml-2"
-            key="pointsRecords"
-            type="link"
-            onClick={() => {
-              setCurrentOptUserObj(record);
-              setPointsExchangeRecordsModalVisible(true);
-            }}
+            <div className="card-content">
+              <UserOutlined className="card-icon" />
+              <div className="card-title">账号列表</div>
+              <div className="card-desc">查看账户信息、积分兑换及消费记录</div>
+            </div>
+          </Card>
+        </Col>
+        <Col span={8}>
+          <Card
+            hoverable
+            className="prepaid-card"
+            onClick={() => handleCardClick('/prepaid/privatePocket')}
           >
-            积分兑换记录
-          </Button>,
-        );
-        return btns;
-      },
-    });
-
-    return columns;
-  };
-
-  const tabsItems = [
-    {
-      key: 1,
-      label: '预存充值',
-      children: (
-        <ProTable
-          columns={prepaidColumnsInit()}
-          actionRef={prepaidActionRef}
-          cardBordered
-          pagination={{
-            pageSize: 10,
-          }}
-          request={async (params) => {
-            const res = await postPrepaidList({
-              data: { ...params },
-            });
-            return {
-              data: res?.data?.data || [],
-              total: res?.data?.total || 0,
-            };
-          }}
-          columnsState={{
-            persistenceKey: 'pro-table-singe-prepaid',
-            persistenceType: 'localStorage',
-            defaultValue: {
-              option: { fixed: 'right', disable: true },
-            },
-            onChange(value) {
-              console.log('value: ', value);
-            },
-          }}
-          rowKey="id"
-          search={{
-            labelWidth: 'auto',
-          }}
-          options={{
-            setting: {
-              listsHeight: 400,
-            },
-          }}
-          form={{}}
-          dateFormatter="string"
-          headerTitle="预存充值"
-          scroll={{ x: 1400 }}
-          toolBarRender={() => [
-            <Button
-              key="button"
-              icon={<PlusOutlined />}
-              onClick={() => {
-                setCurrentOptPrepaymentObj(null);
-                setRechargePrepaymentModalVisible(true);
-              }}
-              type="primary"
-            >
-              新增充值
-            </Button>,
-          ]}
-        />
-      ),
-    },
-    {
-      key: 2,
-      label: '账号列表',
-      children: (
-        <ProTable
-          columns={accountColumnsInit()}
-          actionRef={accountActionRef}
-          cardBordered
-          pagination={{
-            pageSize: 10,
-          }}
-          request={async (params) => {
-            const res = await postCanrdApiUserList({
-              data: { ...params },
-            });
-            const data = res?.data?.data || [];
-            const targetPhones = [
-              '18550286106',
-              '15286038815',
-              '15202597163',
-              '13267086260',
-              '15900392469',
-              '13529047645',
-            ];
-
-            const processedData = data.map((item) => {
-              const isAdmin = user.roles.includes('ADMIN');
-              const isSalesManager = user.roles.includes('SALES_MANAGER');
-              if (
-                targetPhones.includes(item.phone) &&
-                !(isAdmin || isSalesManager)
-              ) {
-                return {
-                  ...item,
-                  nowMoney: '****',
-                };
-              }
-              return item;
-            });
-            return {
-              data: processedData,
-              total: res?.data?.total || 0,
-            };
-          }}
-          columnsState={{
-            persistenceKey: 'pro-table-singe-account',
-            persistenceType: 'localStorage',
-            defaultValue: {
-              option: { fixed: 'right', disable: true },
-            },
-            onChange(value) {
-              console.log('value: ', value);
-            },
-          }}
-          rowKey="id"
-          search={{
-            labelWidth: 'auto',
-          }}
-          options={{
-            setting: {
-              listsHeight: 400,
-            },
-          }}
-          form={{}}
-          dateFormatter="string"
-          headerTitle="账号列表"
-          scroll={{ x: 1400 }}
-          toolBarRender={() => []}
-        />
-      ),
-    },
-  ];
-  return (
-    <div className="prepaid-index">
-      <Tabs
-        defaultActiveKey="1"
-        items={tabsItems}
-        onChange={(value) => {
-          if (value === '1') {
-            reloadPrepaidTable();
-          } else {
-            reloadAccountTable();
-          }
-        }}
-      />
-
-      {rechargePrepaymentModalVisible && (
-        <RechargePrepaymentModal
-          setVisible={setRechargePrepaymentModalVisible}
-          onClose={() => {
-            setRechargePrepaymentModalVisible(false);
-            reloadPrepaidTable();
-          }}
-          prepaymentObject={currentOptPrepaymentObj}
-        />
-      )}
-
-      {checkVisible && (
-        <CheckModal
-          setCheckVisible={(val: boolean) => {
-            setCheckVisible(val);
-          }}
-          data={[currentOptPrepaymentObj]}
-          subOrders={[currentOptPrepaymentObj]}
-          orderCheckType={CHECK_TYPE.PREPAID_AUDIT}
-          openOrderDrawer={false}
-          onClose={() => {
-            setCheckVisible(false);
-            reloadPrepaidTable();
-          }}
-        />
-      )}
-
-      {balanceChangeRecordsModalVisible && (
-        <BalanceChangeRecordsModal
-          setVisible={(val: boolean) => {
-            setBalanceChangeRecordsModalVisible(val);
-          }}
-          userInfoObj={currentOptUserObj}
-          onClose={() => {
-            setBalanceChangeRecordsModalVisible(false);
-          }}
-        />
-      )}
-
-      {pointsExchangeModalVisible && currentOptUserObj && (
-        <PointsExchangeModal
-          setVisible={(val: boolean) => {
-            setPointsExchangeModalVisible(val);
-          }}
-          userInfoObj={currentOptUserObj}
-          onClose={() => {
-            setPointsExchangeModalVisible(false);
-            reloadAccountTable();
-          }}
-        />
-      )}
-
-      {pointsExchangeRecordsModalVisible && currentOptUserObj && (
-        <PointsExchangeRecordsModal
-          setVisible={(val: boolean) => {
-            setPointsExchangeRecordsModalVisible(val);
-          }}
-          userInfoObj={currentOptUserObj}
-          onClose={() => {
-            setPointsExchangeRecordsModalVisible(false);
-          }}
-        />
-      )}
+            <div className="card-content">
+              <MoneyCollectOutlined className="card-icon" />
+              <div className="card-title">隐私钱包</div>
+              <div className="card-desc">管理用户隐私钱包信息</div>
+            </div>
+          </Card>
+        </Col>
+      </Row>
     </div>
   );
 };
@@ -4849,6 +4849,136 @@ export interface UserNowMoneyCheckRequest {
   uid?: number;
 }
+export interface UserPrivatePocketBalanceUpdateRequest {
+  /**
+   * @description
+   *   用户账号
+   */
+  account: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /**
+   * @description
+   *   用户余额
+   */
+  nowMoney?: number;
+  /**
+   * @description
+   *   隐私余额
+   */
+  privateMoney?: number;
+  /**
+   * @description
+   *   真实姓名
+   */
+  realName?: string;
+  /**
+   * @description
+   *   负责销售
+   */
+  salesCode: string;
+  /**
+   * @description
+   *   用户id
+   * @format int32
+   */
+  uid?: number;
+}
+
+export interface UserPrivatePocketDeleteRequest {
+  /**
+   * @description
+   *   用户id
+   * @format int32
+   */
+  uid: number;
+}
+
+export interface UserPrivatePocketDetailRequest {
+  /**
+   * @description
+   *   用户id
+   * @format int32
+   */
+  uid: number;
+}
+
+export interface UserPrivatePocketListRequest {
+  /**
+   * @description
+   *   用户账号
+   */
+  account?: string;
+  /**
+   * @description
+   *   当前页
+   * @format int32
+   * @example
+   *   1
+   */
+  current?: number;
+  /**
+   * @description
+   *   每页大小
+   * @format int32
+   * @example
+   *   10
+   */
+  pageSize?: number;
+  /**
+   * @description
+   *   真实姓名
+   */
+  realName?: string;
+  /**
+   * @description
+   *   负责销售
+   */
+  salesCode?: string;
+}
+
+export interface UserPrivatePocketUpdateRequest {
+  /**
+   * @description
+   *   用户账号
+   */
+  account: string;
+  /**
+   * @description
+   *   创建人
+   */
+  createByName?: string;
+  /**
+   * @description
+   *   用户余额
+   */
+  nowMoney?: number;
+  /**
+   * @description
+   *   隐私余额
+   */
+  privateMoney?: number;
+  /**
+   * @description
+   *   真实姓名
+   */
+  realName?: string;
+  /**
+   * @description
+   *   负责销售
+   */
+  salesCode: string;
+  /**
+   * @description
+   *   用户id
+   * @format int32
+   */
+  uid?: number;
+}
+
 export interface View {
   contentType?: string;
 }
@@ -5471,6 +5601,11 @@ export interface SalesRechargePrepaymentAuditRequest {
    *   手机号
    */
   phone?: string;
+  /**
+   * @description
+   *   销售代表编码
+   */
+  salescode?: string;
 }
 export interface SalesRechargePrepaymentCreateRequest {
@@ -5511,6 +5646,13 @@ export interface SalesRechargePrepaymentCreateRequest {
   rechargeSource?: string;
   /**
    * @description
+   *   充值类型
+   * @example
+   *   normal
+   */
+  rechargeType?: string;
+  /**
+   * @description
    *   销售代表
    */
   salesCode?: string;
@@ -168,6 +168,11 @@ import type {
   UserDetailRequest,
   UserListRequest,
   UserNowMoneyCheckRequest,
+  UserPrivatePocketBalanceUpdateRequest,
+  UserPrivatePocketDeleteRequest,
+  UserPrivatePocketDetailRequest,
+  UserPrivatePocketListRequest,
+  UserPrivatePocketUpdateRequest,
   WarningOrderWhiteListDto,
   WarningUserWhiteListDto,
 } from './definition';
@@ -3142,6 +3147,361 @@ export const postCanrdApiUserNowMoneyCheck = /* #__PURE__ */ (() =&gt; {
   return request;
 })();
+/** @description request parameter type for postCanrdPrivatePocketDelete */
+export interface PostCanrdPrivatePocketDeleteOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: UserPrivatePocketDeleteRequest;
+  };
+}
+
+/** @description response type for postCanrdPrivatePocketDelete */
+export interface PostCanrdPrivatePocketDeleteResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostCanrdPrivatePocketDeleteResponseSuccess =
+  PostCanrdPrivatePocketDeleteResponse[200];
+/**
+ * @description
+ *   删除用户隐私钱包
+ * @tags user-private-pocket-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postCanrdPrivatePocketDelete = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/canrd/privatePocket/delete';
+  function request(
+    option: PostCanrdPrivatePocketDeleteOption,
+  ): Promise<PostCanrdPrivatePocketDeleteResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostCanrdPrivatePocketDeleteResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postCanrdPrivatePocketDetail */
+export interface PostCanrdPrivatePocketDetailOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: UserPrivatePocketDetailRequest;
+  };
+}
+
+/** @description response type for postCanrdPrivatePocketDetail */
+export interface PostCanrdPrivatePocketDetailResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostCanrdPrivatePocketDetailResponseSuccess =
+  PostCanrdPrivatePocketDetailResponse[200];
+/**
+ * @description
+ *   获取用户隐私钱包详情
+ * @tags user-private-pocket-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postCanrdPrivatePocketDetail = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/canrd/privatePocket/detail';
+  function request(
+    option: PostCanrdPrivatePocketDetailOption,
+  ): Promise<PostCanrdPrivatePocketDetailResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostCanrdPrivatePocketDetailResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postCanrdPrivatePocketList */
+export interface PostCanrdPrivatePocketListOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: UserPrivatePocketListRequest;
+  };
+}
+
+/** @description response type for postCanrdPrivatePocketList */
+export interface PostCanrdPrivatePocketListResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostCanrdPrivatePocketListResponseSuccess =
+  PostCanrdPrivatePocketListResponse[200];
+/**
+ * @description
+ *   获取用户隐私钱包列表
+ * @tags user-private-pocket-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postCanrdPrivatePocketList = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/canrd/privatePocket/list';
+  function request(
+    option: PostCanrdPrivatePocketListOption,
+  ): Promise<PostCanrdPrivatePocketListResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostCanrdPrivatePocketListResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postCanrdPrivatePocketSave */
+export interface PostCanrdPrivatePocketSaveOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: UserPrivatePocketUpdateRequest;
+  };
+}
+
+/** @description response type for postCanrdPrivatePocketSave */
+export interface PostCanrdPrivatePocketSaveResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostCanrdPrivatePocketSaveResponseSuccess =
+  PostCanrdPrivatePocketSaveResponse[200];
+/**
+ * @description
+ *   保存或更新用户隐私钱包
+ * @tags user-private-pocket-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postCanrdPrivatePocketSave = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/canrd/privatePocket/save';
+  function request(
+    option: PostCanrdPrivatePocketSaveOption,
+  ): Promise<PostCanrdPrivatePocketSaveResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostCanrdPrivatePocketSaveResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
+/** @description request parameter type for postCanrdPrivatePocketUpdateBalance */
+export interface PostCanrdPrivatePocketUpdateBalanceOption {
+  /**
+   * @description
+   *   request
+   */
+  body: {
+    /**
+        @description
+          request */
+    request: UserPrivatePocketBalanceUpdateRequest;
+  };
+}
+
+/** @description response type for postCanrdPrivatePocketUpdateBalance */
+export interface PostCanrdPrivatePocketUpdateBalanceResponse {
+  /**
+   * @description
+   *   OK
+   */
+  200: ServerResult;
+  /**
+   * @description
+   *   Created
+   */
+  201: any;
+  /**
+   * @description
+   *   Unauthorized
+   */
+  401: any;
+  /**
+   * @description
+   *   Forbidden
+   */
+  403: any;
+  /**
+   * @description
+   *   Not Found
+   */
+  404: any;
+}
+
+export type PostCanrdPrivatePocketUpdateBalanceResponseSuccess =
+  PostCanrdPrivatePocketUpdateBalanceResponse[200];
+/**
+ * @description
+ *   更新用户隐私钱包余额
+ * @tags user-private-pocket-controller
+ * @produces *
+ * @consumes application/json
+ */
+export const postCanrdPrivatePocketUpdateBalance = /* #__PURE__ */ (() => {
+  const method = 'post';
+  const url = '/canrd/privatePocket/updateBalance';
+  function request(
+    option: PostCanrdPrivatePocketUpdateBalanceOption,
+  ): Promise<PostCanrdPrivatePocketUpdateBalanceResponseSuccess> {
+    return requester(request.url, {
+      method: request.method,
+      ...option,
+    }) as unknown as Promise<PostCanrdPrivatePocketUpdateBalanceResponseSuccess>;
+  }
+
+  /** http method */
+  request.method = method;
+  /** request url */
+  request.url = url;
+  return request;
+})();
+
 /** @description request parameter type for postCommonAudit */
 export interface PostCommonAuditOption {
   /**