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

config/config.js

@@ -83,6 +83,8 @@ export default {
   targets: {
     ie: 11,
   },
+  publicPath: './',
+  history: 'hash',
   devtool: isAntDesignProPreview ? 'source-map' : false,
   // umi routes: https://umijs.org/zh/guide/router.html
   routes,

config/routes.js

@@ -189,6 +189,7 @@ export default [
               {
                 path: '/channel/brokerList',
                 name: '经纪人',
+                hideInMenu: true,
                 component: './channel/brokerList',
               },
               {

src/components/AuthButton/index.jsx

@@ -7,11 +7,17 @@ const AuthButton = ({ children, name, noRight }) => {
   const btn = allBtns.filter(x => x.code === name)[0]
 
   // 没维护的按钮, 或者不需要权限的按钮直接通过
-  if (!btn || !btn.roles || !btn.roles.length) {
+  // if (!btn || !btn.roles || !btn.roles.length) {
+  //   return <>{children}</>
+  // }
+
+  // const hasRight = btn.roles.some(x => current.some(y => x === y))
+
+  if (!btn || !btn.rolesList || !btn.rolesList.length) {
     return <>{children}</>
   }
 
-  const hasRight = btn.roles.some(x => current.some(y => x === y))
+  const hasRight = btn.rolesList.some(x => current.some(y => x.roleId === y))
   return hasRight ? <>{children}</> : <>{noRight}</>
 }
 

src/pages/building/list/index.jsx

@@ -200,6 +200,7 @@ 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`
         getList({ pageNum: 1, pageSize: 9, ...values })
       }
     });

src/pages/channel/brokerList.jsx

@@ -103,7 +103,7 @@ const header = props => {
 //   const [page, changePage] = useState({})
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getListBroker()
+    getListBroker({ channelId: props.location.query.id, pageNum: 1, pageSize: 10 })
   }, [])
 
     function getListBroker(params) {
@@ -118,7 +118,7 @@ const header = props => {
 
  // 查询
  function queryList() {
-  getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId: localStorage.getItem('value') })
+  getListBroker({ ...queryData, pageNum: 1, pageSize: 10, channelId: props.location.query.id })
 }
     // 分页
     function onChange(pageNumber) {

src/pages/channel/channelList.jsx

@@ -64,6 +64,7 @@ const columns = [
     dataIndex: 'brokerCount',
     key: 'brokerCount',
     align: 'center',
+      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick= {() => toBroker(record)} >{ record.recommendCount }</a>,
   },
   {
     title: '推荐客户有效',
@@ -86,7 +87,7 @@ const columns = [
       <AuthButton name="admin.channel.id.put" noRight={null}>
         <a style={{ color: '#66B3FF' }} onClick={() => toedit(record.channelId)} >编辑</a>
       </AuthButton>
-    )
+    ),
   },
 ];
 
@@ -110,6 +111,19 @@ function toedit(channelId) {
   });
 }
 
+// 经纪人页面
+function toBroker(record) {
+  if (record.brokerCount === 0) {
+    return
+  }
+  router.push({
+    pathname: '/channel/brokerList',
+    query: {
+      id: record.channelId,
+    },
+  });
+}
+
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
   const [data, setData] = useState({ channelNmae: [], result: [] })

src/pages/customer/customerlist/components/attribution.jsx

@@ -81,11 +81,8 @@ class ModalAttribution extends React.Component {
 
   // 提交
   submitGm(record) {
-    const { url, method } = apis.customer.recommendEdit
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(this.state.visibleData.customerId)
-
     // 网路请求
-    request({ url: tempUrl, method, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
+    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, realtyConsultant: record.personId } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()

src/pages/customer/customerlist/components/changeStatus.jsx

@@ -41,11 +41,8 @@ class ChangeStatus extends React.Component {
   };
 
   submitButton = e => {
-    const { url, method } = apis.customer.recommendEdit
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(this.state.visibleData.customerId)
-
     // 网路请求
-    request({ url: tempUrl, method, data: { customerId: this.state.visibleData.customerId, status: this.state.value } }).then(res => {
+    request({ ...apis.customer.recommendEdit, urlData: { id: this.state.visibleData.customerId }, data: { customerId: this.state.visibleData.customerId, status: this.state.value } }).then(res => {
       // eslint-disable-next-line no-unused-expressions
       this.openNotificationWithIcon('success', '操作成功')
       this.handleCancel()

src/pages/customer/customerlist/components/integralRecord.jsx

@@ -62,11 +62,8 @@ class ModalIntegralRecord extends React.Component {
       return
     }
     // 网路请求
-    const { url, method } = apis.customer.taPointsRecords
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(customerId)
-
     // 网路请求
-    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+    request({ ...apis.customer.taPointsRecords, urlData: { id: customerId }, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       this.openNotificationWithIcon('error', err)

src/pages/customer/customerlist/customerDetail.jsx

@@ -28,10 +28,8 @@ function header(props) {
     if (id === '' || id === undefined) {
       return
     }
-    const { url, method } = apis.customer.CustomerRecommendGet
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(id)
 
-    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+    request({ ...apis.customer.CustomerRecommendGet, urlData: { id }, params: { ...params } }).then(res => {
       setData(res)
     })
   }

src/pages/customer/independentList/index.jsx

@@ -53,10 +53,8 @@ class ModalTable extends React.Component {
       return
     }
     // 网路请求
-    const { url, method } = apis.customer.recommend
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(customerId)
     // 网路请求
-    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+    request({ ...apis.customer.recommend, urlData: { id: customerId }, params: { ...params } }).then(res => {
       this.setState({ dataSource: res })
     }).catch(err => {
       // eslint-disable-next-line no-unused-expressions

src/pages/customer/recommendCustomer/audit.jsx

@@ -41,20 +41,14 @@ function body(props) {
 
   // 获取详情信息
   function getById(currentId) {
-    const { url, method } = apis.customer.recommendGetById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
-
-    request({ url: tempUrl, method }).then(res => {
+    request({ ...apis.customer.recommendGetById, urlData: { id: currentId } }).then(res => {
       props.form.setFieldsValue(res)
     })
   }
 
   function submitDate(params) {
-    const { url, method } = apis.customer.auto
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(params.customerId)
-
     // props.form.setFieldsValue(res)
-    request({ url: tempUrl, method, params: { verifyStatus: params.verifyStatus } }).then(() => {
+    request({ ...apis.customer.auto, urlData: { id: params.customerId }, params: { verifyStatus: params.verifyStatus } }).then(() => {
       // eslint-disable-next-line no-unused-expressions
       <Alert
         style={{

src/pages/news/list/editNewsList.jsx

@@ -37,15 +37,22 @@ const { TextArea } = Input;
 
   // 查询列表
   const getDynamicData = (newsId) => {
-    request({
-        url: '/api/admin/taNews/' + newsId,
-        method: 'GET',
-        params: { newsId },
-    }).then((data) => {
-        console.log(data)
+    request({ ...apis.news.get, urlData: { id: newsId },}).then((data) => {
         setDynamicData(data)
+    }).catch((err) => {
+      console.log(err)
+      message.info(err.msg || err.message)
     })
-  }
+
+    // request({
+    //     url: '/api/admin/taNews/' + newsId,
+    //     method: 'GET',
+    //     params: { newsId },
+    // }).then((data) => {
+    //     console.log(data)
+    //     setDynamicData(data)
+    // })
+    }
   }
 
   const cancelPage = () =>{
@@ -99,24 +106,17 @@ const { TextArea } = Input;
   
     const handleSubmit = val => { 
       let {...submitValue} = val
+      
       if(newsId){
         submitValue.newsId = newsId
-        request({
-          url: '/api/admin/taNews/' + newsId,
-          method: 'PUT',
-          data: submitValue,
-        }).then((data) => {
-          cancelPage()
+        request({ ...apis.news.put, urlData: {id: newsId}, data: { ...submitValue },}).then((data) => {
+          cancelPage();
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/taNews',
-          method: 'POST',
-          data: submitValue,
-        }).then((data) => {
-          cancelPage()
+        request({ ...apis.news.post, data: { ...submitValue },}).then((data) => {
+          cancelPage();
         }).catch((err) => {
           message.info(err.msg || err.message)
         })

src/pages/news/type/NewsType.jsx

@@ -68,14 +68,6 @@ function header(props) {
           message.info(err.msg || err.message)
         })
 
-        // request({
-        //   url: '/api/admin/taNewsType/' + newsId,
-        //   method: 'DELETE',
-        //   data: { ...row },
-        // }).then((data) => {
-        //   message.info('操作成功！')
-        //   getList({ pageNum: 1, pageSize: 10 });
-        // })
       }
     });
   }

src/pages/news/type/editNews.jsx

@@ -5,6 +5,7 @@ import channels from '../../channel/channelList.less';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../../components/XForm';
 import router from 'umi/router';
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
 const { TextArea } = Input;
@@ -21,6 +22,12 @@ const header = props => {
 
   // 查询列表
   const getNewsData = (newsId) => {
+    request({ ...apis.newsType.get, urlData: { id: newsId },}).then((data) => {
+      cancelPage();
+    }).catch((err) => {
+      message.info(err.msg || err.message)
+    })
+
     request({
         url: '/api/admin/taNewsType/' + newsId,
         method: 'GET',
@@ -61,26 +68,28 @@ const header = props => {
    
   const handleSubmit = (values) => {
     if(newsId){
-      values.newsTypeId = newsId
-      request({
-        url: '/api/admin/taNewsType/' + newsId,
-        method: 'PUT',
-        data: values,
-      }).then((data) => {
-        cancelPage()
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
+        values.newsTypeId = newsId
+        request({ ...apis.newsType.put, urlData: { id: newsId },}).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
       }else{
-      request({
-        url: '/api/admin/taNewsType',
-        method: 'POST',
-        data: values,
-      }).then((data) => {
-        cancelPage()
-      }).catch((err) => {
-        message.info(err.msg || err.message)
-      })
+        request({ ...apis.newsType.post, data: { values },}).then((data) => {
+          cancelPage();
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+
+      // request({
+      //   url: '/api/admin/taNewsType',
+      //   method: 'POST',
+      //   data: values,
+      // }).then((data) => {
+      //   cancelPage()
+      // }).catch((err) => {
+      //   message.info(err.msg || err.message)
+      // })
       }
   }
 

src/services/apis.js

@@ -137,6 +137,21 @@ export default {
         url: `${prefix}/taNews/:id`,
         action: 'admin.taNews.id.put',
     },
+    get: {
+        method: 'GET',
+        url: `${prefix}/taNews/:id`,
+        action: 'admin.taNews.id.get',
+    },
+    post: {
+      method: 'POST',
+      url: `${prefix}/taNews`,
+      action: 'admin.taNews.post',
+    },
+    put: {
+      method: 'PUT',
+      url: `${prefix}/taNews/:id`,
+      action: 'admin.taNews.id.put',
+    }
   },
   newsType: {
     list: {
@@ -149,6 +164,21 @@ export default {
         url: `${prefix}/taNewsType/:id`,
         action: 'admin.taNewsType.id.delete',
     },
+    put: {
+      method: 'PUT',
+      url: `${prefix}/taNewsType/:id`,
+      action: 'admin.taNewsType.id.delete',
+    },
+    post: {
+      method: 'POST',
+      url: `${prefix}/taNewsType`,
+      action: 'admin.taNewsType.post',
+    },
+    get: {
+      method: 'GET',
+      url: `${prefix}/taNewsType/:id`,
+      action: 'admin.taNewsType.get',
+    }
   },
   customer: {
     drift: {
@@ -168,12 +198,12 @@ export default {
     },
     auto: {
       method: 'PUT',
-      url: `${prefix}/customer/recommend/verify/id`,
+      url: `${prefix}/customer/recommend/verify/:id`,
       action: 'admin.customer.recommend.verify.id.put',
     },
     recommendGetById: {
       method: 'GET',
-      url: `${prefix}/customer/recommend/getById/id`,
+      url: `${prefix}/customer/recommend/getById/:id`,
       action: 'admin.customer.recommend.getById.id.get',
     },
     agents: {
@@ -193,17 +223,17 @@ export default {
     },
     recommendEdit: {
       method: 'PUT',
-      url: `${prefix}/customer/recommend/edit/id`,
+      url: `${prefix}/customer/recommend/edit/:id`,
       action: 'admin.customer.recommend.edit.id.put',
     },
     taPointsRecords: {
       method: 'GET',
-      url: `${prefix}/mine/taPointsRecords/id`,
+      url: `${prefix}/mine/taPointsRecords/:id`,
       action: 'admin.mine.taPointsRecords.id.get',
     },
     recommend: {
       method: 'GET',
-      url: `${prefix}/customer/recommend/id`,
+      url: `${prefix}/customer/recommend/:id`,
       action: 'admin.customer.recommend.id.get',
     },
     InviteClientsList: {
@@ -213,7 +243,7 @@ export default {
     },
     CustomerRecommendGet: {
       method: 'GET',
-      url: `${prefix}/customer/recommend/get/id`,
+      url: `${prefix}/customer/recommend/get/:id`,
       action: 'admin.customer.recommend.get.id.get',
     },
     customerRecommendRecommenderExport: { // 导出数据（推荐客户）

src/utils/request.js

@@ -84,11 +84,19 @@ request.interceptors.response.use(async (response, options) => {
 
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
-        notification.error({
-          message: `请求错误`,
-          description: message,
-        });
-        throw new Error(message);
+        if (code === 1001) {
+          notification.error({
+            message: `请求错误`,
+            description: '请登录系统',
+          });
+          throw new Error('请登录系统');
+        } else {
+          notification.error({
+            message: `请求错误`,
+            description: message,
+          });
+          throw new Error(message);
+        }
       }
 
       if (data && data.token) {