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

config/routes.js

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

src/pages/activity/ActivityList.jsx

@@ -106,11 +106,11 @@ const toEditGoods = (dynamicId) => () => {
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            {row.isEnlist != 2 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
         </>
       )

src/pages/activity/editActivity.jsx

@@ -133,7 +133,8 @@ const Edit = (props) => {
         label: '报名时间',
         name: 'signupTime',
         type: FieldTypes.RangePicker,
-        value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD')] : null,
+        value: dynamicData.enlistStart != null ? [moment(dynamicData.enlistStart, 'YYYY-MM-DD HH:mm'), moment(dynamicData.enlistEnd, 'YYYY-MM-DD HH:mm')] : null,
+        props: {showTime:{ format: 'HH:mm' }},
         rules: [
           { required: true, message: '请选择报名时间' },
         ]
@@ -146,8 +147,8 @@ const Edit = (props) => {
       submitValue.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
       submitValue.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
       const [enlistStart, enlistEnd] = signupTime
-      submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD');
-      submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD');
+      submitValue.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+      submitValue.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
       console.log('submit data --->', submitValue)
       if (dynamicId) {
         submitValue.dynamicId = dynamicId

src/pages/building/list/index.jsx

@@ -135,7 +135,7 @@ function CartBody(props) {
       </p>
       <p className={Styles.cardItem}>
         <span className={Styles.title}>录入时间</span>
-        <span >：{data.createDate}</span>
+        <span >：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
       </p>
       <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.106rem' }}>
       <AuthButton name="admin.building.update.status.put" noRight={null}>

src/pages/channel/recommendClients.jsx

@@ -84,6 +84,7 @@ const columns = [
     dataIndex: 'createDate',
     key: 'createDate',
     align: 'center',
+    render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
   },
   {
     title: '状态',

src/pages/customer/independentList/index.jsx

@@ -106,6 +106,7 @@ class ModalTable extends React.Component {
         title: '推荐时间',
         dataIndex: 'createDate',
         key: 'createDate',
+        render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
       },
       {
         title: '状态',

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) {
@@ -167,6 +181,8 @@ function body(props) {
         bodyStyle={{ padding: '10px 20px' }}
       >
         <AuthButton name="admin.taNews.id.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>
+
           <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
             编辑
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
@@ -210,7 +226,7 @@ function body(props) {
             <span>收藏数量：{data.saveNum}</span>
           </p>
 
-          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{data.createDate}</p>
+          <p style={{ fontSize: ' 0.106rem', color: '#999', marginBottom: '8px' }}>发布时间：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</p>
         </div>
       </Card>
     )

src/pages/staff/list/editStaff.jsx

@@ -121,6 +121,7 @@ const Edit = (props) => {
       type: FieldTypes.Text,
       placeholder: '请输入电话号码',
       value: userData.phone,
+      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: {