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

config/config.js

@@ -2,6 +2,9 @@ import defaultSettings from './defaultSettings'; // https://umijs.org/config/
 
 import slash from 'slash2';
 import webpackPlugin from './plugin.config';
+import routes from './routes';
+import proxy from './proxy';
+
 const { pwa, primaryColor } = defaultSettings; // preview.pro.ant.design only do not use in your production ;
 // preview.pro.ant.design 专用环境变量，请不要在你的项目中使用它。
 
@@ -82,385 +85,7 @@ export default {
   },
   devtool: isAntDesignProPreview ? 'source-map' : false,
   // umi routes: https://umijs.org/zh/guide/router.html
-  routes: [
-    {
-      path: '/user',
-      component: '../layouts/UserLayout',
-      routes: [
-        {
-          name: 'login',
-          path: '/user/login',
-          component: './user/login',
-        },
-      ],
-    },
-    {
-      path: '/',
-      component: '../layouts/SecurityLayout',
-      routes: [
-        {
-          path: '/',
-          component: '../layouts/BasicLayout',
-          authority: ['admin', 'user'],
-          routes: [
-            {
-              path: '/',
-              redirect: '/welcome',
-            },
-            {
-              path: '/welcome',
-              name: '首页',
-              component: './Welcome',
-            },
-            {
-              path: '/building',
-              name: '项目管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/building/list',
-                  name: '项目列表',
-                  component: './building/list/index',
-                },
-                {
-                  path: '/building/list/add',
-                  name: '项目添加', // 项目添加
-                  hideInMenu: true,
-                  component: './building/list/add/index',
-                },
-                {
-                  path: '/building/type',
-                  name: '项目类型',
-                  component: './building/type/index',
-                },
-                {
-                  path: '/building/type/edi',
-                  name: '项目类型编辑',
-                  hideInMenu: true,
-                  component: './building/type/edi',
-                },
-              ],
-            },
-            {
-              path: '/customer',
-              name: '客户管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/customer/customerlist/list',
-                  name: '客户列表',
-                  component: './customer/customerlist/index',
-                },
-                {
-                  path: '/customer/customerlist/customerDetail',
-                  name: '客户编辑',
-                  hideInMenu: true,
-                  component: './customer/customerlist/customerDetail',
-                },
-                {
-                  path: '/customer/drift/list',
-                  name: '游客列表',
-                  component: './customer/drift/index',
-                },
-                {
-                  path: '/customer/report/list',
-                  name: '报备客户',
-                  component: './customer/report/index',
-                },
-                {
-                  path: '/customer/recommendCustomer/list',
-                  name: '推荐客户',
-                  component: './customer/recommendCustomer/index',
-                },
-                {
-                  path: '/customer/recommendCustomer/audit',
-                  name: '客户审核', 
-                  hideInMenu: true,
-                  component: './customer/recommendCustomer/audit',
-                },
-                {
-                  path: '/customer/independentList',
-                  name: '经纪人',
-                  component: './customer/independentList/index',
-                },
-              ],
-            },
-            {
-              path: '/integralMall',
-              name: '积分商城',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/integralMall/GoodsList',
-                  name: '商品列表',
-                  component: './integralMall/GoodsList',
-                },
-                {
-                  path: '/integralMall/achieve',
-                  name: '积分获取',
-                  component: './integralMall/achieve',
-                },
-                {
-                  path: '/integralMall/editGoods',
-                  name: '商品编辑',
-                  hideInMenu: true,
-                  component: './integralMall/editGoods',
-                },
-                {
-                  path: '/integralMall/exchangeRecords',
-                  name: '兑换记录',
-                  component: './integralMall/exchangeRecords',
-                },
-                {
-                  path: '/integralMall/writeOff',
-                  name: '商品核销',
-                  component: './integralMall/writeOff',
-                },
-                {
-                  path: '/integralMall/verifyList',
-                  name: '商品核销列表',
-                  hideInMenu: true,
-                  component: './integralMall/verifyList',
-                },
-              ],
-            },
-            {
-              path: '/channel',
-              name: '渠道管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/channel/channelList',
-                  name: '渠道管理',
-                  component: './channel/channelList',
-                },
-                {
-                  path: '/channel/addChannel',
-                  name: '添加渠道',
-                  hideInMenu: true,
-                  component: './channel/addChannel',
-                },
-                {
-                  path: '/channel/editChannel',
-                  name: '编辑渠道',
-                  hideInMenu: true,
-                  component: './channel/editChannel',
-                },
-                {
-                  path: '/channel/brokerList',
-                  name: '经纪人',
-                  component: './channel/brokerList',
-                },
-                {
-                  path: '/channel/recommendClients',
-                  name: '渠道推荐',
-                  hideInMenu: true,
-                  component: './channel/recommendClients',
-                },
-                {
-                  path: '/channel/InviteClients',
-                  name: '邀请客户',
-                  hideInMenu: true,
-                  component: './channel/InviteClients',
-                },
-              ],
-            },
-            {
-              path: '/news',
-              name: '资讯管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/news/type/NewsType',
-                  name: '资讯类型',
-                  component: './news/type/NewsType',
-                },
-                {
-                  path: '/news/type/editNews',
-                  name: '编辑资讯类型',
-                  hideInMenu: true,
-                  component: './news/type/editNews',
-                },
-                {
-                  path: '/news/list/NewsList',
-                  name: '资讯列表',
-                  component: './news/list/NewsList',
-                },
-                {
-                  path: '/news/list/editNewsList',
-                  name: '编辑资讯',
-                  hideInMenu: true,
-                  component: './news/list/editNewsList',
-                },
-              ],
-            },
-            {
-              path: '/activity',
-              name: '活动管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/activity/ActivityList',
-                  name: '活动列表',
-                  component: './activity/ActivityList',
-                },
-                {
-                  path: '/activity/editActivity',
-                  name: '编辑活动',
-                  hideInMenu: true,
-                  component: './activity/editActivity',
-                },
-                {
-                  path: '/activity/SignList',
-                  name: '报名列表',
-                  hideInMenu: true,
-                  component: './activity/SignList',
-                },
-              ],
-            },
-            {
-              path: '/staff',
-              name: '员工管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/staff/StaffList',
-                  name: '员工列表',
-                  component: './staff/list/StaffList',
-                },
-                {
-                  path: '/staff/editStaff',
-                  name: '编辑员工',
-                  hideInMenu: true,
-                  component: './staff/list/editStaff',
-                },
-
-                {
-                  path: '/staff/RoleList',
-                  name: '角色管理',
-                  component: './staff/list/RoleList',
-                },
-                {
-                  path: '/staff/editRole',
-                  name: '编辑角色',
-                  hideInMenu: true,
-                  component: './staff/list/editRole',
-                },
-                {
-                  path: '/staff/list/addRole',
-                  name: '添加角色',
-                  hideInMenu: true,
-                  component: './staff/list/addRole',
-                },  
-              ],
-            },
-            {
-              path: '/carouselFigure',
-              name: '轮播图管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/carouselFigure/carouselFigureList',
-                  name: '轮播图列表',
-                  component: './carouselFigure/carouselFigureList',
-                },
-                {
-                  path: '/carouselFigure/editCarousel',
-                  name: '轮播图编辑',
-                  hideInMenu: true,
-                  component: './carouselFigure/editCarousel',
-                },
-                {
-                  path: '/carouselFigure/advertisingList',
-                  name: '开屏广告',
-                  component: './carouselFigure/advertisingList',
-                },
-                {
-                  path: '/carouselFigure/editAdvertising',
-                  name: '开屏广告编辑',
-                  hideInMenu: true,
-                  component: './carouselFigure/editAdvertising',
-                },
-              ],
-            },
-            {
-              path: '/system',
-              name: '系统管理',
-              component: '../layouts/BlankLayout',
-              routes: [
-                {
-                  path: '/system/messageList',
-                  name: '客户留言',
-                  component: './system/messageList',
-                },
-                {
-                  path: '/system/report',
-                  name: '报表数据',
-                  component: './system/report',
-                },
-                {
-                  path: '/system/intention',
-                  name: '意向值',
-                  component: './system/intention',
-                },
-                {
-                  path: '/system/housingPolicy',
-                  name: '购房政策维护',
-                  component: './system/housingPolicy',
-                },
-                {
-                  path: '/system/editPolicy',
-                  name: '购房政策编辑',
-                  hideInMenu: true,
-                  component: './system/editPolicy',
-                },
-              ],
-            },
-            {
-              path: '/indexEcharts',
-              name: '首页报表',
-              component: '../layouts/SecurityLayout',
-              hideInMenu: true,
-              routes: [
-                {
-                  path: '/indexEcharts/index',
-                  name: '报表',
-                  component: './indexEcharts/index',
-                },
-                {
-                  path: '/indexEcharts/userSource',
-                  name: '用户来源',
-                  component: './indexEcharts/userSource',
-                },
-                {
-                  path: '/indexEcharts/userBehavior',
-                  name: '用户行为',
-                  component: './indexEcharts/userBehavior',
-                },
-                {
-                  path: '/indexEcharts/newUsers',
-                  name: '新增用户',
-                  component: './indexEcharts/newUsers',
-                },
-                
-              ],
-            },
-          
-            
-            {
-              component: './404',
-            },
-          ],
-        },
-        {
-          component: './404',
-        },
-      ],
-    },
-    {
-      component: './404',
-    },
-  ],
+  routes,
   // Theme for antd: https://ant.design/docs/react/customize-theme-cn
   theme: {
     'primary-color': primaryColor,
@@ -508,11 +133,5 @@ export default {
   },
   chainWebpack: webpackPlugin,
 
-  proxy: {
-    '/api/': {
-      target: 'http://192.168.0.84:8080/',
-      changeOrigin: true,
-      // pathRewrite: { '^/server': '' },
-    },
-  },
+  proxy,
 };

src/pages/customer/independentList/index.jsx

@@ -332,6 +332,23 @@ function body(props) {
     })
   }
 
+  function exportIndependen() {
+
+  }
+
+  function download(data) {
+    if (!data) {
+      return
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '经纪人.xlsx')
+    document.body.append(link)
+    link.click()
+  }
+
   const columns = [
     {
       title: '头像',
@@ -415,7 +432,9 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-
+      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
+        导出数据
+      </Button>
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
             {/* 调整归属 */}
         <ModalTable visibleData={gVisibleData} />

src/pages/customer/recommendCustomer/index.jsx

@@ -6,7 +6,6 @@ import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
 import AuthButton from '@/components/AuthButton';
-import axios from 'umi-request';
 
 
 const { Option } = Select;
@@ -83,8 +82,9 @@ function body(props) {
    *
    */
   function exportRecommendCustomer() {
-    axios(apis.customer.customerRecommendRecommenderExport.url, {
-      ...apis.customer.customerRecommendRecommenderExport, responseType: 'blob',
+    request({
+      ...apis.customer.customerRecommendRecommenderExport, 
+      responseType: 'blob',
     }).then(response => {
       // console.log('response: ', response)
       download(response)
@@ -213,10 +213,9 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
+      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
         导出数据
       </Button>
-
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );

src/pages/customer/report/index.jsx

@@ -70,6 +70,23 @@ function body(props) {
       getList({ pageNumber: pageNum, pageSize: 9 })
   }
 
+  function exportReport() {
+
+  }
+
+  function download(data) {
+    if (!data) {
+      return
+    }
+    const url = window.URL.createObjectURL(new Blob([data]))
+    const link = document.createElement('a')
+    link.style.display = 'none'
+    link.href = url
+    link.setAttribute('download', '报备客户.xlsx')
+    document.body.append(link)
+    link.click()
+  }
+
   const columns = [
     {
       title: '头像',
@@ -159,6 +176,9 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
+      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
+        导出数据
+      </Button>
       <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );

src/pages/staff/list/addRole.jsx

@@ -131,7 +131,9 @@ const Poster = props => {
   }
 
   function updateAuthMenu(data) {
+    setLoading(true)
     request({ ...apis.role.updateAuthMenu, data: { ...data } }).then((data) => {
+      setLoading(false)
       toRoleList()
   }).catch((err) => {
       console.log(err)

src/utils/request.js

@@ -75,6 +75,8 @@ request.interceptors.response.use(async (response, options) => {
       });
       throw new Error(response.statusText);
     } else {
+      console.log('response: ', response)
+      console.log('response.headers: ', response.headers)
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         notification.error({