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

config/config.js

@@ -455,7 +455,7 @@ export default {
 
   proxy: {
     '/api/': {
-      target: 'http://127.0.0.1:8080/',
+      target: 'http://192.168.0.84:8080/',
       changeOrigin: true,
       // pathRewrite: { '^/server': '' },
     },

src/components/SelectButton/NewTypeSelect.jsx

@@ -29,7 +29,7 @@ const NewsTypeSelect = (props) => {
   }
 
   return (
-      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择咨询类型" onChange={props.onChange}>
+      <Select value={props.value} style={{ width: '180px' }} placeholder="请选择讯类型" onChange={props.onChange}>
           {data.map(type => (
             <Option key={type.newsTypeId}>{type.newsTypeName}</Option>
           ))}

src/pages/channel/InviteClients.jsx

@@ -37,6 +37,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
   },
 ];
 const header = props => {

src/pages/channel/brokerList.jsx

@@ -155,7 +155,7 @@ const header = props => {
 return (
   <>
     <div className={ channels.searchBox }>
-      <div>
+      <div style = {{ marginLeft: '-5px' }}>
         <span className={ channels.selectName }>姓名</span>
         <Input onChange = { onInputChangePhone } style ={{ width: 150 }} />
         <span className={ channels.selectName }>电话</span>
@@ -163,7 +163,7 @@ return (
       </div>
       <div>
       <Button type="primary" onClick={() => queryList() }>查询</Button>
-      <Button onClick={() => refurbishList() }>重置</Button>
+      {/* <Button onClick={() => refurbishList() }>重置</Button> */}
     </div>
     </div>
     <Table dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />

src/pages/channel/channelList.jsx

@@ -168,10 +168,10 @@ const header = props => {
         </dvi>
         <div >
         <Button type="primary" onClick={() => queryList() }>查询</Button>
-        <Button onClick={() => reset() }>重置</Button>
+        {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>
-      <Button type="danger" onClick={toAdd}>新增</Button>
+      <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
       <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
   </>
   )

src/pages/channel/channelList.less

@@ -32,13 +32,12 @@
 .about {
   padding: 0 30px;
   height: 36px;
-  background-color:rgba(255,255,255,1);
-  color: #fff;
   margin: 30px 0;
+  margin-left:8px;
 }
 
 .selectName {
-  font-size: 17px;
+  font-size: 14px;
   padding: 0 10px;
   height: 36px;
   color: rgb(10, 10, 10);
@@ -62,3 +61,8 @@
   float: 'left'; 
   width: 500
 }
+.brokerTable{
+  padding: 0 30px;
+  height: 36px;
+  margin: 30px 0;
+}

src/pages/channel/recommendClients.jsx

@@ -70,6 +70,7 @@ const columns = [
     dataIndex: 'sex',
     key: 'sex',
     align: 'center',
+    render: (text, record) => <a style={ { color: '#66B3FF' } } >{ record.sex === 1 ? '男' : '女' }</a>,
   },
   {
     title: '意向项目',

src/pages/customer/independentList/index.jsx

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification } from 'antd';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, notification, Modal } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';

src/pages/news/list/NewsList.jsx

@@ -63,7 +63,7 @@ function body(props) {
   }
 
   // 跳转到编辑资讯列表
-  const toEditList = (id) => ()  => {
+  const toEditList = (id) => () => {
     router.push({
       pathname: '/news/list/editNewsList',
       query: {
@@ -74,153 +74,145 @@ function body(props) {
 
 
 
-/**
- *卡片
- *
- * @returns
- */
-function CartBody(props) {
-  const { data } = props
-  console.log(data);
-  const cancelPage = () =>{
-    router.push({
-      pathname: '/news/list/NewsList',
-    });
-  }
-
-  //删除资讯
-  const changeNewsListStatus = (newsId) => () => {
-    Modal.confirm({
-      title: '确认删除该资讯？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        request({
-          url: '/api/admin/taNews/' + newsId,
-          method: 'DELETE',
-          // data: { ...row },
-        }).then((data) => {
-          message.info('操作成功！')
-          getList({ pageNum: 1, pageSize: 10 });
-        })
-      }
-    });
-  }
-
-  // 跳转到编辑资讯列表
-  const toEditList = (newsId) => ()  => {
-    router.push({
-      pathname: '/news/list/editNewsList',
-      query: {
-        newsId
-      },
-    });
-  } 
+  /**
+   *卡片
+   *
+   * @returns
+   */
+  function CartBody(props) {
+    const { data } = props
+    console.log(data);
+    const cancelPage = () => {
+      router.push({
+        pathname: '/news/list/NewsList',
+      });
+    }
 
-  function cancelRelease (newsId, newsStatus, buildingId,newsTypeId) {
-    console.log("newsId" + newsId + "status" + newsStatus);
-    if (newsStatus === 1){
+    //删除资讯
+    const changeNewsListStatus = (newsId) => () => {
       Modal.confirm({
-        title: '确认取消该资讯？',
+        title: '确认删除该资讯？',
         okText: '确认',
         cancelText: '取消',
-        onOk () {
+        onOk() {
           request({
             url: '/api/admin/taNews/' + newsId,
-            method: 'PUT',
-            data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
+            method: 'DELETE',
+            // data: { ...row },
           }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10 });
           })
-        },
-        onCancel () {
-          console.log('Cancel');
-        },
+        }
       });
-    }else if (newsStatus === 0){
-      Modal.confirm({
-        title: '确认发布该资讯？',
-        okText: '确认',
-        cancelText: '取消',
-        onOk () {
-          request({
-            url: '/api/admin/taNews/' + newsId,
-            method: 'PUT',
-            data: { "newsStatus": newsStatus, "buildingId":buildingId, "newsTypeId":newsTypeId },
-          }).then((data) => {
-            message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10 });
-          })
-        },
-        onCancel () {
-          console.log('Cancel');
+    }
+
+    // 跳转到编辑资讯列表
+    const toEditList = (newsId) => () => {
+      router.push({
+        pathname: '/news/list/editNewsList',
+        query: {
+          newsId
         },
       });
-    }  
-  }
+    }
 
-  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.newsImg } 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.newsType.newsTypeName }</span>
-              <span className={Styles.ediText} onClick={toEditList(data.newsId)}>
-                编辑
+    function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
+      console.log("newsId" + newsId + "status" + newsStatus);
+      if (newsStatus === 1) {
+        Modal.confirm({
+          title: '确认取消该资讯？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({
+              url: '/api/admin/taNews/' + newsId,
+              method: 'PUT',
+              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
+            }).then((data) => {
+              message.info('操作成功！')
+              getList({ pageNum: 1, pageSize: 10 });
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      } else if (newsStatus === 0) {
+        Modal.confirm({
+          title: '确认发布该资讯？',
+          okText: '确认',
+          cancelText: '取消',
+          onOk() {
+            request({
+              url: '/api/admin/taNews/' + newsId,
+              method: 'PUT',
+              data: { "newsStatus": newsStatus, "buildingId": buildingId, "newsTypeId": newsTypeId },
+            }).then((data) => {
+              message.info('操作成功！')
+              getList({ pageNum: 1, pageSize: 10 });
+            })
+          },
+          onCancel() {
+            console.log('Cancel');
+          },
+        });
+      }
+    }
+
+    return (
+      <Card
+        hoverable
+        style={{ height: '255px', minWidth: '640px', borderRadius: '12px', margin: '10px', boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)', position: 'relative' }}
+        cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '260px', height: '253px' }}></img>}
+        bodyStyle={{ padding: '10px 20px' }}
+      >
+        <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: '18px', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
+          编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-              </span>
-            </p>
-            <p className={Styles.cardText}>
-              <span className={Styles.title}>状态</span>
-              <span >：{ data.newsStatus == 0 ? "已发布" : "未发布" }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>阅读数量</span>
-              <span > ：{ data.pvNum }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>转发数量</span>
-              <span>：{ data.shareNum }</span>
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>点赞数量</span>     
-              <span >：{ data.favorNum }</span>         
-            </p>
-            <p className={Styles.cardItem}>
-              <span className={Styles.title}>收藏数量</span>
-              <span >：{ data.saveNum }</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' }}>
-              {data.newsStatus === 0 ? 
-              <span style={{ color: '#1990FF' }} onClick={cancelRelease.bind(this,data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
-              取消发布
+        </span>
+        {data.newsStatus === 0 ?
+          <span style={{ position: 'absolute', left: '280px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+            取消发布
               <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>:
-              <span style={{ color: '#1990FF' }} onClick={cancelRelease.bind(this,data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
-              发布
+          </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' }} />
-              </span>
-              }
-              
-              <span style={{
-                color: '#FF4A4A', position: 'absolute', right: '0',
-              }} onClick={changeNewsListStatus(data.newsId)}>
-                删除
+          </span>
+        }
+
+        <span style={{ position: 'absolute', right: '20px', bottom: '18px', fontSize: '18px', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
+          删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-              </span>
-            </p>
-          </Card>
-  )
-}
+        </span>
+        <div style={{ position: 'absolute', left: '260px', top: '0px', padding: '20px' }}>
+          <p style={{
+            fontSize: '18px', color: '#333', fontWeight: '600', marginBottom: '10px', overflow: 'hidden',
+            textOverflow: 'ellipsis',
+            whiteSpace: 'nowrap',
+            width: '300px',
+          }}>{data.newsName}</p>
+          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+            <span style={{ display: 'inline-block', width: '190px' }}>咨询类型：{data.newsType.newsTypeName}</span>
+            <span>状态：{data.newsStatus == 0 ? "已发布" : "未发布"}</span>
+          </p>
+
+          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+            <span style={{ display: 'inline-block', width: '190px' }}>阅读数量：{data.pvNum}</span>
+            <span>转发数量：{data.shareNum}</span>
+          </p>
+
+          <p style={{ fontSize: '18px', color: '#555', marginBottom: '10px' }}>
+            <span style={{ display: 'inline-block', width: '190px' }}>点赞数量：{data.favorNum}</span>
+            <span>收藏数量：{data.saveNum}</span>
+          </p>
+
+          <p style={{ fontSize: '18px', color: '#999', marginBottom: '10px' }}>发布时间：{data.createDate}</p>
+        </div>
+      </Card>
+    )
+  }
 
 
   // Change 事件
@@ -232,7 +224,7 @@ function CartBody(props) {
   // 分页
   function onChange(pageNumber) {
     // eslint-disable-next-line react-hooks/rules-of-hooks
-      getList({ pageNum: pageNumber, pageSize: 6 })
+    getList({ pageNum: pageNumber, pageSize: 6 })
   }
 
   function getDate(value, dateString) {
@@ -246,27 +238,27 @@ function CartBody(props) {
 
         <Form.Item>
           {getFieldDecorator('cityId')(
-            <SelectCity />,  
+            <SelectCity />,
           )}
         </Form.Item>
         <Form.Item>
           {getFieldDecorator('buildingId')(
-              <BuildSelect />,
-            )}
+            <BuildSelect />,
+          )}
         </Form.Item>
-        <Form.Item>
+        {/* <Form.Item>
           {getFieldDecorator('title')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
               placeholder="请输入标题"
             />,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item>
           {getFieldDecorator('newsTypeId')(
             <NewsTypeSelect />,
           )}
-        </Form.Item>       
+        </Form.Item>
         <Form.Item>
           {getFieldDecorator('newsStatus')(
             <Select style={{ width: '180px' }} placeholder="状态">
@@ -276,12 +268,12 @@ function CartBody(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+          <Button type="primary" htmlType="submit" >
             搜索
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" className={Styles.addButton} onClick={toEditList()}>
+      <Button type="danger" style={{ padding: '0 40px', margin: '20px 0' }} onClick={toEditList()}>
         新增
       </Button>
 
@@ -289,10 +281,10 @@ function CartBody(props) {
       <Row style={{ padding: ' 0 10px' }}>
         {
           dataSource.records.map((item, index) => (
-              <Col span={8}>
-                <CartBody data={item} key={item.buildingId}/>
-              </Col>
-            ))
+            <Col span={12}>
+              <CartBody data={item} key={item.buildingId} />
+            </Col>
+          ))
         }
       </Row>
       {/* 分页 */}