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

src/pages/CommunityManagement/CellList/Details.tsx

@@ -112,7 +112,7 @@ const Detail = (props: any) => {
               <EyeOutlined />
               &nbsp;Community Details
               <div className="back">
-                {user && user.currentUser.permission.filter((item: any) => (item = 47)) ? (
+                {user && user.currentUser.permission.includes('47') ? (
                   <Button
                     type="primary"
                     danger

src/pages/CommunityManagement/FacilityBookings/BookingDetail.tsx

@@ -81,7 +81,7 @@ const BookingDetail = (props: any) => {
         backFeeStatus: curbackFee == DataSaveDetail.marginFee ? '0' : '1',
         marginFee: DataSaveDetail.marginFee.toString(),
       };
-
+      console.log(RAVAL);
       RA(3, RAVAL);
     }
   };
@@ -166,11 +166,12 @@ const BookingDetail = (props: any) => {
 
             <hr />
 
-            {/* 已交押金且未产生退费 */}
+            {/* 已交押金且未产生退费且不是免费的 */}
             {DataSave &&
             DataSaveDetail &&
             DataSave.managerFeeStatus == 1 &&
-            DataSaveDetail.backMarginFee == 0 ? (
+            DataSaveDetail.backMarginFee == 0 &&
+            DataSaveDetail.managerFee > 0 ? (
               <>
                 <Form
                   ref={formRef}

src/pages/CommunityManagement/FacilityBookings/Facility.tsx

@@ -471,11 +471,11 @@ const Facility = (props: any) => {
             <Input.Group>
               <Form.Item label="Appointment Cycle" rules={NewFaci[8]}>
                 <Select
-                  placeholder="Period"
+                  placeholder="Cycle"
                   allowClear
                   style={{ width: 120 }}
                   disabled={facilityDetail}
-                  value={Cycle ? Cycle : ''}
+                  value={Cycle}
                   onChange={handleChange}
                 >
                   <Option value="1">Week</Option>

src/pages/CommunityManagement/FacilityBookings/FacilityBookings.tsx

@@ -26,7 +26,18 @@ import moment from 'moment';
 const FacilityBookings = (props: any) => {
   const { formatMessage } = useIntl();
 
-  const { dispatch, location, Data, Data2, token, DataSave, curString, Result, loading } = props;
+  const {
+    dispatch,
+    location,
+    Data,
+    Data2,
+    token,
+    DataSave,
+    curString,
+    Result,
+    loading,
+    CommunityList,
+  } = props;
 
   // console.log(Data2);
 
@@ -136,7 +147,7 @@ const FacilityBookings = (props: any) => {
     setColumns2(objectColumns(key2) as any);
     if (curString.tab == 1) {
       RA(9, {
-        communityNameList: JSON.parse(localStorage.getItem('CommunityList') as any),
+        communityNameList: CommunityList,
         userToken: token,
         pageNum: curString.curPage,
         subscribeDate: curString.subscribeDate,
@@ -147,7 +158,7 @@ const FacilityBookings = (props: any) => {
       RA(8, {
         userToken: token,
         pageNum: curString.curPage2,
-        communityNameList: JSON.parse(localStorage.getItem('CommunityList') as any),
+        communityNameList: CommunityList,
       });
     }
   }, []);
@@ -263,7 +274,7 @@ const FacilityBookings = (props: any) => {
               ]}
               time={['key', 'Booking time ']}
               community={'communityName'}
-              checklist={curString.communityNameList != null ? curString.communityNameList : null}
+              checklist={CommunityList}
               onSubmit={CallBackTitleSearch}
             />
           </>
@@ -273,6 +284,7 @@ const FacilityBookings = (props: any) => {
               listkey={['facilityName']}
               list={['Facility name']}
               community={'communityName'}
+              checklist={CommunityList}
               onSubmit={CallBackTitleSearch}
             />
           </>
@@ -400,6 +412,7 @@ function mapStateToProps(state: any) {
       ? true
       : state.loading.models.FacilityBookings;
 
+  const { CommunityList } = state.Init; // 小区列表
   return {
     Data,
     Data2,
@@ -408,6 +421,7 @@ function mapStateToProps(state: any) {
     Result,
     token,
     loading,
+    CommunityList,
   };
 }
 export default connect(mapStateToProps)(FacilityBookings);