浏览代码

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

魏熙美 5 年前
父节点
当前提交
f610d88e46

+ 5
- 5
src/pages/activity/ActivityList.jsx 查看文件

100
       render: (x,row) => (
100
       render: (x,row) => (
101
         <>
101
         <>
102
           <AuthButton name="admin.SignList.get" noRight={null}>
102
           <AuthButton name="admin.SignList.get" noRight={null}>
103
-            <span style={{ color: '#1990FF'}} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? "报名记录" : ""}<Icon type="snippets" className={styles.shoppingCart} /></span>
103
+            <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>
104
           </AuthButton>
104
           </AuthButton>
105
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
105
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
106
-            <span style={{ color: '#1990FF' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
106
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this,row)}>{ row.status === 1 ? '取消发布' : '发布' }<Icon type="close-circle" className={styles.edit} /></span>
107
           </AuthButton>
107
           </AuthButton>
108
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
108
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
109
-            <span style={{ color: '#1990FF' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
109
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this,row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
110
           </AuthButton>
110
           </AuthButton>
111
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
111
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
112
-            <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
113
-            <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
112
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
113
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>
114
           </AuthButton>
114
           </AuthButton>
115
         </>
115
         </>
116
       )
116
       )

+ 4
- 1
src/pages/building/list/index.jsx 查看文件

200
         // eslint-disable-next-line no-console
200
         // eslint-disable-next-line no-console
201
         console.log('提交数据: ', values)
201
         console.log('提交数据: ', values)
202
         const { startDate } = values
202
         const { startDate } = values
203
-        values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
203
+        if (values.startDate !== undefined) {
204
+          alert(111)
205
+          values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
206
+        }
204
         getList({ pageNum: 1, pageSize: 9, ...values })
207
         getList({ pageNum: 1, pageSize: 9, ...values })
205
       }
208
       }
206
     });
209
     });

+ 4
- 4
src/pages/news/list/NewsList.jsx 查看文件

167
         bodyStyle={{ padding: '10px 20px' }}
167
         bodyStyle={{ padding: '10px 20px' }}
168
       >
168
       >
169
         <AuthButton name="admin.taNews.id.put" noRight={null}>
169
         <AuthButton name="admin.taNews.id.put" noRight={null}>
170
-          <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={toEditList(data.newsId)}>
170
+          <span style={{ position: 'absolute', right: '20px', top: '20px', fontSize: ' 0.11rem', color: '#FF7E48', cursor: 'pointer' }} onClick={toEditList(data.newsId)}>
171
             编辑
171
             编辑
172
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
172
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
173
           </span>
173
           </span>
174
           {data.newsStatus === 0 ?
174
           {data.newsStatus === 0 ?
175
-            <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)}>
175
+            <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)}>
176
               取消发布
176
               取消发布
177
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
177
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
178
             </span> :
178
             </span> :
179
-            <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)}>
179
+            <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)}>
180
               发布
180
               发布
181
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
181
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
182
             </span>
182
             </span>
183
           }
183
           }
184
         </AuthButton>
184
         </AuthButton>
185
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
185
         <AuthButton name="admin.taNews.id.delete" noRight={null}>
186
-            <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48' }} onClick={changeNewsListStatus(data.newsId)}>
186
+            <span style={{ position: 'absolute', right: '20px', bottom: ' 0.11rem', fontSize: ' 0.11rem', color: '#FF7E48', cursor: 'pointer' }} onClick={changeNewsListStatus(data.newsId)}>
187
                   删除
187
                   删除
188
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
188
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
189
             </span>
189
             </span>

+ 2
- 2
src/pages/news/type/NewsType.jsx 查看文件

100
       render: (x, row) => (
100
       render: (x, row) => (
101
         <>
101
         <>
102
           <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
102
           <AuthButton name="admin.taNewsType.id.delete" noRight={null}>
103
-            <span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
103
+            <span style={{ color: '#EF273A', marginRight: '20px', cursor: 'pointer' }} onClick={changeNewsStatus(row, row.newsTypeId)}>
104
               {row.status == 1 ? '删除' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
104
               {row.status == 1 ? '删除' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
105
             </span>
105
             </span>
106
           </AuthButton>
106
           </AuthButton>
107
           <AuthButton name="admin.taNewsType.id.put" noRight={null}>
107
           <AuthButton name="admin.taNewsType.id.put" noRight={null}>
108
-            <span style={{ color: '#FF925C' }} onClick={toEditNews(row.newsTypeId)}>
108
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditNews(row.newsTypeId)}>
109
               编辑<Icon type="form" className={styles.edit} />
109
               编辑<Icon type="form" className={styles.edit} />
110
             </span>
110
             </span>
111
           </AuthButton>
111
           </AuthButton>

+ 2
- 2
src/pages/staff/list/RoleList.jsx 查看文件

109
     align: 'center',
109
     align: 'center',
110
 
110
 
111
     render: (text, record) => <>
111
     render: (text, record) => <>
112
-      <span style={{ color: '#1990FF', marginRight: '20px' }} onClick={() => stop(record.roleId)}>{ record.status === 1 ? '停用' : '启用' }
112
+      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId)}>{ record.status === 1 ? '停用' : '启用' }
113
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
113
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
114
       </span>
114
       </span>
115
-      <span style={{ color: '#FF925C' }} onClick={() => toEditRole(record.roleId)} >编辑
115
+      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >编辑
116
       <Icon type="form" className={styles.edit} />
116
       <Icon type="form" className={styles.edit} />
117
       </span>
117
       </span>
118
     </>,
118
     </>,

+ 10
- 0
src/pages/staff/list/StaffList.jsx 查看文件

171
           )}
171
           )}
172
         </Form.Item>
172
         </Form.Item>
173
 
173
 
174
+        <Form.Item>
175
+
176
+          {getFieldDecorator('isConsultant')(
177
+            <Select style={{ width: '180px' }} placeholder="是否置业顾问" >
178
+              <Option value="0">非置业顾问</Option>
179
+              <Option value="1">置业顾问</Option>
180
+            </Select>,
181
+          )}
182
+        </Form.Item>
183
+
174
         <Form.Item>
184
         <Form.Item>
175
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
185
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
176
             搜索
186
             搜索

+ 4
- 0
src/pages/staff/list/editStaff.jsx 查看文件

67
         console.log(data,"tauser")
67
         console.log(data,"tauser")
68
         message.info("保存成功")
68
         message.info("保存成功")
69
         router.go(-1)
69
         router.go(-1)
70
+      }).catch(error => {
71
+        // message.info(error.message)
70
       })
72
       })
71
     }else{
73
     }else{
72
       request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
74
       request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
73
         console.log(data,"tauser")
75
         console.log(data,"tauser")
74
         message.info("保存成功")
76
         message.info("保存成功")
75
         router.go(-1)
77
         router.go(-1)
78
+      }).catch(error => {
79
+        // message.info(error.message)
76
       })
80
       })
77
     }
81
     }
78
   }
82
   }