fix

src/components/ImgPreview/index.jsx

+import React, { useState, useEffect } from 'react';
+import Carousel, { Modal, ModalGateway } from 'react-images';
+
+const Lightbox = (props) => {
+  const { images = [], open, onClose } = props;
+  const [modalIsOpen, setModalIsOpen] = useState(open)
+  useEffect(() => {
+    setModalIsOpen(open)
+  }, [images, open])
+
+  const toggleModal = () => {
+    setModalIsOpen(!modalIsOpen)
+    if (typeof onClose === 'function') {
+      onClose()
+    }
+
+  }
+  const styleInit = {
+    header: (base, state) => ({ //头部样式
+      position: 'absolute',
+      top: 90,
+      right: 90,
+      zIndex: 9999,
+    }),
+    view: (base, state) => ({
+      textAlign: 'center',
+      height: state.isFullscreen?'100%':600  //当点击全屏的时候图片样式
+    })
+  }
+  return (
+    <ModalGateway >
+      {modalIsOpen ? (
+        <Modal onClose={toggleModal} >
+          <Carousel views={images} styles={styleInit}/>
+        </Modal>
+      ) : null}
+    </ModalGateway>
+  );
+
+}
+
+
+export default Lightbox

src/components/Poster/Form.jsx

 const updateData = fetch(apis.activity.updatePoster)
 
 const PosterForm = (props) => {
-  const { form, targetId, targetType, rights } = props
+  const { form, targetId, targetType, rights,submitBtn=true } = props
   const { getFieldDecorator, resetFields, setFieldsValue, validateFields } = form
 
   const [formData, setFormData] = useState()
       </Form.Item>*/}
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
         <AuthButton name={rights}>
-          <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+          {submitBtn&&<Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>}
         </AuthButton>
         {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button>  */}
       </Form.Item>

src/components/Poster/index.jsx

 const noop = x => x;
 
 export default (props) => {
-  const { target, rights, onCancel = noop } = props
+  const { target, rights, onCancel = noop,submitBtn=true } = props
   const { id: targetId, type: targetType } = target
 
   const [posterImg, setPosterImg] = useState()
           rights={rights}
           onImageChange={setPosterImg}
           onCancel={onCancel}
+          submitBtn={submitBtn}
         />
       </div>
     </div>

src/components/Share/index.jsx

 const updateData = fetch(apis.activity.updateShareContent)
 
 const ShareForm = (props) => {
-  const { target, form, rights } = props
+  const { target, form, rights,submitBtn=true } = props
   const { id: targetId, type: targetType } = target
   const { getFieldDecorator, resetFields, setFieldsValue, validateFields } = form
 
       })(<ImageUpload />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <AuthButton name={rights}>
-          <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
+      {submitBtn&&<><AuthButton name={rights}>
+         <Button loading={loading} style={{marginLeft: '4em'}} type="primary" htmlType="submit">保存</Button>
         </AuthButton>
-        <Button style={{marginLeft: '2em'}} onClick={onCancel}>清空</Button>
+        <Button style={{marginLeft: '2em'}} onClick={onCancel}>清空</Button></>}
       </Form.Item>
     </Form>
   )

src/components/XForm/ImageListUpload.jsx

           fileList={fileList}
           onPreview={this.handlePreview}
           onChange={this.handleChange}
+          disabled={this.props.disabled}
           {...uploaderProps}
           onSuccess={this.handleUploadSucess}
         >
           {/* unlimited 表示上传无限制数量 */}
           {(this.props.unlimited && uploadButton) ||
-            ((fileList || images).length >= 8 ? null : uploadButton)}
+            ((fileList || images).length >= 100 ? null : uploadButton)}
         </Upload>
         <Modal id={'ImageListUpload-preview'} visible={previewVisible} footer={null} onCancel={this.handleCancel}>
           <img alt="example" style={{ width: '100%' }} src={getImgURL(previewImage)} />

src/pages/building/Edit/AlbumList/List.jsx

 const { Panel } = Collapse;
 
 const ImageList = props => {
-  const { data,updateImg } = props;
+  const { data,updateImg ,isPublish} = props;
   const [imageList, setImageList] = useState([]);
 
   function getImgUrl() {
     setImageList(getImgUrl());
   }, [data]);
 
-  return <ImageListUpload value={imageList} disabled onChange={onImageChange} unlimited={false} />;
+  return <ImageListUpload value={imageList} disabled={isPublish} onChange={onImageChange} unlimited={false} />;
 };
 
 export default props => {
-  const { dataList = [] } = props;
+  const { dataList = [] ,isPublish} = props;
 
   const Extra = item => (
     <>
     <Collapse defaultActiveKey={['0']} expandIconPosition="right" style={{ marginTop: '2em' }}>
       {dataList.map((row, index) => {
         return (
-          <Panel header={row.apartmentName} key={index} extra={Extra(row)}>
-            <ImageList data={row} updateImg={props.updateImg}></ImageList>
+          <Panel header={row.apartmentName} key={index} extra={!isPublish&&Extra(row)}>
+            <ImageList data={row} updateImg={props.updateImg} isPublish={isPublish}></ImageList>
           </Panel>
         );
       })}

src/pages/building/Edit/AlbumList/index.jsx

 import List from './List';
 import ModalForm from '../components/ModalForm';
 
+
 export default props => {
   const [visible, setVisible] = useState(false);
-  const { history } = props;
+  const { history,isPublish } = props;
   const { query } = history.location;
   const { id } = query;
 
   const [confirmLoading, setConfirmLoading] = useState(false);
   const albumRef = useRef();
 
+
+
   const getList = () => {
     // const urlData = { id };
     // const params = { apartmentType: 'apart' };
   }
 
   const updateApartment = data => {
-  // const values= {}
-
-    // setLoading(true);
-
     return request({
       ...apis.building.buildingApartmentUpdate,
-      // urlData: { id: data.apartmentId },
       data
 
     })
-    //   .then(() => {
-    //     console.log('删除成功');
-    //     message.success('删除成功');
-    //     getList();
-    //   })
-    //   .catch(err => {
-    //     console.log('删除失败');
-    //   });
-    // deleteData({ urlData })
-    //   .then(() => {
-    //     getList();
-    //     message.success('删除成功');
-    //     setLoading(false);
-    //   })
-    //   .catch(err => {
-    //     console.error(err.message || err);
-    //     setLoading(false);
-    //   });
   };
 
   const handleSuccess = () => {
     <div>
       <div>
         <AuthButton name="building.photo.add">
-          <Button type="primary" onClick={() => setVisible(true)}>
+          {!isPublish&&<Button type="primary" onClick={() => setVisible(true)}>
             新增相册
-          </Button>
+          </Button>}
         </AuthButton>
       </div>
       <Form
         onRename={onRename}
         onDelete={handleDelete}
         updateImg={updateApartment}
+        isPublish={isPublish}
       />
       <Modal
         title="相册名称"

src/pages/building/Edit/Apartment/List.jsx

-import React from 'react'
-import { Button, Table, Popconfirm } from 'antd'
-import AuthButton from '@/components/AuthButton'
-import moment from 'moment'
-import { getImgURL } from '@/utils/image'
+import React, { useState } from 'react';
+import { Button, Table, Popconfirm, Modal } from 'antd';
+import AuthButton from '@/components/AuthButton';
+import moment from 'moment';
+import { getImgURL } from '@/utils/image';
+import ZmageImg from '@/components/ZmageImg/ZmageImg';
 // import ImgPreview from '@/components/ImgPreview'
 
 const saleType = [
     id: 4,
     name: '在租',
   },
-]
+];
 
 const houseType = [
   {
     id: 5,
     name: '5室及以上',
   },
-]
+];
+
+export default props => {
+  const {isPublish} =props
+  const [visible, setVisible] = useState(false);
 
-export default (props) => {
   const columns = [
     {
       title: '户型名称',
       title: '销售状态',
       dataIndex: 'marketStatus',
       key: 'marketStatus',
-      render: (_, record) => <span>{(saleType.filter(x => x.id == record.marketStatus)[0] || {}).name}</span>,
+      render: (_, record) => (
+        <span>{(saleType.filter(x => x.id == record.marketStatus)[0] || {}).name}</span>
+      ),
     },
     {
       title: '户型',
       dataIndex: 'houseType',
       key: 'houseType',
-      render: (_, record) => <span>{(houseType.filter(x => x.id == record.houseType)[0] || {}).name}</span>,
+      render: (_, record) => (
+        <span>{(houseType.filter(x => x.id == record.houseType)[0] || {}).name}</span>
+      ),
     },
     {
       title: '面积',
       dataIndex: 'buildingArea',
       key: 'buildingArea',
-      render: (buildingArea, _) => <span>{`${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}`}</span>,
+      render: (buildingArea, _) => (
+        <span>{`${buildingArea === 0 || buildingArea === null ? '-' : buildingArea + 'm²'}`}</span>
+      ),
     },
-    // {
-    //   title: '户型图',
-    //   dataIndex: 'buildingImgList',
-    //   key: 'buildingImgList',
-    //   render: (buildingImgList, _) =>  <ImgPreview images={[{ src:getImgURL(buildingImgList[0].url) }]}></ImgPreview>  ,
-    // },
-    // <Zmage src={getImgURL(buildingImgList[0].url)}   />
+    {
+      title: '户型图',
+      dataIndex: 'buildingImgList',
+      key: 'buildingImgList',
+      render: (buildingImgList, _) => (
+        <img
+          src={getImgURL(buildingImgList[0].url)}
+          onClick={() => setVisible(buildingImgList[0].url)}
+          width={128}
+          height={72}
+          style={{ borderRadius: '4px' }}
+          alt=""
+        />
+      ),
+    },
+
     {
       title: '创建时间',
       dataIndex: 'createDate',
       dataIndex: 'apartmentId',
       key: 'apartmentId',
       render: (_, record) => (
-        <>
+       !isPublish && <>
           <AuthButton name="building.houseType.edit">
-            <Button type="link" onClick={() => props.onEdit(record)}>编辑</Button>
+            <Button type="link" onClick={() => props.onEdit(record)}>
+              编辑
+            </Button>
           </AuthButton>
           <AuthButton name="building.houseType.delete">
-            <Popconfirm
-              title="确定要进行删除操作 ?"
-              onConfirm={() => props.onDelete(record)}
-            >
-              <Button type="link" style={{ color: 'red' }}>删除</Button>
+            <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => props.onDelete(record)}>
+              <Button type="link" style={{ color: 'red' }}>
+                删除
+              </Button>
             </Popconfirm>
           </AuthButton>
         </>
       ),
     },
-  ]
+  ];
 
   return (
-    <Table
-      loading={props.loading}
-      dataSource={props.dataSource}
-      columns={columns}
-      style={{marginTop: '1em', width: '100%'}}
-      rowKey="apartmentId"
-    />
-  )
-}
+    <>
+      <Table
+        loading={props.loading}
+        dataSource={props.dataSource}
+        columns={columns}
+        style={{ marginTop: '1em', width: '100%' }}
+        rowKey="apartmentId"
+      />
+      <Modal
+        visible={visible}
+        // onOk={handleOk}
+        onCancel={() => setVisible(false)}
+        footer={null}
+        bodyStyle={{ padding: '0' }}
+        destroyOnClose
+      >
+        <img src={getImgURL(visible)} width="100%" alt=""></img>
+      </Modal>
+    </>
+  );
+};

src/pages/building/Edit/Apartment/index.jsx

 import Form from './Form'
 import List from './List'
 
+
 const fetchList = fetch(apis.building.buildingApartment)
 const deleteData = fetch(apis.building.buildingApartmentDelete)
 
 export default (props) => {
-  const { history } = props;
+  const { history,isPublish } = props;
   const { query } = history.location;
   const { id } = query;
 
   return (
     <div>
       <div>
-        <AuthButton name="building.houseType.add">
+        {!isPublish&&<AuthButton name="building.houseType.add">
           <Button type="primary" onClick={() => handleEdit()}>新增户型</Button>
-        </AuthButton>
+        </AuthButton>}
       </div>
       <Form buildingId={id} visible={visible} onCancel={() => setVisible(false)} formData={apartmentRef.current} onSuccess={handleSuccess} />
-      <List loading={loading} dataSource={list} onEdit={handleEdit} onDelete={handleDelete} />
+      <List loading={loading} dataSource={list} onEdit={handleEdit} onDelete={handleDelete} isPublish={isPublish}/>
     </div>
   )
 }

src/pages/building/Edit/Basic/index.jsx

 const Item = Form.Item
 
 const BuildingBasic = React.forwardRef((props, ref) => {
-  const { form, history, setMarketingCode,institutionIdChange, user } = props;
+  const { form, history, setMarketingCode,institutionIdChange, user ,isPublish,setIsPublish} = props;
   const { getFieldDecorator, getFieldValue, setFieldsValue } = form;
   const { query } = history.location;
   const { id } = query;
     initPois,
     deletePoi,
   ] = usePois()
+  // const [isPublish,initPublish] = useIsPublish()
 
   const updateLoading = (key) => (state) => setLoading({ ...loading, [key]: state })
   const updateFormLoading = updateLoading('form')
 
   useQuery(id, updateFormLoading, (res) => {
+
     initPois(res.mapJson)
     initArrounds(res)
     initForm(form, res)
     setMarketingCode(res.marketingCode)
     setCityId(res.cityId)
     institutionIdChange(res.institutionId)
+  
+
+    setIsPublish(res.status=== 1)
   })
   
   // 视频文件上传前 回调
 
         <Form.Item label=" " colon={false}>
           <AuthButton name="building.detail.save">
-            <Button style={{marginLeft: '6em'}} type="primary" htmlType="submit">
+            {!isPublish&&<Button style={{marginLeft: '6em'}} type="primary" htmlType="submit">
                 确定
-            </Button>
+            </Button>}
           </AuthButton>
           <Button style={{marginLeft: '2em'}} onClick={() => router.go(-1)}>
               取消

src/pages/building/Edit/Channel.jsx

 const getChannelDict = fetch(apis.channelList.getList)
 
 const ChannelForm = React.forwardRef((props, ref) => {
-  const { form, history, user,institutionId } = props
+  const { form, history, user,institutionId,isPublish } = props
   const { getFieldDecorator, setFieldsValue, validateFields } = form
   const { query } = history.location;
   const { id } = query;
       {getFieldDecorator('remark', {})(<Input.TextArea row={4} />)}
       </Form.Item>
       <Form.Item label=" " colon={false} style={{marginTop: '2em'}}>
-        <AuthButton name="building.channel.save">
+       {!isPublish&& <AuthButton name="building.channel.save">
           <Button style={{marginLeft: '4em'}} loading={loading} type="primary" htmlType="submit">保存</Button>
-        </AuthButton>
+        </AuthButton>}
         {/* <Button style={{marginLeft: '2em'}} onClick={props.onCancel}>取消</Button> */}
       </Form.Item>
     </Form>

src/pages/building/Edit/News/List.jsx

 import moment from 'moment'
 
 export default props => {
-  const { data = {}, onChangePageNum,loading } = props;
+  const { data = {}, onChangePageNum,loading,isPublish } = props;
   const { records=[], total, current,size } = data;
 
   const columns = [
       dataIndex: 'apartmentId',
       key: 'apartmentId',
       render: (_, record) => (
-        <>
+       !isPublish&& <>
           <AuthButton name="building.dynamic.edit">
             <Button type="link" onClick={() => props.onEdit(record)}>
               编辑

src/pages/building/Edit/News/index.jsx

 import apis from '@/services/apis';
 
 export default props => {
-  const { history } = props;
+  const { history,isPublish } = props;
   const { query } = history.location;
   const { id } = query;
 
   return (
     <div>
       <div>
-        <AuthButton name="building.dynamic.add">
+        {!isPublish&&<AuthButton name="building.dynamic.add">
           <Button type="primary" onClick={() => setVisible({visible:true})}>
             新增动态
           </Button>
-        </AuthButton>
+        </AuthButton>}
       </div>
       <Form visibleData={visible} buildingId={id} onCancel={() => setVisible({visible:false})} onSuccess={onSuccess} />
-      <List data={data} buildingId={id} loading={loading} onChangePageNum={onChangePageNum} onDelete={onDelete} onEdit={onEdit}/>
+      <List data={data} buildingId={id} loading={loading} onChangePageNum={onChangePageNum} onDelete={onDelete} onEdit={onEdit} isPublish={isPublish}/>
     </div>
   );
 };

src/pages/building/Edit/OnSiteService.jsx

 const { Text } = Typography;
 
 export default props => {
-  const { history,marketingCode } = props;
+  const { history,marketingCode,isPublish } = props;
   const { query } = history.location;
   const { id } = query;
 
       key: 'action',
       render: (_, row) => (
         <AuthButton name="building.marketing.delete">
-          <Popconfirm title="确认执行取消操作?" onConfirm={() => handleCancel(row)}>
+         {!isPublish&& <Popconfirm title="确认执行取消操作?" onConfirm={() => handleCancel(row)}>
             <a href="#" style={{ color: 'red' }}>
               取消绑定
             </a>
-          </Popconfirm>
+          </Popconfirm>}
         </AuthButton>
       ),
     },

src/pages/building/Edit/Panorama/List.jsx

 import AuthButton from '@/components/AuthButton'
 
 export default props => {
-  const { data,loading } = props;
+  const { data,loading,isPublish } = props;
 
   const columns = [
     {
       key: 'apartmentId',
       render: (_, record) => (
         <AuthButton name="building.panorama.delete">
-          <Popconfirm title="确定要进行删除操作 ?" onConfirm={() => props.onDelete(record)}>
+          {!isPublish&&<Popconfirm title="确定要进行删除操作 ?" onConfirm={() => props.onDelete(record)}>
             <Button type="link" style={{ color: 'red' }}>
               删除
             </Button>
-          </Popconfirm>
+          </Popconfirm>}
         </AuthButton>
       ),
     },

src/pages/building/Edit/Panorama/index.jsx

 import List from './List';
 
 export default props => {
-  const { history } = props;
+  const { history ,isPublish} = props;
   const { query } = history.location;
   const { id } = query;
   const [loading, setLoading] = useState(false);
   return (
     <div>
       <div>
-        <AuthButton name="building.panorama.add">
+       {!isPublish&& <AuthButton name="building.panorama.add">
           <Button type="primary" onClick={() => setVisible(true)}>
             新增全景
           </Button>
-        </AuthButton>
+        </AuthButton>}
       </div>
       <Form
         visible={visible}
         onCancel={() => setVisible(false)}
         onSuccess={onSuccess}
       />
-      <List data={data} loading={loading} onDelete={onDelete} />
+      <List data={data} loading={loading} onDelete={onDelete} isPublish={isPublish} />
     </div>
   );
 };

src/pages/building/Edit/SpecialRoom/List.jsx

 import AuthButton from '@/components/AuthButton'
 
 export default (props) => {
-  const { data = {}, onChangePageNum,loading } = props;
+  const { data = {}, onChangePageNum,loading,isPublish } = props;
   const { records=[], total, current,size } = data;
   
   const columns = [
       key: 'endTime',
       render: (_, record) => <span>{moment(record.endTime).format('YYYY-MM-DD')}</span>,
     },
+    {
+      title: '原始价',
+      dataIndex: 'originalPrice',
+      key: 'originalPrice',
+      render: (t) => <span>{`${t || ' -- '} 元`}</span>,
+    },
+    {
+      title: '现价',
+      dataIndex: 'currentPrice',
+      key: 'currentPrice',
+      render: (t) => <span>{`${t || ' -- '} 元`}</span>,
+    },
+    {
+      title: '节省价',
+      dataIndex: 'thriftPrice',
+      key: 'thriftPrice',
+      render: (t) => <span>{`${t || ' -- '} 元`}</span>,
+    },
     {
       title: '操作',
       dataIndex: 'apartmentId',
       key: 'apartmentId',
       render: (_, record) => (
-        <>
+        !isPublish&& <>
           <AuthButton name="building.special.edit">
             <Button type="link" onClick={() => props.onEdit(record)}>编辑</Button>
           </AuthButton>
     },
   ]
 
-  return (
+  return ( 
     <Table
     columns={columns}
     dataSource={records}

src/pages/building/Edit/SpecialRoom/index.jsx

 
 export default (props) => {
 
-  const { history } = props;
+  const { history,isPublish } = props;
   const { query } = history.location;
   const { id } = query;
 
   return (
     <div>
       <div>
-        <AuthButton name="building.special.add">
+        {!isPublish&&<AuthButton name="building.special.add">
           <Button type="primary" onClick={() => setVisible({visible:true})}>新增特价房</Button>
-        </AuthButton>
+        </AuthButton>}
       </div>
       <Form visibleData={visible} buildingId={id} onCancel={() => setVisible({visible:false})} onSuccess={onSuccess}  />
-      <List data={data} buildingId={id} loading={loading} onChangePageNum={onChangePageNum} onDelete={onDelete} onEdit={onEdit}/>
+      <List data={data} buildingId={id} loading={loading} onChangePageNum={onChangePageNum} onDelete={onDelete} onEdit={onEdit} isPublish={isPublish}/>
     </div>
   )
 }

src/pages/building/Edit/index.jsx

   const { id } = query
   const [institutionId,setInstitutionId] = useState()
   const [marketingCode,setMarketingCode] = useState('')
+  const [isPublish,setIsPublish] = useState(false)
   const target = { id, type: 'building' }
 
   return (
       <Tabs defaultActiveKey="1">
         <TabPane tab="基础信息" key="1">
           <div className={styles['tab-wrapper']} style={{maxWidth: 1000}}>
-            <Basic {...props}  setMarketingCode={(e)=>setMarketingCode(e)} institutionIdChange={(e)=>setInstitutionId(e)}/>
+            <Basic {...props}  setMarketingCode={(e)=>setMarketingCode(e)} institutionIdChange={(e)=>setInstitutionId(e)} isPublish={isPublish} setIsPublish={(e)=>setIsPublish(e)}/>
           </div>
         </TabPane>
         <TabPane tab="户型设置" key="2">
           <div className={styles['tab-wrapper']}>
-            <Apartment {...props} />
+            <Apartment {...props} isPublish={isPublish}/>
           </div>
         </TabPane>
         <TabPane tab="项目相册" key="3">
           <div className={styles['tab-wrapper']}>
-            <AlbumList {...props} />
+            <AlbumList {...props} isPublish={isPublish}/>
           </div>
         </TabPane>
         <TabPane tab="全景照片" key="4">
           <div className={styles['tab-wrapper']}>
-            <Panorama {...props} />
+            <Panorama {...props} isPublish={isPublish} />
           </div>
         </TabPane>
         <TabPane tab="项目动态" key="8">
           <div className={styles['tab-wrapper']}>
-            <News {...props} />
+            <News {...props} isPublish={isPublish}/>
           </div>
         </TabPane>
         <TabPane tab="特价房源" key="9">
           <div className={styles['tab-wrapper']}>
-            <SpecialRoom {...props} />
+            <SpecialRoom {...props} isPublish={isPublish}/>
           </div>
         </TabPane>
         <TabPane tab="渠道设置" key="7">
           <div className={styles['tab-wrapper']} style={{maxWidth: '800px'}}>
-            <Channel {...props} institutionId={institutionId} />
+            <Channel {...props} institutionId={institutionId} isPublish={isPublish}/>
           </div>
         </TabPane>
         <TabPane tab="驻场设置" key="10">
           <div className={styles['tab-wrapper']} style={{maxWidth: '1200px'}}>
-            <OnSiteService {...props} marketingCode={marketingCode}/>
+            <OnSiteService {...props} marketingCode={marketingCode} isPublish={isPublish}/>
           </div>
         </TabPane>
         <TabPane tab="海报图片" key="5">
-          <Poster target={target} rights="building.poster.save" {...props} />
+          <Poster target={target} rights="building.poster.save" {...props} submitBtn={!isPublish}  />
         </TabPane>
         <TabPane tab="分享设置" key="6">
           <div className={styles['tab-wrapper']} style={{maxWidth: '800px'}}>
-            <Share target={target} rights="building.share.save" {...props} />
+            <Share target={target} rights="building.share.save" {...props} submitBtn={!isPublish} />
           </div>
         </TabPane>
       </Tabs>