diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
index 9e015b3..bf48227 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardMgm/loadable.jsx
@@ -27,7 +27,7 @@ function ParkingCardMgm(props) {
         name: '',//商品名称
         channel: 0,//销售渠道
         status: 0,//销售状态
-        operator_id: '0',//商户名称
+        operator_id: "0",//商户名称
         pn: 1,
         page_size: Number(pageSizeOptions[0]),  // 每页条数
     }
@@ -149,7 +149,7 @@ function ParkingCardMgm(props) {
             key: 'channel_name',
         },
         {
-            title: '商品状态',
+            title: '销售状态',
             dataIndex: 'status_name',
             key: 'status_name',
         },
@@ -365,7 +365,7 @@ function ParkingCardMgm(props) {
         })
     }
     const [getMerchantDataName, setGetMerchantDataName] = useState([])
-    const [getMerchantDataName1, setGetMerchantDataName1] = useState([])
+    const [getMerchantDataName1, setGetMerchantDataName1] = useState([{value:'0',label:'全部'}])
     const merchantDataName = () => {
         ajax.getOperator().then(res => {
             let result = JSON.parse(JSON.stringify(res.data))
@@ -416,7 +416,7 @@ function ParkingCardMgm(props) {
         );
     };
     //生效日期
-    const [value, setValue] = useState(!checkData.days ? 1 : 2);
+    const [value, setValue] = useState(1);
     const onChangeTime = (e) => {
         setCheckData({
             ...checkData,
@@ -722,6 +722,11 @@ function ParkingCardMgm(props) {
             getEtcStatus(checkData.operator_id)
         }
     }, [checkData.operator_id])
+    useEffect(() => {
+        if(checkData.days){
+            setValue(2)
+        }
+    }, [checkData.days])
     return <>
         <div className="paid-ParkingCardMgm">
             <div className="paid-search">
@@ -824,7 +829,7 @@ function ParkingCardMgm(props) {
                     <Descriptions.Item label="停车卡名称" span={2}>
                         {cardItem?.name || '---'}
                     </Descriptions.Item>
-                    <Descriptions.Item label="商品状态" span={1.5}>
+                    <Descriptions.Item label="销售状态" span={1.5}>
                         {cardItem?.status_name || '---'}
                     </Descriptions.Item>
                     <Descriptions.Item label="生效日期" span={3}>
@@ -1095,7 +1100,7 @@ function ParkingCardMgm(props) {
                     <label>销售价格</label>
                      <InputNumber
                         placeholder="输入内容"
-                        value={checkData.original_price - checkData.discount_amount}
+                        value={(checkData.original_price - checkData.discount_amount).toFixed(2)}
                         style={{ width: 250, marginLeft: 20 }}
                         disabled={true}
                         />
diff --git a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
index 400ceaa..4e91763 100644
--- a/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
+++ b/src/pages/OperationCenter/OtherBusiness/ParkingCard/ParkingCardOrder/loadable.jsx
@@ -457,7 +457,7 @@ function ParkingCardOrder() {
                             },
                             {
                                 value: '1',
-                                label: '线上录入'
+                                label: '线上销售'
                             },
                             {
                                 value: '2',
@@ -615,8 +615,9 @@ function ParkingCardOrder() {
                 <div className="yisa-search">
                     <label>支付时间</label>
                     <RangePicker
-                    style={{ width: 270 }}
-                        disabledDate={disabledDate}
+                        allowClear={false}
+                        style={{ width: 270 }}
+                        // disabledDate={disabledDate}
                         // disabledTime={disabledRangeTime}
                         showTime
                         onChange={(dates, dateStrings) => {
@@ -797,7 +798,7 @@ function ParkingCardOrder() {
                                                         },
                                                         {
                                                             value: '5',
-                                                            label: '黑'
+                                                            label: '白'
                                                         }
                                                     ]}
                                                     onChange={(e) => {setUpdataOrder({plate_type:e})}}
@@ -925,6 +926,10 @@ function ParkingCardOrder() {
                             {
                                 value: '4',
                                 label: '黑'
+                            },
+                            {
+                                value: '5',
+                                label: '白'
                             }
                         ]}
                         onChange={(e) => {setAddOrderData({plate_type:e})}}