From 02372a94c2f4eb422c66465f2bbb03fb1112f4cc Mon Sep 17 00:00:00 2001
From: qiaomu <3520484422@qq.com>
Date: Mon, 28 Jul 2025 10:28:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=94=B6=E6=AC=BE=E9=87=91?=
 =?UTF-8?q?=E9=A2=9D=E4=B8=BA=E7=8E=B0=E9=87=91=E6=94=AF=E4=BB=98=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.tsx           | 14 +++++++-------
 src/queries/charge.ts | 18 +++++++++++-------
 vite.config.ts        | 10 +++++++++-
 3 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index 4b8f358..5632416 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -11,7 +11,7 @@ function App() {
     };
 
     const id = getQueryParam('id');
-    console.log('id', id)
+
     const [data, setData] = useState<TopUpDetail>()
 
     useEffect(() => {
@@ -57,8 +57,8 @@ function App() {
                   <td colSpan={9} style={{textAlign: 'center'}}>预付电费收款票据</td>
               </tr>
               <tr>
-                  <td style={{width: '40px'}}>用户编号：</td>
-                  <td style={{width: '58px'}}>{data?.tenement}</td>
+                  <td style={{width: '40px'}}>用户名称：</td>
+                  <td style={{width: '58px'}}>{data?.tenementName}</td>
                   <td style={{width: 70}}>开票日期：</td>
                   <td colSpan={2} style={{width: 80}}>{data?.toppedUpAt}</td>
                   <td></td>
@@ -83,11 +83,11 @@ function App() {
                           )
                       )
                   }
-                  <td style={{wordBreak: 'break-all'}}>{data?.meter}</td>
+                  <td style={{wordBreak: 'break-all'}}>{data?.meterCode}</td>
                   <td>{data?.meterAddress}</td>
 
                   {
-                      data?.paymentType ? <td>{RechargeWay[data?.paymentType]}</td> : <td></td>
+                      data?.paymentType || data?.paymentType === 0 ? <td>{RechargeWay[data?.paymentType]}</td> : <td></td>
                   }
                   <td>{(Number(data?.amount) || 0).toFixed(2)}</td>
                   <td>{data?.voucherNo}</td>
@@ -109,9 +109,9 @@ function App() {
               </tr>
               <tr>
                   <td>收费员：</td>
-                  <td>{data?.operatorName}</td>
+                  <td>{data?.auditorName}</td>
                   <td>缴款人：</td>
-                  <td colSpan={2}>{data?.tenementName},{data?.meterAddress}</td>
+                  <td colSpan={2}>{data?.tenementName}{data?.phone ? '-' + data?.phone : ''},{data?.meterAddress}</td>
                   <td colSpan={3}>开票单位：（盖章有效）</td>
               </tr>
 
diff --git a/src/queries/charge.ts b/src/queries/charge.ts
index 59b92bb..4b6b990 100644
--- a/src/queries/charge.ts
+++ b/src/queries/charge.ts
@@ -74,13 +74,17 @@ export interface TopUpDetail {
      */
     id: string;
     /**
-     * 表计编号
+     * 表计id
      */
     meter: string;
     /**
      * 表计地址
      */
     meterAddress: string;
+    /**
+     * 表计code
+     */
+    meterCode: string;
     /**
      * 操作员ID
      */
@@ -94,7 +98,7 @@ export interface TopUpDetail {
      */
     paymentAt: string;
     /**
-     * 充值方式，0：现金，1：银行卡，2：支付宝，3：微信，4：云闪付
+     * 充值方式，0：现金，1：银行卡，2：支付宝，3：微信，4：云闪付，5：对公，6-C端充值
      */
     paymentType: number;
     /**
@@ -117,15 +121,15 @@ export interface TopUpDetail {
      * 充值时间，格式：yyyy-MM-dd HH:mm:ss
      */
     toppedUpAt: string;
+    /**
+     * 类型，0充值 1冲正 2电费 3退费
+     */
+    type: number;
     /**
      * 付款凭证号
      */
     voucherNo: null | string;
-    /**
-     * 0充值 1冲正 2电费 3退费
-     */
-    type: number,
-    [property: string]: any;
+    phone?: string,
 }
 
 export enum RechargeWay {
diff --git a/vite.config.ts b/vite.config.ts
index 1b32f87..83dd1f5 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -10,8 +10,16 @@ export default defineConfig({
   server: {
     port: 3001,
     proxy: {
+
+      '/api3': {
+        target: `https://zgd.hbhcbn.com/`,
+        changeOrigin: true,
+        secure: false,
+        // rewrite: path => path.replace(/^\/api3/, "")
+      },
       '/api': {
-        target: `http://localhost:8000/api`,
+        // target: `http://localhost:8000`,
+        target: `https://zgd.hbhcbn.com/api3/`,
         changeOrigin: true,
         secure: false,
         rewrite: path => path.replace(/^\/api/, "")