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

src/pages/activity/ActivityList.jsx

@@ -100,17 +100,17 @@ const toEditGoods = (dynamicId) => () => {
       render: (x,row) => (
         <>
           <AuthButton name="admin.SignList.get" noRight={null}>
-            <span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
+            <span style={{ color: '#1990FF', cursor: 'pointer'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
           </AuthButton>
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
-            <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
+            <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' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+            <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' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
+            <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>
           </AuthButton>
         </>
       )

src/pages/building/list/index.jsx

@@ -200,7 +200,10 @@ function body(props) {
         // eslint-disable-next-line no-console
         console.log('提交数据: ', values)
         const { startDate } = values
-        values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
+        if (values.startDate !== undefined) {
+          alert(111)
+          values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
+        }
         getList({ pageNum: 1, pageSize: 9, ...values })
       }
     });

src/pages/news/list/NewsList.jsx

@@ -167,23 +167,23 @@ function body(props) {
         bodyStyle={{ padding: '10px 20px' }}
       >
         <AuthButton name="admin.taNews.id.put" noRight={null}>
-          <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
+          <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
             编辑
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
           </span>
           {data.newsStatus === 0 ?
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1 }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
               取消发布
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
             </span> :
-            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1 }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
+            <span style={{ position: 'absolute', left: '280px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48',zIndex:1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 0, data.buildingId, data.newsType.newsTypeId)}>
               发布
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
             </span>
           }
         </AuthButton>
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
-            <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
+            <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48', cursor: 'pointer' }} onClick={changeNewsListStatus(data.newsId)}>
                   删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
             </span>

src/pages/news/type/NewsType.jsx

@@ -100,12 +100,12 @@ function header(props) {
       render: (x, row) => (
         <>
           <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
-            <span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
+            <span style={{ color: '#EF273A', marginRight: '20px', cursor: 'pointer' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
               {row.status == 1 ? '删除' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
             </span>
           </AuthButton>
           <AuthButton name="admin.taNewsType.id.put" noRight={null}>
-            <span style={{ color: '#FF925C' }} onClick={toEditNews(row.newsTypeId)}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditNews(row.newsTypeId)}>
               编辑<Icon type="form" className={styles.edit} />
             </span>
           </AuthButton>

src/pages/staff/list/RoleList.jsx

@@ -109,10 +109,10 @@ const columns = [
     align: 'center',
 
     render: (text, record) => <>
-      <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={() => stop(record.roleId)}>{ record.status === 1 ? '停用' : '启用' }
+      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId)}>{ record.status === 1 ? '停用' : '启用' }
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
       </span>
-      <span style={{ color: '#FF925C' }} onClick={() => toEditRole(record.roleId)} >编辑
+      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >编辑
       <Icon type="form" className={styles.edit} />
       </span>
     </>,

src/pages/staff/list/StaffList.jsx

@@ -171,6 +171,16 @@ const header = (props) => {
           )}
         </Form.Item>
 
+        <Form.Item>
+
+          {getFieldDecorator('isConsultant')(
+            <Select style={{ width: '180px' }} placeholder="是否置业顾问" >
+              <Option value="0">非置业顾问</Option>
+              <Option value="1">置业顾问</Option>
+            </Select>,
+          )}
+        </Form.Item>
+
         <Form.Item>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索

src/pages/staff/list/editStaff.jsx

@@ -67,12 +67,16 @@ const Edit = (props) => {
         console.log(data,"tauser")
         message.info("保存成功")
         router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
       })
     }else{
       request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
         console.log(data,"tauser")
         message.info("保存成功")
         router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
       })
     }
   }