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

# Conflicts:
#	src/pages/staff/list/editStaff.jsx

config/routes.js

@@ -206,7 +206,7 @@ export default [
               },
               {
                 path: '/channel/InviteClients',
-                name: '邀请客户',
+                name: '邀请经纪人',
                 hideInMenu: true,
                 component: './channel/InviteClients',
               },

src/pages/channel/recommendClients.jsx

@@ -3,6 +3,7 @@ import { Input, Menu, Dropdown, Button, Icon, message, Table, Divider, Tag, Sele
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import channels from './channelList.less';
 import router from 'umi/router';
+import moment from 'moment';
 import apis from '../../services/apis';
 import request from '../../utils/request'
 
@@ -91,6 +92,16 @@ const columns = [
     dataIndex: 'status',
     key: 'status',
     align: 'center',
+    // eslint-disable-next-line consistent-return
+    render: (text, records) => {
+      if (records.status === 1) { return '报备' }
+      if (records.status === 2) { return 'admin.taNews.weight' }
+      if (records.status === 3) { return '认购' }
+      if (records.status === 4) { return '签约' }
+      if (records.verifyStatus === 1) { return '待审核' }
+      if (records.verifyStatus === 2) { return '审核同意' }
+      if (records.verifyStatus === 3) { return '签约' }
+    },
   },
 ];
 

src/pages/customer/customerlist/index.jsx

@@ -196,6 +196,13 @@ function body(props) {
       align: 'center',
       width: '15%',
     },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '15%',
+    },
   ]
 
   const privateColumns = [
@@ -247,6 +254,13 @@ function body(props) {
         </>
       ),
     },
+    {
+      title: '推广人员',
+      dataIndex: 'sharePersonName',
+      key: 'sharePersonName',
+      align: 'center',
+      width: '15%',
+    },
     {
       title: '客户状态',
       dataIndex: 'reportRecommendStatus',

src/pages/integralMall/exchangeRecords.jsx

@@ -87,7 +87,7 @@ function record(props) {
       dataIndex: 'personType',
       key: 'personType',
       align: 'center',
-      render: (personType)=> <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : ''}</span></>
+      render: (personType)=> <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
     },
     {
       title: '手机号',
@@ -113,14 +113,14 @@ function record(props) {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (createDate) => <><span>{moment(createDate).format('YYYY-MM-DD HH:mm')}</span></>
+      render: (_, recorde) => <><span>{moment(recorde.createDate).format('YYYY-MM-DD HH:mm')}</span></>,
     },
     {
       title: '领取时间',
       dataIndex: 'verifyDate',
       key: 'verifyDate',
       align: 'center',
-      render: (verifyDate) => <><span>{verifyDate != null ? moment(verifyDate).format('YYYY-MM-DD HH:mm') : ''}</span></>
+      render: (_, recorde) => <><span>{recorde.verifyDate != null ? moment(recorde.verifyDate).format('YYYY-MM-DD HH:mm') : ''}</span></>,
     },
     {
       title: '状态',

src/pages/integralMall/verifyList.jsx

@@ -35,9 +35,12 @@ const header = (props) => {
   }
 
   const changeStatus = (row) => () => {
+    // console.log(new Date())
+    row.verifyDate = new Date()
+    // console.log('row.verifyDate: ', row.verifyDate)
     request({ ...apis.integralMall.changeTaPointsExchange, data: row}).then((data) => {
         message.info("操作成功")
-        getVerifyList({ pageNum: pageNumber, pageSize: 10, phone: props.location.query.telValue })
+        getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue })
     })
   }
   

src/pages/news/list/NewsList.jsx

@@ -5,6 +5,7 @@ import router from 'umi/router';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
+import styles from '../../style/GoodsList.less';
 import NewsTypeSelect from '../../../components/SelectButton/NewTypeSelect'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import SelectCity from '../../../components/SelectButton/CitySelect'
@@ -118,6 +119,19 @@ function body(props) {
       });
     }
 
+    //   置顶
+    const topNews = (weightParam, newsId) => () => {
+      const weight = Math.abs(weightParam - 1)
+      request({ ...apis.news.weight, params: {newsId: newsId, weight} }).then((data) => {
+          console.log(data)
+          message.info('操作成功！')
+          getList({ pageNum: 1, pageSize: 10 })
+      }).catch((err) => {
+          console.log(err)
+          message.info(err.msg || err.message)
+      })
+    }
+
     function cancelRelease(newsId, newsStatus, buildingId, newsTypeId) {
       console.log("newsId" + newsId + "status" + newsStatus);
       if (newsStatus === 1) {
@@ -166,6 +180,10 @@ function body(props) {
         cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '230px', height: '228px' }}></img>}
         bodyStyle={{ padding: '10px 20px' }}
       >
+        <AuthButton name="admin.taNews.weight.put" noRight={null}>
+        <span style={{ position: 'absolute', right: '100px', top: '19px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{ data.weight === 1 ? '取消置顶' : '置顶' }</span>
+        </AuthButton>
+
         <AuthButton name="admin.taNews.id.put" noRight={null}>
           <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
             编辑

src/pages/staff/list/addRole.jsx

@@ -212,7 +212,7 @@ const Poster = props => {
             <Button type="primary" htmlType="submit">
               保存
           </Button>
-            <Button className={channels.formButton} htmlType="submit" onChange = {toRoleList}>
+            <Button className={channels.formButton} onClick = {toRoleList}>
               取消
           </Button>
           </Form.Item>

src/pages/staff/list/editStaff.jsx

@@ -139,7 +139,8 @@ const Edit = (props) => {
             pattern: new RegExp('^1[0-9]{10}$'),
             message: '请输入正确的电话号码',
         },
-    ],
+      ],
+      help: '默认密码：123456',
     },
     {
       label: '角色',

src/services/apis.js

@@ -156,6 +156,11 @@ export default {
       method: 'PUT',
       url: `${prefix}/taNews/:id`,
       action: 'admin.taNews.id.put',
+    },
+    weight: {
+      method: 'PUT',
+      url: `${prefix}/taNews/weight`,
+      action: 'admin.taNews.weight.put',
     }
   },
   newsType: {