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

src/global.less

@@ -55,7 +55,12 @@ ol {
   box-shadow: none;
   border: none;
 }
-
+.ant-input-affix-wrapper .ant-input-prefix{
+  left:7px;
+}
+.ant-input-affix-wrapper .ant-input:not(:first-child) {
+  padding-left: 40px;
+}
 .ant-pro-global-header-trigger{
   display: none;
 }

src/pages/integralMall/exchangeRecords.jsx

@@ -246,52 +246,54 @@ function record(props) {
 
     <>
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
-        <Form.Item>
-          {getFieldDecorator('name')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="用户姓名"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('phone')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="手机号"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('goodName')(
-            <Input
-              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              placeholder="商品名称"
-            />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('type')(
-            <Select style={{ width: '200px' }} placeholder="用户类型" onChange={handleSelectChange}>
-              <Option value="2">置业顾问</Option>
-              <Option value="1">销售主管</Option>
-              <Option value="0">经纪人</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('state')(
-            <Select style={{ width: '200px' }} placeholder="状态" onChange={handleSelectChange}>
-              <Option value="1">已领取</Option>
-              <Option value="0">未领取</Option>
-            </Select>,
-          )}
-        </Form.Item>
-        <Form.Item>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
+        <div style={{ display: 'flex' }}>
+          <Form.Item>
+            {getFieldDecorator('name')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="用户姓名"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('phone')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="手机号"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('goodName')(
+              <Input
+                prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+                placeholder="商品名称"
+              />,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('type')(
+              <Select style={{ width: '220px' }} placeholder="用户类型" onChange={handleSelectChange}>
+                <Option value="2">置业顾问</Option>
+                <Option value="1">销售主管</Option>
+                <Option value="0">经纪人</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            {getFieldDecorator('state')(
+              <Select style={{ width: '220px' }} placeholder="状态" onChange={handleSelectChange}>
+                <Option value="1">已领取</Option>
+                <Option value="0">未领取</Option>
+              </Select>,
+            )}
+          </Form.Item>
+          <Form.Item>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
           </Button>
-        </Form.Item>
+          </Form.Item>
+        </div>
         <Form.Item>
           <DateRange />
         </Form.Item>

src/pages/news/list/NewsList.jsx

@@ -0,0 +1,210 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert } from 'antd';
+import moment from 'moment';
+import request from '../../../utils/request';
+import apis from '../../../services/apis';
+import Styles from './style.less';
+
+
+const { Option } = Select;
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { Meta } = Card;
+
+const tempDate = [{ code: 's101' }]
+
+/**
+ *卡片
+ *
+ * @returns
+ */
+function CartBody(props) {
+  const { data } = props
+  console.log(props);
+  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}>
+                编辑
+                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+              </span>
+            </p>
+            <p className={Styles.cardText}>
+              <span className={Styles.title}>状态</span>
+              <span >：{ data.status == '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 className={ Styles.address }>：{ 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' }}>
+              <span style={{ color: '#1990FF' }}>
+                取消发布
+                <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              </span>
+              <span style={{
+                color: '#FF4A4A', position: 'absolute', right: '0',
+              }} >
+                删除
+                <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+              </span>
+            </p>
+          </Card>
+  )
+}
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+function body(props) {
+  const { getFieldDecorator } = props.form
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  const [dataSource, setDataSource] = useState({ records: [] })
+
+  // eslint-disable-next-line react-hooks/rules-of-hooks
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 6 })
+  }, [])
+
+  function getList(params) {
+    // 网路请求
+    request({ ...apis.news.getList, params: { ...params } }).then(res => {
+      setDataSource(res)
+    }).catch(err => {
+      // eslint-disable-next-line no-unused-expressions
+      <Alert
+        style={{
+          marginBottom: 24,
+        }}
+        message={err}
+        type="error"
+        showIcon
+      />
+    })
+  }
+
+  // 提交事件
+  function handleSubmit(e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        // eslint-disable-next-line no-console
+        console.log('提交数据: ', values)
+        const { startDate } = values
+        getList({ pageNum: 1, pageSize: 9, ...values })
+      }
+    });
+  }
+
+  // Change 事件
+  function handleSelectChange(e) {
+    // eslint-disable-next-line no-console
+    console.log(e)
+  }
+
+  // 分页
+  function onChange(pageNumber) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+      getList({ pageNum: pageNumber, pageSize: 9 })
+  }
+
+  function getDate(value, dateString) {
+    // moment(value).format('YYYY-MM-DD HH:mm:ss')
+    console.log(value, dateString)
+  }
+
+  return (
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+
+        <Form.Item>
+          {getFieldDecorator('city')(
+            <Select style={{ width: '180px' }} placeholder="请选择城市" onChange={handleSelectChange}>
+            </Select>,
+          )}
+        </Form.Item>
+
+        <Form.Item>
+          {getFieldDecorator('project')(
+            <Select style={{ width: '180px' }} placeholder="请选择项目" onChange={handleSelectChange}>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('title')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="请输入标题"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('type')(
+            <Select style={{ width: '180px' }} placeholder="咨询类型" onChange={handleSelectChange}>
+            </Select>,
+          )}
+        </Form.Item>       
+        <Form.Item>
+          {getFieldDecorator('newsStatus')(
+            <Select style={{ width: '180px' }} placeholder="状态" onChange={handleSelectChange}>
+              <Option value="1">已发布</Option>
+              <Option value="0">未发布</Option>
+            </Select>,
+          )}
+        </Form.Item>
+        <Form.Item>
+          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+            搜索
+          </Button>
+        </Form.Item>
+      </Form>
+      <Button type="primary" className={Styles.addButton}>
+        新增
+      </Button>
+
+      {/* 卡片内容，显示楼盘项目  */}
+      <Row style={{ padding: ' 0 10px' }}>
+        {
+          dataSource.records.map((item, index) => (
+              <Col span={8}>
+                <CartBody data={item} key={item.buildingId}/>
+              </Col>
+            ))
+        }
+      </Row>
+      {/* 分页 */}
+      <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
+        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} />
+      </div>
+    </>
+  );
+}
+const WrappedBody = Form.create({ name: 'body' })(body);
+
+export default WrappedBody

src/pages/news/list/style.less

@@ -0,0 +1,58 @@
+.SubmitButton {
+    background: #3a91d5;
+    border-radius: 7px;
+    border: 0px;
+  }
+  .SelectFrom {
+    width: 180px;
+    background: #ffffff;
+    border-radius: 7px;
+    border: 1px solid #dbdbdb;
+  }
+  .addButton {
+    background: #50be00;
+    border-radius: 4px;
+    border: 0px;
+    margin: 10px 0px;
+  }
+  .cardText {
+    font-size: 18px;
+    color: #333;
+    line-height: 24px;
+    display: flex;
+    align-items: center;
+    position: relative;
+  
+  }
+  .cardItem{
+    font-size: 18px;
+    font-weight: 400;
+    color: #666;
+    line-height: 24px;
+    display: flex;
+    align-items: center;  
+  }
+  .ediText {
+    font-size: 18px;
+    color: #ff925c;
+    line-height: 24px;
+    position: absolute;
+    right: 0;
+  }
+  .title{
+    display: inline-block;
+    width: 84px;
+    justify-content: space-between;
+    text-align: justify;
+    text-align-last:justify
+  }
+  
+  .address { 
+    width: 400px;
+    height: 24px; 
+    text-overflow: ellipsis; 
+    white-space: nowrap;
+    overflow: hidden;
+  }
+  
+  

src/pages/news/type/NewsType.jsx

@@ -59,7 +59,7 @@ const columns = [
     title: '类型图片',
     dataIndex: 'img',
     key: 'img',
-    align: 'center',
+    align: 'left',
     render: (text, record) => <img src={record.img} className={styles.touxiang} />,
   },
   {

src/pages/style/GoodsList.less

@@ -1,5 +1,5 @@
 .addBtn {
-  padding: 0 30px;
+  padding: 0 40px;
   height: 36px;
   background-color: #FF7E48;
   color: #fff;

src/pages/user/login/components/Login/LoginSubmit.jsx

@@ -9,7 +9,7 @@ const LoginSubmit = ({ className, ...rest }) => {
   const clsString = classNames(styles.submit, className);
   return (
     <FormItem>
-      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#DB3C4B', borderRadius: '4px', border: 'none' }} />
+      <Button size="large" className={clsString} type="primary" htmlType="submit" {...rest} style={{ backgroundColor: '#EF273A', borderRadius: '4px', border: 'none' }} />
     </FormItem>
   );
 };

src/pages/user/login/components/Login/index.less

@@ -82,8 +82,10 @@ position: relative;
   }
 
   .prefixIcon {
-    color: @disabled-color;
-    font-size: @font-size-base;
+    color: #fff;
+    font-size: 18px;
+    background-color: #EF273A;
+    padding: 3px 4px;
   }
 
   .submit {

src/services/apis.js

@@ -45,6 +45,12 @@ export default {
       url: `${prefix}/tdBuildingType/id`,
     },
   },
+  news: {
+    getList: {
+      method: 'GET',
+      url: `${prefix}/taNews`,
+    },
+  },
   customer: {
     drift: {
       method: 'GET',

src/services/news.js

@@ -0,0 +1,12 @@
+import request from '@/utils/request';
+
+/**
+ * 项目
+ */
+
+/**
+ * 获取列表
+ */
+export async function getList() {
+  return request('/api/admin/taNews')
+}