From 8af28450fbf8cca2549518d7b39599483c7a6f4b Mon Sep 17 00:00:00 2001
From: lisf <lisf@yisa.com>
Date: Fri, 22 Dec 2023 11:29:05 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../OtherBusiness/ParkingCard/ParkingCardMgm/index.scss    |  4 +++-
 .../OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx  | 14 +++++++-------
 .../OtherBusiness/ParkingCard/ParkingCardOrder/index.scss  |  2 +-
 .../ParkingCard/ParkingCardOrder/loadable.jsx              |  8 ++++----
 .../OtherBusiness/ParkingCard/ParkingCardStat/index.scss   |  2 +-
 .../OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx |  6 +++---
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss
index 680273f..2cc240d 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/index.scss
@@ -57,6 +57,7 @@ $color-primary: var(--color-primary);
         .yisa-search {
             margin-top: 10px;
             display: flex;
+            justify-content: center;
             label {
                 line-height: 31px;
             }
@@ -77,6 +78,7 @@ $color-primary: var(--color-primary);
             .btnBox {
                 display: flex;
                 margin-top: 20px;
+               
                 .yisa-btn {
                     margin-left: 20px;
                     width: 85px;
@@ -124,7 +126,7 @@ $color-primary: var(--color-primary);
                 margin-bottom: 10px;
                 display: inline-block;
 
-                em {
+                span {
                     color: #3aa8fe;
                     margin: 0 5px;
                 }
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
index d549aee..0ea33ed 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
@@ -735,7 +735,7 @@ function ParkingCardMgm(props) {
             <div className="paid-search">
                 <label className="search">查询条件</label>
                 <div className="yisa-search">
-                    <label>商品名称</label>
+                    <label style={{marginRight:12}}>商品名称</label>
                     <Input
                         placeholder="请输入"
                         value={formData.name}
@@ -774,10 +774,10 @@ function ParkingCardMgm(props) {
                 </div>
                 <div className="timePicker yisa-search">
                     <div className="btnBox">
-                        <Button type="primary" className="yisa-btn colorBtn" icon={<SearchOutlined />} onClick={() => { getSearchData() }}>
-                            搜索
+                        <Button type="primary" className="yisa-btn colorBtn" style={{width:85}} icon={<SearchOutlined />} onClick={() => { getSearchData() }}>
+                            查询
                         </Button>
-                        <Button type="primary" className="yisa-btn colorBtn" icon={<PlusOutlined />} onClick={() => { addData() }}>
+                        <Button type="primary" className="yisa-btn colorBtn" style={{width:110}} icon={<PlusOutlined />} onClick={() => { addData() }}>
                             添加
                         </Button>
                     </div>
@@ -785,7 +785,7 @@ function ParkingCardMgm(props) {
             </div>
             <div className="paid-result">
                 <div className="result">
-                    <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                    <span className="font">共检索到<span>{resultData.total}</span>条结果</span>
                     <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered
@@ -1107,9 +1107,9 @@ function ParkingCardMgm(props) {
                  <em style={{marginRight:'5px',marginLeft:'-13px',color:'red'}}>*</em>
                     <label>销售价格</label>
                      <InputNumber
-                        value={checkData.original_price && checkData.discount_amount ? 
+                        value={checkData.original_price  && checkData.discount_amount !== '' ? 
                             (checkData.original_price - checkData.discount_amount).toFixed(2)
-                            :''
+                            : ''
                         }
                         style={{ width: 250, marginLeft: 20 }}
                         disabled={true}
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/index.scss b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/index.scss
index 110e5f2..a0173e0 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/index.scss
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/index.scss
@@ -127,7 +127,7 @@ $color-primary : var(--color-primary);
                 margin-bottom: 10px;
                 display: inline-block;
 
-                em {
+                span {
                     color: #3aa8fe;
                     margin: 0 5px;
                 }
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
index e4f56dd..1daedbb 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
@@ -150,7 +150,7 @@ function ParkingCardOrder() {
         equipment:"0",//支付设备
         serial_number:'',//渠道流水号
         start_time: moment(moment().startOf("days")).format("YYYY-MM-DD HH:mm:ss"),//支付开始时间
-        end_time: moment().format("YYYY-MM-DD HH:mm:ss"),//支付结束时间
+        end_time: moment().format("YYYY-MM-DD 23:59:59"),//支付结束时间
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     })
@@ -655,7 +655,7 @@ function ParkingCardOrder() {
                             className="yisa-btn colorBtn" 
                             icon={<SearchOutlined />} 
                             onClick={()=>getSearchData()}>
-                            搜索
+                            查询
                         </Button>
                         <Button 
                             type="primary" 
@@ -663,7 +663,7 @@ function ParkingCardOrder() {
                             icon={<PlusOutlined />} 
                             onClick={() => {addCardOrder()}}
                             style={{width:110}}>
-                            添加订单
+                            添加
                         </Button>
                         <Button 
                             type="primary" 
@@ -681,7 +681,7 @@ function ParkingCardOrder() {
                 <div className="result">
                     {!isShowDetail ? 
                         <>
-                          <span className="font">共检索到<em>{resultData.total}</em>条结果</span>
+                          <span className="font">共检索到<span>{resultData.total}</span>条结果</span>
                           <ResultFlowResult ajaxLoad={ajaxLoading} resultData={resultData.data ? resultData.data : []}>
                         <Table
                             bordered
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/index.scss b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/index.scss
index 7444293..c0bb6e5 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/index.scss
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/index.scss
@@ -171,7 +171,7 @@ $color-primary : var(--color-primary);
                 width: 100%;
                 display: flex;
                 justify-content: space-evenly;
-                margin-bottom: 40px;
+                margin-bottom: 20px;
                 .data-item{
                     display: flex;
                     flex-direction: column;
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx
index 477109b..6c3a12e 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardStat/loadable.jsx
@@ -40,7 +40,7 @@ function ParkingCardStat() {
     // 表单数据
     const [formData, setFormData] = useSetState({
         start_date:moment(moment().startOf("days")).format("YYYY-MM-DD HH:mm:ss"), // 开始时间
-        end_date:moment().format("YYYY-MM-DD HH:mm:ss")  // 结束时间
+        end_date:moment().format("YYYY-MM-DD 23:59:59")  // 结束时间
     })
     const [dataList, setDataList] = useState([])
     // 加载
@@ -189,7 +189,7 @@ function ParkingCardStat() {
                                     icon={<SearchOutlined />} 
                                     style={{width:245}}
                                     onClick={()=>{getStaData()}}>
-                                    搜索
+                                    查询
                                 </Button>
                             </div>
                         </div>
@@ -233,7 +233,7 @@ function ParkingCardStat() {
                                 columns={tableColumns}
                                 pagination={false}
                                 loading={ajaxLoading}
-                                scroll={{y:600}}
+                                // scroll={{y:600}}
                             />
                         </ResultFlowResult>
                         {/* <div className="line-chart">