Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/building/list/index.jsx

   }
 
   return (
-          <Card
-            hoverable
-            style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
-            cover={<img alt="example" src={ data.poster } style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
-            bodyStyle={{ padding: '10px 20px' }}
-          >
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>楼盘编号</span>
-              <span >：{ data.code }</span>
-              <span className={Styles.ediText} onClick={() => toEdi(data)}>
-                编辑
+    <Card
+      hoverable
+      style={{ minWidth: '400px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)' }}
+      cover={<img alt="example" src={data.poster} style={{ borderRadius: '12px 12px 0 0', width: '100%', height: '14vw' }}></img>}
+      bodyStyle={{ padding: '10px 20px' }}
+    >
+      <p className={Styles.cardText}>
+        <span className={Styles.title}>楼盘编号</span>
+        <span >：{data.code}</span>
+        <span className={Styles.ediText} onClick={() => toEdi(data)}>
+          编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-              </span>
-            </p>
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>楼盘名称</span>
-              <span >：{ data.name }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>均价</span>
-              <span >
-                ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> { data.price } </span>元/m
         </span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>项目地址</span>
-              <span className={ Styles.address }>：{ data.address }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>发布状态</span>
-              <span >：{ data.status === 1 ? '已发布' : '未发布' }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>录入时间</span>
-              <span >：{ data.createDate }</span>
-            </p>
-            <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
-              <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
-                {/* 已发布的时候，需要显示取消发布的字样 */}
-                { data.status === 1 ? '取消发布' : '发布' }
-                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-              <span style={{
-                color: '#FF4A4A', position: 'absolute', right: '0',
-              }} onClick={() => deleteBuilding(data)}>
-                删除
+      </p>
+      <p className={Styles.cardText}>
+        <span className={Styles.title}>楼盘名称</span>
+        <span >：{data.name}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>均价</span>
+        <span >
+          ：约<span style={{ color: '#FF0707', fontSize: '20px' }}> {data.price} </span>元/m
+        </span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>项目地址</span>
+        <span className={Styles.address}>：{data.address}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>发布状态</span>
+        <span >：{data.status === 1 ? '已发布' : '未发布'}</span>
+      </p>
+      <p className={Styles.cardItem}>
+        <span className={Styles.title}>录入时间</span>
+        <span >：{data.createDate}</span>
+      </p>
+      <p style={{ margin: '15px 0', position: 'relative', fontSize: '18px' }}>
+        <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
+          {/* 已发布的时候，需要显示取消发布的字样 */}
+          {data.status === 1 ? '取消发布' : '发布'}
+          <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+        </span>
+        <span style={{
+          color: '#FF4A4A', position: 'absolute', right: '0',
+        }} onClick={() => deleteBuilding(data)}>
+          删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-            </p>
-          </Card>
+        </span>
+      </p>
+    </Card>
   )
 }
 
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 9 })
+    getList({ pageNum: pageNumber, pageSize: 9 })
   }
 
   function getDate(value, dateString) {
       <Row style={{ padding: ' 0 10px' }}>
         {
           dataSource.records.map((item, _) => (
-              <Col span={8}>
-                <CartBody data={item} key={item.buildingId} onSuccess={getList}/>
-              </Col>
-            ))
+            <Col span={8}>
+              <CartBody data={item} key={item.buildingId} onSuccess={getList} />
+            </Col>
+          ))
         }
       </Row>
       {/* 分页 */}

src/pages/news/list/NewsList.jsx

           </span> :
           <span style={{ position: 'absolute', left: '280px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
             发布
-              <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
           </span>
         }