From 62e86a8705dedfa9c86dc972b87cc7e9e475589d Mon Sep 17 00:00:00 2001
From: lyp <lyp@123.com>
Date: Tue, 4 Mar 2025 23:27:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/payment/Payment.tsx | 182 +++++++++++++++--------------
 src/route/proj/ProjNew.tsx         |  10 +-
 2 files changed, 102 insertions(+), 90 deletions(-)

diff --git a/src/components/payment/Payment.tsx b/src/components/payment/Payment.tsx
index 0c5a565..46c269a 100644
--- a/src/components/payment/Payment.tsx
+++ b/src/components/payment/Payment.tsx
@@ -114,9 +114,15 @@ export default function Payment(props: IPaymentProps) {
 
                 }
             },
+            onBefore() {
+                setTableLoading(true);
+            },
             onSuccess({ data }) {
                 setPackList(data.rows);
                 setPackTotal(data.total);
+            },
+            onFinally() {
+                setTableLoading(false)
             }
         })
     }
@@ -273,6 +279,7 @@ export default function Payment(props: IPaymentProps) {
     const [messageApi, messageApiContext] = useMessage();
     const [isRechargeMoneyEdit, setIsRechargeMoneyEdit] = useState(false);
     const [isLoading, setIsLoading] = useState(false);
+    const [tableLoading, setTableLoading] = useState(false);
     const [rechargeVoucherArray, setRechargeVoucherArray] = useState<string[]>([]);
 
     const [accountRechargeId, setAccountRechargeId] = useState('');
@@ -542,7 +549,7 @@ export default function Payment(props: IPaymentProps) {
                             </colgroup>
                             <tbody>
                                 <tr>
-                                    <td className="table-label">公司名称 <span style={{color:'red'}}>*</span></td>
+                                    <td className="table-label">公司名称 <span style={{ color: 'red' }}>*</span></td>
                                     <td>
                                         <Form.Item
                                             name="orgName"
@@ -554,7 +561,7 @@ export default function Payment(props: IPaymentProps) {
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td className="table-label">开户银行 <span style={{color:'red'}}>*</span></td>
+                                    <td className="table-label">开户银行 <span style={{ color: 'red' }}>*</span></td>
                                     <td>
                                         <Form.Item
                                             name="orgBank"
@@ -566,7 +573,7 @@ export default function Payment(props: IPaymentProps) {
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td className="table-label">银行账号 <span style={{color:'red'}}>*</span></td>
+                                    <td className="table-label">银行账号 <span style={{ color: 'red' }}>*</span></td>
                                     <td>
                                         <Form.Item
                                             name="orgNumber"
@@ -578,7 +585,7 @@ export default function Payment(props: IPaymentProps) {
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td className="table-label">打款时间 <span style={{color:'red'}}>*</span></td>
+                                    <td className="table-label">打款时间 <span style={{ color: 'red' }}>*</span></td>
                                     <td>
                                         <Form.Item
                                             name="rechargeFinalTime"
@@ -595,7 +602,7 @@ export default function Payment(props: IPaymentProps) {
                                     </td>
                                 </tr>
                                 <tr>
-                                    <td className="table-label">打款凭证<span style={{color:'red'}}>*</span></td>
+                                    <td className="table-label">打款凭证<span style={{ color: 'red' }}>*</span></td>
                                     <td>
                                         <Form.Item
                                             name="rechargeVoucher"
@@ -981,92 +988,97 @@ export default function Payment(props: IPaymentProps) {
 
                             </div>
                             <div>
-                                <div style={{
-                                    display: packList.length > 0 ? 'unset' : 'none',
-                                    marginLeft: 90
-                                }}>
-
-                                    <Table
-                                        columns={packColumns}
-                                        dataSource={packList}
-
-
-                                        className='packTable'
-                                        bordered
-                                        style={{
-                                            width: '731px',
-                                            height: '441px',
-                                            overflow: 'hidden'
-                                        }}
-
-                                        pagination={
-
-                                            false
-                                        }
-                                        rowKey="packageInfoId"
-
-                                    />
+                                <Spin tip="正在加载..." spinning={tableLoading}>
                                     <div style={{
-                                        display: packTotal > 7 ? 'unset' : 'none',
+                                        display: packList.length > 0 ? 'unset' : 'none',
+                                        marginLeft: 90
+                                    }}>
+
+
+                                        <Table
+                                            columns={packColumns}
+                                            dataSource={packList}
+
+
+                                            className='packTable'
+                                            bordered
+                                            style={{
+                                                width: '731px',
+                                                height: '441px',
+                                                overflow: 'hidden'
+                                            }}
+
+                                            pagination={
+
+                                                false
+                                            }
+                                            rowKey="packageInfoId"
+
+                                        />
+
+                                        <div style={{
+                                            display: packTotal > 7 ? 'unset' : 'none',
+                                        }}>
+                                            <div style={{
+                                                display: 'flex',
+                                                marginTop: 10,
+                                            }}>
+                                                <div className='clickPage'
+                                                    onClick={() => {
+                                                        if (packPage > 1) {
+                                                            setPackPage(packPage - 1);
+                                                            getPackageList(value, packPage - 1);
+                                                        } else {
+                                                            messageApi.error('已经是第一页了');
+                                                        }
+                                                    }}
+                                                    style={{
+                                                        cursor: packPage > 1 ? 'pointer' : 'not-allowed',
+                                                        background: packPage > 1 ? '#abc8ff' : '#BAC8DA',
+                                                    }}
+                                                >上一页</div>
+                                                <div className='clickPage' style={{
+                                                    marginLeft: 10,
+                                                    cursor: packPage < packTotal / 7 ? 'pointer' : 'not-allowed',
+                                                    background: packPage < packTotal / 7 ? '#abc8ff' : '#BAC8DA',
+                                                }}
+                                                    onClick={() => {
+                                                        if (packPage < packTotal / 7) {
+                                                            setPackPage(packPage + 1);
+                                                            getPackageList(value, packPage + 1);
+                                                        } else {
+                                                            messageApi.error('已经是最后一页了');
+                                                        }
+                                                    }}
+
+                                                >下一页</div>
+                                            </div>
+                                        </div>
+
+                                    </div>
+                                    <div style={{
+                                        display: packList.length <= 0 ? 'unset' : 'none',
+                                        marginLeft: 90
                                     }}>
                                         <div style={{
-                                            display: 'flex',
-                                            marginTop: 10,
+                                            // border: '1px solid #BAC8DA',
                                         }}>
-                                            <div className='clickPage'
-                                                onClick={() => {
-                                                    if (packPage > 1) {
-                                                        setPackPage(packPage - 1);
-                                                        getPackageList(value, packPage - 1);
-                                                    } else {
-                                                        messageApi.error('已经是第一页了');
-                                                    }
-                                                }}
-                                                style={{
-                                                    cursor: packPage > 1 ? 'pointer' : 'not-allowed',
-                                                    background: packPage > 1 ? '#abc8ff' : '#BAC8DA',
-                                                }}
-                                            >上一页</div>
-                                            <div className='clickPage' style={{
-                                                marginLeft: 10,
-                                                cursor: packPage < packTotal / 7 ? 'pointer' : 'not-allowed',
-                                                background: packPage < packTotal / 7 ? '#abc8ff' : '#BAC8DA',
-                                            }}
-                                                onClick={() => {
-                                                    if (packPage < packTotal / 7) {
-                                                        setPackPage(packPage + 1);
-                                                        getPackageList(value, packPage + 1);
-                                                    } else {
-                                                        messageApi.error('已经是最后一页了');
-                                                    }
-                                                }}
-
-                                            >下一页</div>
+                                            <Image
+                                                src={nodate}
+                                                width={730}
+                                                // 点击禁止放大
+                                                preview={false}
+                                            ></Image>
                                         </div>
+                                        <div style={{
+                                            color: '#BAC8DA ',
+                                            fontSize: 16,
+                                            textAlign: 'center',
+                                            // background:'pink',
+                                            marginLeft: 20
+                                        }}>暂无服务包</div>
                                     </div>
-                                </div>
-                                <div style={{
-                                    display: packList.length <= 0 ? 'unset' : 'none',
-                                    marginLeft: 90
-                                }}>
-                                    <div style={{
-                                        // border: '1px solid #BAC8DA',
-                                    }}>
-                                        <Image
-                                            src={nodate}
-                                            width={730}
-                                            // 点击禁止放大
-                                            preview={false}
-                                        ></Image>
-                                    </div>
-                                    <div style={{
-                                        color: '#BAC8DA ',
-                                        fontSize: 16,
-                                        textAlign: 'center',
-                                        // background:'pink',
-                                        marginLeft: 20
-                                    }}>暂无服务包</div>
-                                </div>
+                                </Spin>
                             </div>
                         </div>
                         <div className='payBoxRight'>
diff --git a/src/route/proj/ProjNew.tsx b/src/route/proj/ProjNew.tsx
index 54c14e1..3b9912a 100644
--- a/src/route/proj/ProjNew.tsx
+++ b/src/route/proj/ProjNew.tsx
@@ -587,14 +587,14 @@ export default function ProjNew() {
                                         top: 10,
                                     }}>推荐</a>
                                 <div style={{
-                                    position: 'absolute', left: 185,
+                                    position: 'absolute', left: 165,
                                     display: showTip ? 'unset' : 'none',
                                     color: 'green',
                                 }}>系统全称建议以“软件”、“系统”、“平台”或“APP”结尾</div>
                             </div>
                             <div style={{
                                 display: 'flex',
-                                marginTop: 10
+                                marginTop: 20
                             }}>
 
                                 <div className='formItemOne' style={{ position: 'relative' }}>
@@ -644,7 +644,7 @@ export default function ProjNew() {
                             </div>
                             <div style={{
                                 display: 'flex',
-                                marginTop: 10
+                                marginTop: 20
                             }}>
                                 <div className='formItemOne' style={{}}>
                                     <div className='formItem-title oneTitle'>系统版本<span style={{color:'red'}}>*</span></div>
@@ -693,7 +693,7 @@ export default function ProjNew() {
 
                             <div style={{
                                 display: 'flex',
-                                marginTop: 10
+                                marginTop: 20
                             }}>
 
                                 {/* <div className='formItemOne' style={{}}>
@@ -825,7 +825,7 @@ export default function ProjNew() {
                             </div>
                             <div style={{
                                 display: 'flex',
-                                marginTop: 10
+                                marginTop: 20
                             }}>
 
                                 <div style={{ display: couponShow ? 'unset' : 'none' }}>