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

src/pages/customer/independentList/index.jsx

@@ -333,7 +333,12 @@ function body(props) {
   }
 
   function exportIndependen() {
+    request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
+    .then(response => {
+      download(response)
+    }).catch(error => {
 
+    })
   }
 
   function download(data) {
@@ -432,7 +437,7 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
+      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
         导出数据
       </Button>
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/pages/customer/report/index.jsx

@@ -71,7 +71,10 @@ function body(props) {
   }
 
   function exportReport() {
-
+    request({ ...apis.customer.customerRecommendReportExport, responseType: 'blob' })
+    .then(response => {
+      download(response)
+    })
   }
 
   function download(data) {
@@ -176,7 +179,7 @@ function body(props) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px', display: 'none' }}>
+      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px' }}>
         导出数据
       </Button>
       <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/services/apis.js

@@ -221,6 +221,16 @@ export default {
       url: `${prefix}/customer/recommend/recommender/export`,
       action: 'admin.customer.recommend.recommender.export.get',
     },
+    customerRecommendReportExport: { // 导出数据（报备客户）
+      method: 'GET',
+      url: `${prefix}/customer/recommend/report/export`,
+      action: 'admin.customer.recommend.report.export.get',
+    },
+    customerRecommendAgentsExport: { // 导出数据（经纪人）
+      method: 'GET',
+      url: `${prefix}/customer/recommend/agents/export`,
+      action: 'admin.customer.recommend.agents.export.get',
+    },
   },
   indexEcharts: {
     userResource: {

src/utils/request.js

@@ -79,7 +79,7 @@ request.interceptors.response.use(async (response, options) => {
       console.log('response.headers: ', response.headers)
       console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
       if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
-        return response
+        return await response.clone().blob();
       }
 
       const { code, data, message } = await response.clone().json();