fix

config/proxy.js

@@ -9,7 +9,7 @@ export default {
   dev: {
     '/api/': {
       target: 'https://xlk.njyz.tech/',
-      // target: 'http://localhost:8567/',
+      // target: 'http://localhost:8081/',
       // target: 'https://www.newhousehold.cn',
       changeOrigin: true,
       pathRewrite: {

src/pages/findRoom/addedValueService/index.jsx

@@ -1,4 +1,4 @@
-import React, { PureComponent, useMemo, useState } from 'react';
+import React, { PureComponent, useMemo, useRef, useState } from 'react';
 import { Avatar, Button } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
@@ -15,6 +15,8 @@ import AuthButton from '@/components/AuthButton';
  */
 
 function Recommend() {
+
+  const ref=useRef()
   const [exportLoding, setExportLoding] = useState(false);
   //详情页面弹窗配置
   function toAudit(row, type) {
@@ -43,11 +45,13 @@ function Recommend() {
   function exportRecommendCustomer() {
     setExportLoding(true);
     request({
-      ...apis.customer.customerRecommendRecommenderExport,
+      ...apis.searchHouse.exportHouse,
       responseType: 'blob',
+      params: {
+        ...ref.current.getSearchData,
+      },
     })
       .then(response => {
-        console.log('exportRecommendCustomer: ', response);
         download(response);
       })
       .catch(error => {});
@@ -225,8 +229,8 @@ function Recommend() {
   return (
     <>
       <QueryTable
-        rowKey="recommendCustomer"
-        // recommendCustomer
+        rowKey="id"
+        ref={ref}
         api={apis.searchHouse.list}
         searchFields={searchFields}
         columns={columns}

src/pages/findRoom/buyRoom/index.jsx

@@ -1,4 +1,4 @@
-import React, { PureComponent, useMemo, useState } from 'react';
+import React, { PureComponent, useMemo, useRef, useState } from 'react';
 import { Avatar, Button } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
@@ -15,6 +15,8 @@ import AuthButton from '@/components/AuthButton';
  */
 
 function Recommend() {
+
+  const ref = useRef()
   const [exportLoding, setExportLoding] = useState(false);
   //详情页面弹窗配置
   function toAudit(row, type) {
@@ -37,14 +39,17 @@ function Recommend() {
   //   }
 
   /**
-   *导出数据（推荐用户）
+   *导出数据
    *
    */
   function exportRecommendCustomer() {
     setExportLoding(true);
     request({
-      ...apis.customer.customerRecommendRecommenderExport,
+      ...apis.searchHouse.exportHouse,
       responseType: 'blob',
+      params:{
+        ...ref.current.getSearchData
+      }
     })
       .then(response => {
         console.log('exportRecommendCustomer: ', response);
@@ -210,17 +215,17 @@ function Recommend() {
   ];
   const actionRender = () => {
     return (
-      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+      <Button type='primary' loading={exportLoding} onClick={() => exportRecommendCustomer()}>
         导出
       </Button>
     );
   };
-
+  
   return (
     <>
       <QueryTable
-        rowKey="recommendCustomer"
-        // recommendCustomer
+        rowKey="id"
+        ref={ref}
         api={apis.searchHouse.list}
         searchFields={searchFields}
         postData={data => {

src/pages/findRoom/overseas/index.jsx

@@ -1,4 +1,4 @@
-import React, { PureComponent, useMemo, useState } from 'react';
+import React, { PureComponent, useMemo, useRef, useState } from 'react';
 import { Avatar, Button } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
@@ -18,6 +18,8 @@ import AuthButton from '@/components/AuthButton';
 
 
 function Recommend() {
+
+  const ref= useRef()
   const [exportLoding, setExportLoding] = useState(false)
   //详情页面弹窗配置
   function toAudit(row,type) {
@@ -48,8 +50,11 @@ function Recommend() {
   function exportRecommendCustomer() {
     setExportLoding(true)
     request({
-      ...apis.customer.customerRecommendRecommenderExport,
+      ...apis.searchHouse.exportHouse,
       responseType: 'blob',
+      params: {
+        ...ref.current.getSearchData,
+      },
     }).then(response => {
       console.log('exportRecommendCustomer: ', response)
       download(response)
@@ -66,7 +71,7 @@ function Recommend() {
     const link = document.createElement('a')
     link.style.display = 'none'
     link.href = url
-    link.setAttribute('download', '找房需求.xlsx')
+    link.setAttribute('download', '海外需求.xlsx')
     document.body.append(link)
     link.click()
     setExportLoding(false)
@@ -196,7 +201,7 @@ function Recommend() {
   ]
   const actionRender = () => {
     return (
-      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+      <Button type='primary' loading={exportLoding} onClick={() => exportRecommendCustomer()}>
         导出
       </Button>
     );
@@ -205,8 +210,8 @@ function Recommend() {
   return (
     <>
       <QueryTable
-        rowKey="recommendCustomer"
-        // recommendCustomer
+        rowKey="id"
+        ref={ref}
         api={apis.searchHouse.list}
         searchFields={searchFields}
         columns={columns}

src/pages/findRoom/rent/index.jsx

@@ -1,9 +1,9 @@
-import React, { PureComponent, useMemo, useState } from 'react';
+import React, { PureComponent, useMemo, useRef, useState } from 'react';
 import { Avatar, Button } from 'antd';
 import moment from 'moment';
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
-import QueryTable from '@/components/QueryTable'
+import QueryTable from '@/components/QueryTable';
 import { router } from 'umi';
 import AuthButton from '@/components/AuthButton';
 
@@ -14,62 +14,60 @@ import AuthButton from '@/components/AuthButton';
  * @returns
  */
 
-
-
-
 function Recommend() {
-  const [exportLoding, setExportLoding] = useState(false)
+  const ref = useRef();
+  const [exportLoding, setExportLoding] = useState(false);
   //详情页面弹窗配置
-  function toAudit(row,type) {
+  function toAudit(row, type) {
     router.push({
       pathname: '/findRoom/rent/audit',
       query: {
         id: row.id,
-        type:type
+        type: type,
       },
-    })
-
+    });
   }
-//   function toSee(cuurentId) {
-//     router.push({
-//       pathname: '/home/recommend/auditCopy',
-//       query: {
-//         id: cuurentId,
-//       },
-//     })
-
-//   }
+  //   function toSee(cuurentId) {
+  //     router.push({
+  //       pathname: '/home/recommend/auditCopy',
+  //       query: {
+  //         id: cuurentId,
+  //       },
+  //     })
 
+  //   }
 
   /**
    *导出数据（推荐用户）
    *
    */
   function exportRecommendCustomer() {
-    setExportLoding(true)
+    setExportLoding(true);
     request({
-      ...apis.customer.customerRecommendRecommenderExport,
+      ...apis.searchHouse.exportHouse,
       responseType: 'blob',
-    }).then(response => {
-      console.log('exportRecommendCustomer: ', response)
-      download(response)
-    }).catch(error => {
-
+      params: {
+        ...ref.current.getSearchData,
+      },
     })
+      .then(response => {
+        download(response);
+      })
+      .catch(error => {});
   }
 
   function download(data) {
     if (!data) {
-      return
+      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()
-    setExportLoding(false)
+    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();
+    setExportLoding(false);
   }
   const columns = [
     {
@@ -98,15 +96,18 @@ function Recommend() {
       key: 'gender',
       align: 'center',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
+      render: (_, record) => (
+        <>
+          <span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span>
+        </>
+      ),
     },
     {
       title: '意向区域',
-      dataIndex: 'name',//意向区域
+      dataIndex: 'name', //意向区域
       key: 'name',
       align: 'center',
       // render: (_, record) => <><span>{record.area = '江苏省南京市秦淮区'}</span></>,
-
     },
     {
       title: '租房预算（元/月）',
@@ -114,21 +115,38 @@ function Recommend() {
       key: 'maxPrice',
       align: 'center',
       // render:(_,record)=><span>{record='香颂.蔚澜半岛'}</span>
-
     },
     {
       title: '提交时间',
       dataIndex: 'createdTime',
       key: 'createdTime',
       align: 'center',
-      render: (_, record) => <><span>{record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}</span></>,
+      render: (_, record) => (
+        <>
+          <span>
+            {record.createdTime && moment(record.createdTime).format('YYYY-MM-DD HH:mm:ss')}
+          </span>
+        </>
+      ),
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: (_, record) => <><span>{record.status == 0 ? '待回访' : record.status == 1 ? '已回访' : record.status == 2 ? '无效' : ''}</span></>,
+      render: (_, record) => (
+        <>
+          <span>
+            {record.status == 0
+              ? '待回访'
+              : record.status == 1
+              ? '已回访'
+              : record.status == 2
+              ? '无效'
+              : ''}
+          </span>
+        </>
+      ),
     },
     {
       title: '操作',
@@ -138,24 +156,23 @@ function Recommend() {
 
       render: (_, record) => (
         <>
-        {record.status == '0' ? (
-          <AuthButton name="house.rent.reply" noRight={null}>
-            <Button type="link" onClick={() => toAudit(record, 'edit')}>
-              审核
-            </Button>
-          </AuthButton>
-        ) : (
-          <AuthButton name="house.rent.detail" noRight={null}>
-            <Button type="link" onClick={() => toAudit(record, 'detail')}>
-              查看详情
-            </Button>
-          </AuthButton>
-        )}
-      </>
+          {record.status == '0' ? (
+            <AuthButton name="house.rent.reply" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'edit')}>
+                审核
+              </Button>
+            </AuthButton>
+          ) : (
+            <AuthButton name="house.rent.detail" noRight={null}>
+              <Button type="link" onClick={() => toAudit(record, 'detail')}>
+                查看详情
+              </Button>
+            </AuthButton>
+          )}
+        </>
       ),
     },
-  ]
-
+  ];
 
   const searchFields = [
     {
@@ -185,18 +202,18 @@ function Recommend() {
       label: '状态',
       placeholder: '请选择状态',
       type: 'select',
-      placeholder: '全部',//错误
+      placeholder: '全部', //错误
       options: [
         { label: '全部', value: '' },
         { label: '待回访', value: '0' },
         { label: '已回访', value: '1' },
-        { label: '无效', value: '2' }
-      ]
+        { label: '无效', value: '2' },
+      ],
     },
-  ]
+  ];
   const actionRender = () => {
     return (
-      <Button type="danger" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
+      <Button type="primary" loading={exportLoding} onClick={() => exportRecommendCustomer()}>
         导出
       </Button>
     );
@@ -205,21 +222,19 @@ function Recommend() {
   return (
     <>
       <QueryTable
-        rowKey="recommendCustomer"
-        // recommendCustomer
+        rowKey="id"
+        ref={ref}
         api={apis.searchHouse.list}
         searchFields={searchFields}
         postData={data => {
-        
-          data.type='2'
+          data.type = '2';
           return data;
         }}
         columns={columns}
         // actionRender={actionRender}
       />
-
     </>
   );
 }
 
-export default Recommend
+export default Recommend;

src/services/apis.js

@@ -326,6 +326,12 @@ export default {
       url: `${prefix}/searchHouse`,
       action: 'admin.searchHouse.get',
     },
+    exportHouse: {
+      method: 'GET',
+      url: `${prefix}/exportHouse`,
+      action: 'admin.exportHouse.get',
+    },
+    // /admin?name=&phone=&status=
     //根据ID查询
     IdHouse: {
       method: 'GET',
@@ -1823,6 +1829,11 @@ export default {
       method: 'put',
       action: 'admin.publish.live.id.put',
     },
+    livehome: {
+      url: `${prefix}/home/live/:id`,
+      method: 'put',
+      action: 'admin.publish.live.id.put',
+    },
   },
   taH5SampleManager: {
     taH5Demand: {
@@ -2372,6 +2383,11 @@ export default {
       url: `${prefix}/publish/:id`,
       action: 'admin.publish.id.put',
     },
+    home: {
+      method: 'PUT',
+      url: `${prefix}/home/video/:id`,
+      action: 'admin.publish.id.put',
+    },
     delete: {
       method: 'DELETE',
       url: `${prefix}/video/:id`,