From a64a4c34561220f84acf8a3b90aa2086d3dfde9f Mon Sep 17 00:00:00 2001
From: callmeyan <yaclty2@gmail.com>
Date: Mon, 24 Jun 2024 08:58:14 +0800
Subject: [PATCH] update text

---
 src/pages/bill/query.tsx    | 15 ---------------
 src/pages/pay/index.tsx     |  4 ++--
 src/service/generate-pdf.ts |  2 +-
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/src/pages/bill/query.tsx b/src/pages/bill/query.tsx
index 65ba4e6..d01d159 100644
--- a/src/pages/bill/query.tsx
+++ b/src/pages/bill/query.tsx
@@ -68,21 +68,6 @@ const BillQuery = () => {
     }
     return (<div>
         <SearchForm showApply loading={loading} onSearch={setBillQueryParams}/>
-        {/*<Button onClick={()=>{*/}
-        {/*    Sentry.showReportDialog({*/}
-        {/*        eventId:'Error: Query bill error',//'QueryBill Report'*/}
-        {/*        user:{*/}
-        {/*            email:'123123123',*/}
-        {/*            name:'test'*/}
-        {/*        },*/}
-        {/*        lang:'zh-CN',*/}
-        {/*        title:'看起来出现问题了',*/}
-        {/*        subtitle:'请填写你遇到的问题',*/}
-        {/*        subtitle2:'',*/}
-        {/*        labelComments:'问题类型',*/}
-        {/*        labelName:'问题类型',*/}
-        {/*    })*/}
-        {/*}}></Button>*/}
         <BillList
             type={'query'} loading={loading}
             operationRender={operation} source={data}
diff --git a/src/pages/pay/index.tsx b/src/pages/pay/index.tsx
index 276daab..5f60450 100644
--- a/src/pages/pay/index.tsx
+++ b/src/pages/pay/index.tsx
@@ -83,10 +83,10 @@ const PayIndex = () => {
             <div className={styles.billInfo}>
                 <div className="pay-item">
                     <span className="title">Bill Number:</span>
-                    <span className="value">{bill.student_number || bill.application_number} - {bill.student_english_name}/{bill.student_chinese_name}</span>
+                    <span className="value">{bill.application_number || bill.student_number} - {bill.student_english_name}/{bill.student_chinese_name}</span>
                 </div>
                 <div className="pay-item">
-                    <span className="title">Order Number:</span>
+                    <span className="title">Bill ID:</span>
                     <span className="value">{bill.id}</span>
                 </div>
             </div>
diff --git a/src/service/generate-pdf.ts b/src/service/generate-pdf.ts
index b6d8626..09d4090 100644
--- a/src/service/generate-pdf.ts
+++ b/src/service/generate-pdf.ts
@@ -58,7 +58,7 @@ export function GeneratePdf(bill: BillModel) {
         body: [
             ...(bill.details.map(it=>{
                 return [
-                    `#${it.id || bill.id}`,
+                    `#${bill.id}${it.id?'-' + it.id:''}`,
                     dayjs(bill.paid_at).format('YYYY-MM-DD'),
                     it.bill_type,
                     `${bill.payment_channel}(${bill.payment_method})`,