Signed-off-by: cellee <893264950@qq.com>

src/pages/CommunityManagement/FacilityBookings/BookingDetail.tsx

@@ -157,11 +157,21 @@ const BookingDetail = (props: any) => {
             <hr />
 
             {/* 已交押金且未产生退费且不是免费的 */}
-            {(DataSave &&
+            {/* {(DataSave &&
               DataSaveDetail &&
               DataSave.managerFeeStatus == 1 &&
               DataSaveDetail.backMarginFee == 0 &&
               DataSaveDetail.managerFee > 0) ||
+            (DataSaveDetail.managerFee == 0 &&
+              DataSaveDetail.marginFee > 0 &&
+              DataSave.status != 3 &&
+                DataSave.status != 5) ? ( */}
+
+            {(DataSave &&
+              DataSaveDetail &&
+              DataSave.managerFeeStatus == 1 &&
+              DataSaveDetail.backMarginFee == 0 &&
+              DataSaveDetail.marginFee > 0) ||
             (DataSaveDetail.managerFee == 0 &&
               DataSaveDetail.marginFee > 0 &&
               DataSave.status != 3 &&

src/pages/CommunityManagement/FacilityBookings/Bookings.tsx

@@ -203,7 +203,7 @@ const Bookings = (props: any) => {
         message.error('Reservation period already exists!');
         return false;
       } else {
-        console.log(tmp);
+        delete tmp.Time;
         RA(11, tmp);
       }
     }
@@ -226,7 +226,7 @@ const Bookings = (props: any) => {
     // 然后在做切换
     Data3.map((item: any, index: any) => {
       item.categorieList.map((thing: any, i: any) => {
-        if (thing.categoriesId == e.target.value) {
+        if (thing.categoriesId == e.target.value.categoriesId) {
           setCurString({
             communityManagerFee: parseInt(item.communityManagerFee).toFixed(2),
             communityMargin: parseInt(item.communityMargin).toFixed(2),
@@ -360,7 +360,7 @@ const Bookings = (props: any) => {
                           </i>
                           {item.categorieList.map((thing: any, i: any) => {
                             return (
-                              <Radio key={thing.categoriesId} value={thing.categoriesId}>
+                              <Radio key={thing.categoriesId} value={thing}>
                                 {thing.categoriesName}
                               </Radio>
                             );

src/pages/CommunityManagement/FacilityBookings/FacilityBookings.tsx

@@ -272,6 +272,7 @@ const FacilityBookings = (props: any) => {
         status: curString.status,
         subscribeDate: curString.subscribeDate,
         pageNum: curString.curPage,
+        globalMark: curString.globalMark,
       });
     } else {
       RA(8, {