feats

config/proxy.js

@@ -1,38 +1,38 @@
-/**
- * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
- * The agent cannot take effect in the production environment
- * so there is no configuration of the production environment
- * For details, please see
- * https://pro.ant.design/docs/deploy
- */
-export default {
-  dev: {
-    '/api/': {
-      // target: 'https://xlk.njyz.tech/',
-      target: 'http://192.168.89.147:8081',
-      // target: 'https://www.newhousehold.cn',
-      changeOrigin: true,
-      pathRewrite: {
-        '^': '',
-      },
-    },
-  },
-  test: {
-    '/api/': {
-      target: 'https://xlk.njyz.tech',
-      changeOrigin: true,
-      pathRewrite: {
-        '^': '',
-      },
-    },
-  },
-  pre: {
-    '/api/': {
-      target: 'your pre url',
-      changeOrigin: true,
-      pathRewrite: {
-        '^': '',
-      },
-    },
-  },
-};
+/**
+ * 在生产环境 代理是无法生效的，所以这里没有生产环境的配置
+ * The agent cannot take effect in the production environment
+ * so there is no configuration of the production environment
+ * For details, please see
+ * https://pro.ant.design/docs/deploy
+ */
+export default {
+  dev: {
+    '/api/': {
+      // target: 'https://xlk.njyz.tech/',
+      target: 'http://192.168.89.76:8081',
+      // target: 'https://www.newhousehold.cn',
+      changeOrigin: true,
+      pathRewrite: {
+        '^': '',
+      },
+    },
+  },
+  test: {
+    '/api/': {
+      target: 'https://xlk.njyz.tech',
+      changeOrigin: true,
+      pathRewrite: {
+        '^': '',
+      },
+    },
+  },
+  pre: {
+    '/api/': {
+      target: 'your pre url',
+      changeOrigin: true,
+      pathRewrite: {
+        '^': '',
+      },
+    },
+  },
+};

src/pages/activity/groupRoomActivity/detail.jsx

@@ -1,287 +1,284 @@
-import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
-
-import apis from '@/services/apis';
-import moment from 'moment';
-import router from 'umi/router';
-import BuildSelect from '@/components/SelectButton/BuildSelect';
-import request from '@/utils/request';
-import yinhao from '@/assets/yinhao.png';
-import logo from '@/assets/logo.svg';
-import touxiang from '@/assets/touxiang.jpg';
-import poster1 from '@/assets/poster1.png';
-import poster2 from '@/assets/poster2.png';
-import xiaochengxu from '@/assets/xiaochengxu.png';
-import AuthButton from '@/components/AuthButton';
-import { getImgURL } from '@/utils/image';
-import Share from '@/components/Share';
-import Poster from '@/components/Poster';
-import PictureQRcode from '@/utils/imageQC'
-
-const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
-const { TextArea } = Input;
-
-const formItemLayout = {
-  labelCol: { span: 6 },
-  wrapperCol: { span: 14 },
-};
-
-const cancelPage = () => {
-  router.go('-1');
-};
-
-const getSignList = dynamicId => {
-  router.push({
-    pathname: '/activity/groupRoomActivity/registrationRecord',
-    query: {
-      dynamicId,
-    },
-  });
-};
-
-
-
-// const newQrcode = row => {
-//   const x = new XMLHttpRequest();
-//   const resourceUrl = row.qrCode;
-//   x.open('GET', resourceUrl, true);
-//   x.responseType = 'blob';
-//   x.onload = function (e) {
-//     const url = window.URL.createObjectURL(x.response);
-//     const a = document.createElement('a');
-//     a.href = url;
-//     a.style.display = 'none';
-//     a.download = '活动二维码.png';
-//     a.click();
-//   };
-//   x.send();
-// };
-
-const BasicForm = props => {
-  const detailData = props.detailData || {};
-
-  const radioOnChange = e => {
-    // setIsEnlist(e.target.value)
-  };
-
-  const { dynamicId } = props;
-  const handleSubmit = e => {
-    e.preventDefault();
-    props.form.validateFields((err, values) => {
-      if (!err) {
-        console.log('Received values of form: ', values);
-        const { activityTime, signupTime } = values;
-        const [startDate, endDate] = activityTime;
-        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
-        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
-        if (signupTime) {
-          const [enlistStart, enlistEnd] = signupTime;
-          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
-          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
-        }
-        console.log('submit data --->', values);
-        if (dynamicId) {
-          values.dynamicId = dynamicId;
-          request({ ...apis.activity.update, data: values })
-            .then(data => {
-              message.info('保存成功');
-              // router.go(-1)
-            })
-            .catch(err => {
-              message.info(err.msg || err.message);
-            });
-        } else {
-          request({ ...apis.activity.add, data: { ...values } })
-            .then(data => {
-              message.info('保存成功');
-              router.push({
-                pathname: '/activity/editActivity',
-                query: {
-                  dynamicId: data.dynamicId,
-                },
-              });
-              // router.go(-1)
-            })
-            .catch(err => {
-              message.info(err.msg || err.message);
-            });
-        }
-      }
-    });
-  };
-
-  const { getFieldDecorator } = props.form;
-  return (
-    <>
-      <Form {...formItemLayout} onSubmit={handleSubmit}>
-        <Form.Item label="所属项目">
-          {getFieldDecorator('buildingId', {
-            initialValue: detailData.buildingId,
-            rules: [
-              {
-                required: true,
-                message: '请选择所属项目',
-              },
-            ],
-          })(<BuildSelect disabled />)}
-        </Form.Item>
-        <Form.Item label="活动封面图1">
-          <img src={getImgURL(detailData.listImgUrl)} height="210px" width="375px" />
-        </Form.Item>
-        {/* <Form.Item label="活动封面图2">
-          <img src={getImgURL(detailData.bannerListImg)} height="125px" width="375px" />
-        </Form.Item> */}
-        <Form.Item label="活动详情主图">
-          <img src={getImgURL(detailData.imgUrl)} height="300px" width="375px" />
-        </Form.Item>
-        <Form.Item label="活动标题">
-          <span>{detailData.title}</span>
-        </Form.Item>
-        <Form.Item label="副标题">
-          <span>{detailData.halfTitle}</span>
-        </Form.Item>
-        <Form.Item label="活动时间">
-          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(
-            detailData.endDate,
-          ).format('YYYY-MM-DD HH:mm')}`}</span>
-        </Form.Item>
-        <Form.Item label="活动地点">
-          <span>{detailData.address}</span>
-        </Form.Item>
-        <Form.Item label="活动人数">
-          <span>{detailData.personNum}</span>
-        </Form.Item>
-        <Form.Item label="团房价">
-          <span>{detailData.groupBuyPrice}</span>
-        </Form.Item>
-        {/* <Form.Item label="阅读量">
-          <span>{detailData.pvNum}</span>
-        </Form.Item>
-        <Form.Item label="转发量">
-          <span>{detailData.shareNum}</span>
-        </Form.Item>
-        <Form.Item label="收藏数">
-          <span>{detailData.saveNum}</span>
-        </Form.Item>
-        <Form.Item label="最大报名人数">
-          <span>{detailData.maxEnlistByPerson}</span>
-        </Form.Item> */}
-        <Form.Item label="活动详情">
-          <div
-            style={{ maxHeight: '500px', overflowY: 'auto' }}
-            dangerouslySetInnerHTML={{ __html: detailData.desc }}
-          ></div>
-        </Form.Item>
-        <Form.Item label="报名时间">
-          <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(
-            detailData.enlistEnd,
-          ).format('YYYY-MM-DD HH:mm')}`}</span>
-        </Form.Item>
-        <Form.Item label="权重">
-          <span>{detailData.heavy}</span>
-        </Form.Item>
-      </Form>
-      <div style={{ textAlign: 'center' }}>
-        <AuthButton name="admin.SignList.get" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
-            <span
-              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
-              onClick={getSignList.bind(this, detailData.dynamicId)}
-            >
-              <Button>报名记录</Button>
-            </span>
-          )}
-        </AuthButton>
-        <AuthButton name="admin.dymic.qrcode" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
-            <span
-              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
-              // onClick={newQrcode.bind(this, detailData)}
-
-              onClick={() => {
-                PictureQRcode(detailData, '活动二维码')
-              }}
-            >
-              {<Button>下载二维码</Button>}
-            </span>
-          )}
-        </AuthButton>
-        <Button onClick={() => cancelPage()}>取消</Button>
-      </div>
-    </>
-  );
-};
-
-const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
-
-/**
- *
- *
- * @param {*} props
- * @returns
- */
-const Edit = props => {
-  const [tab, changeTab] = useState('basic');
-  const { dynamicId } = props.location.query;
-  const [detailData, setDetailData] = useState(false);
-
-  const getDynamicData = dynamicId => {
-    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
-      console.log(data);
-      data.activityTime = [moment(data.startDate), moment(data.endDate)];
-      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)];
-
-      setDetailData(data);
-    });
-  };
-
-  useEffect(() => {
-    if (dynamicId) {
-      getDynamicData(dynamicId);
-    }
-  }, []);
-
-  const target = { id: dynamicId, type: 'activity' };
-  return (
-    <Card>
-      <div>
-        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
-          <Radio.Button value="basic">基本信息</Radio.Button>
-          {/* <Radio.Button value="poster">海报图片</Radio.Button>
-          <Radio.Button value="share">分享设置</Radio.Button> */}
-        </Radio.Group>
-      </div>
-      <div>
-        {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
-
-        {tab === 'poster' && <Poster target={target} />}
-        {tab === 'share' && <Share target={target} />}
-      </div>
-      {/* <div style={{ textAlign: 'center' }}>
-        <AuthButton name="admin.SignList.get" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
-            <span
-              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
-              onClick={getSignList.bind(this, detailData.dynamicId)}
-            >
-              <Button>报名记录</Button>
-            </span>
-          )}
-        </AuthButton>
-        <AuthButton name="admin.dymic.qrcode" noRight={null}>
-          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
-            <span
-              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
-              onClick={newQrcode.bind(this, detailData)}
-            >
-              {<Button>下载二维码</Button>}
-            </span>
-          )}
-        </AuthButton>
-        <Button onClick={() => cancelPage()}>取消</Button>
-      </div> */}
-    </Card>
-  );
-};
-
-export default Edit;
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, Card, Radio, DatePicker, message, Upload } from 'antd';
+
+import apis from '@/services/apis';
+import moment from 'moment';
+import router from 'umi/router';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
+import request from '@/utils/request';
+import yinhao from '@/assets/yinhao.png';
+import logo from '@/assets/logo.svg';
+import touxiang from '@/assets/touxiang.jpg';
+import poster1 from '@/assets/poster1.png';
+import poster2 from '@/assets/poster2.png';
+import xiaochengxu from '@/assets/xiaochengxu.png';
+import AuthButton from '@/components/AuthButton';
+import { getImgURL } from '@/utils/image';
+import Share from '@/components/Share';
+import Poster from '@/components/Poster';
+import PictureQRcode from '@/utils/imageQC'
+
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+const { TextArea } = Input;
+
+const formItemLayout = {
+  labelCol: { span: 6 },
+  wrapperCol: { span: 14 },
+};
+
+const cancelPage = () => {
+  router.go('-1');
+};
+
+const getSignList = dynamicId => {
+  router.push({
+    pathname: '/activity/groupRoomActivity/registrationRecord',
+    query: {
+      dynamicId,
+    },
+  });
+};
+
+
+
+// const newQrcode = row => {
+//   const x = new XMLHttpRequest();
+//   const resourceUrl = row.qrCode;
+//   x.open('GET', resourceUrl, true);
+//   x.responseType = 'blob';
+//   x.onload = function (e) {
+//     const url = window.URL.createObjectURL(x.response);
+//     const a = document.createElement('a');
+//     a.href = url;
+//     a.style.display = 'none';
+//     a.download = '活动二维码.png';
+//     a.click();
+//   };
+//   x.send();
+// };
+
+const BasicForm = props => {
+  const detailData = props.detailData || {};
+
+  const radioOnChange = e => {
+    // setIsEnlist(e.target.value)
+  };
+
+  const { dynamicId } = props;
+  const handleSubmit = e => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('Received values of form: ', values);
+        const { activityTime, signupTime } = values;
+        const [startDate, endDate] = activityTime;
+        values.startDate = moment(startDate).format('YYYY-MM-DD HH:mm');
+        values.endDate = moment(endDate).format('YYYY-MM-DD HH:mm');
+        if (signupTime) {
+          const [enlistStart, enlistEnd] = signupTime;
+          values.enlistStart = moment(enlistStart).format('YYYY-MM-DD HH:mm');
+          values.enlistEnd = moment(enlistEnd).format('YYYY-MM-DD HH:mm');
+        }
+        console.log('submit data --->', values);
+        if (dynamicId) {
+          values.dynamicId = dynamicId;
+          request({ ...apis.activity.update, data: values })
+            .then(data => {
+              message.info('保存成功');
+              // router.go(-1)
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        } else {
+          request({ ...apis.activity.add, data: { ...values } })
+            .then(data => {
+              message.info('保存成功');
+              router.push({
+                pathname: '/activity/editActivity',
+                query: {
+                  dynamicId: data.dynamicId,
+                },
+              });
+              // router.go(-1)
+            })
+            .catch(err => {
+              message.info(err.msg || err.message);
+            });
+        }
+      }
+    });
+  };
+
+  const { getFieldDecorator } = props.form;
+  return (
+    <>
+      <Form {...formItemLayout} onSubmit={handleSubmit}>
+        <Form.Item label="所属项目">
+          {getFieldDecorator('buildingId', {
+            initialValue: detailData.buildingId,
+            rules: [
+              {
+                required: true,
+                message: '请选择所属项目',
+              },
+            ],
+          })(<BuildSelect disabled />)}
+        </Form.Item>
+        <Form.Item label="活动封面图1">
+          <img src={getImgURL(detailData.listImgUrl)} height="210px" width="375px" />
+        </Form.Item>
+        {/* <Form.Item label="活动封面图2">
+          <img src={getImgURL(detailData.bannerListImg)} height="125px" width="375px" />
+        </Form.Item> */}
+        <Form.Item label="活动详情主图">
+          <img src={getImgURL(detailData.imgUrl)} height="300px" width="375px" />
+        </Form.Item>
+        <Form.Item label="活动标题">
+          <span>{detailData.title}</span>
+        </Form.Item>
+        <Form.Item label="副标题">
+          <span>{detailData.halfTitle}</span>
+        </Form.Item>
+        <Form.Item label="活动时间">
+          <span>{`${moment(detailData.startDate).format('YYYY-MM-DD HH:mm')} —— ${moment(
+            detailData.endDate,
+          ).format('YYYY-MM-DD HH:mm')}`}</span>
+        </Form.Item>
+        <Form.Item label="活动地点">
+          <span>{detailData.address}</span>
+        </Form.Item>
+        <Form.Item label="活动人数">
+          <span>{detailData.personNum}</span>
+        </Form.Item>
+        <Form.Item label="团房价">
+          <span>{detailData.groupBuyPrice}</span>
+        </Form.Item>
+        {/* <Form.Item label="阅读量">
+          <span>{detailData.pvNum}</span>
+        </Form.Item>
+        <Form.Item label="转发量">
+          <span>{detailData.shareNum}</span>
+        </Form.Item>
+        <Form.Item label="收藏数">
+          <span>{detailData.saveNum}</span>
+        </Form.Item>
+        <Form.Item label="最大报名人数">
+          <span>{detailData.maxEnlistByPerson}</span>
+        </Form.Item> */}
+        <Form.Item label="活动详情">
+          <div
+            style={{ maxHeight: '500px', overflowY: 'auto' }}
+            dangerouslySetInnerHTML={{ __html: detailData.desc }}
+          ></div>
+        </Form.Item>
+        <Form.Item label="报名时间">
+          <span>{`${moment(detailData.enlistStart).format('YYYY-MM-DD HH:mm')} —— ${moment(
+            detailData.enlistEnd,
+          ).format('YYYY-MM-DD HH:mm')}`}</span>
+        </Form.Item>
+        <Form.Item label="权重">
+          <span>{detailData.heavy}</span>
+        </Form.Item>
+      </Form>
+      <div style={{ textAlign: 'center' }}>
+        <AuthButton name="admin.SignList.get" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
+            <span
+              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
+              onClick={getSignList.bind(this, detailData.dynamicId)}
+            >
+              <Button>报名记录</Button>
+            </span>
+          )}
+        </AuthButton>
+        <AuthButton name="admin.dymic.qrcode" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
+            <span
+              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
+              // onClick={newQrcode.bind(this, detailData)}
+              onClick={() => { PictureQRcode(detailData, '活动二维码') }}
+            >
+              {<Button>下载二维码</Button>}
+            </span>
+          )}
+        </AuthButton>
+        <Button onClick={() => cancelPage()}>取消</Button>
+      </div>
+    </>
+  );
+};
+
+const Basic = Form.create({ name: 'BasicForm' })(BasicForm);
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const Edit = props => {
+  const [tab, changeTab] = useState('basic');
+  const { dynamicId } = props.location.query;
+  const [detailData, setDetailData] = useState(false);
+
+  const getDynamicData = dynamicId => {
+    request({ ...apis.activity.details, params: { dynamicId } }).then(data => {
+      console.log(data);
+      data.activityTime = [moment(data.startDate), moment(data.endDate)];
+      data.signupTime = [moment(data.enlistStart), moment(data.enlistEnd)];
+
+      setDetailData(data);
+    });
+  };
+
+  useEffect(() => {
+    if (dynamicId) {
+      getDynamicData(dynamicId);
+    }
+  }, []);
+
+  const target = { id: dynamicId, type: 'activity' };
+  return (
+    <Card>
+      <div>
+        <Radio.Group value={tab} buttonStyle="solid" onChange={e => changeTab(e.target.value)}>
+          <Radio.Button value="basic">基本信息</Radio.Button>
+          {/* <Radio.Button value="poster">海报图片</Radio.Button>
+          <Radio.Button value="share">分享设置</Radio.Button> */}
+        </Radio.Group>
+      </div>
+      <div>
+        {tab === 'basic' && <Basic dynamicId={dynamicId} detailData={detailData} />}
+
+        {tab === 'poster' && <Poster target={target} />}
+        {tab === 'share' && <Share target={target} />}
+      </div>
+      {/* <div style={{ textAlign: 'center' }}>
+        <AuthButton name="admin.SignList.get" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
+            <span
+              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
+              onClick={getSignList.bind(this, detailData.dynamicId)}
+            >
+              <Button>报名记录</Button>
+            </span>
+          )}
+        </AuthButton>
+        <AuthButton name="admin.dymic.qrcode" noRight={null}>
+          {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && (
+            <span
+              style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
+              onClick={newQrcode.bind(this, detailData)}
+            >
+              {<Button>下载二维码</Button>}
+            </span>
+          )}
+        </AuthButton>
+        <Button onClick={() => cancelPage()}>取消</Button>
+      </div> */}
+    </Card>
+  );
+};
+
+export default Edit;

src/pages/broker/list/detail.jsx

@@ -0,0 +1,55 @@
+import { getBrokerDetails } from '@/services/apis';
+import { useRef, useEffect } from 'react';
+import React from 'react';
+import { Avatar, Row, Col } from 'antd';
+import { fetch, apis } from '@/utils/request';
+
+function agentDeal (props) {
+  const { detail, personId, api } = props;
+  const formRef = useRef();
+
+  useEffect(() => {
+    if (personId) {
+      getBrokerDetails(personId).then((res) => {
+        res; console.log('方方', res)
+      });
+    }
+
+  }, [personId]);
+
+
+  const list = [
+    {
+      title: '姓名',
+      render: detail.name,
+    },
+    {
+      title: '手机号',
+      render: detail.phone,
+    },
+    {
+      title: '身份证号',
+      render: detail.idNo,
+    },
+    {
+      title: '银行卡号',
+      render: detail.personId,
+    },
+  ];
+  return (
+    <>
+      <Row>
+        {list.map((x, index) => {
+          return (
+            <div key={index} style={{ marginBottom: '20px', display: 'flex' }}>
+              <Col span={7}>{x.title}:</Col>
+              <Col span={17}>{x.render || '--'}</Col>
+            </div>
+          );
+        })}
+      </Row>
+    </>
+  );
+}
+
+export default agentDeal;

src/pages/broker/list/index.jsx

@@ -1,10 +1,12 @@
-import React, { useMemo, useRef, useCallback, useState } from 'react'
-import { Button, notification, Spin, Badge, Select } from 'antd'
+import React, { useMemo, useRef, useCallback, useState, useEffect, OperButton } from 'react'
+import { Button, notification, Spin, Badge, Select, Modal, Input } from 'antd'
 import { router } from 'umi'
 import Link from 'umi/link';
 import moment from 'moment'
 import QueryTable from '@/components/QueryTable'
 import { fetch, apis } from '@/utils/request';
+import DealDetail from './detail';
+// import { useSearchParams } from '@umijs/max';
 
 const searchFields = [
   {
@@ -46,9 +48,14 @@ const searchFields = [
     )
   },
 ]
-
 export default (props) => {
-  const ref = useRef()
+  const [detail, setDetail, personId] = useState({});
+  const [open, setOpen] = useState(false);
+  const hideModal = () => {
+    setOpen(false);
+  };
+
+  const ref = useRef();
 
   const tableColumns = [
     {
@@ -57,7 +64,7 @@ export default (props) => {
       key: 'avatarurl',
       align: 'center',
       render: (t) => {
-        return <img src={t} width={64} height={64} style={{borderRadius: '4px'}} alt="" />
+        return <img src={t} width={64} height={64} style={{ borderRadius: '4px' }} alt="" />
       }
     },
     {
@@ -77,7 +84,7 @@ export default (props) => {
       key: 'customerNum',
       align: 'right',
       width: 120,
-      render: (t, row) => <Link to={`/broker/customer/list?recommendPerson=${row.personId}`}>{ !t ? 0 : t }</Link>
+      render: (t, row) => <Link to={`/broker/customer/list?recommendPerson=${row.personId}`}>{!t ? 0 : t}</Link>
     },
     {
       title: '佣金总数',
@@ -115,26 +122,40 @@ export default (props) => {
       align: 'center',
       render: (t) => moment(t).format('YYYY-MM-DD HH:mm')
     },
-    // {
-    //   title: '操作',
-    //   key: 'options',
-    //   align: 'center',
-    //   render: (_, row) => (
-    //     <>
-    //       <OperButton onClick={() => router.push(`/broker/announcement/edit?id=${row.screenId}`)}>详情</OperButton>
-    //       <OperButton.Confirm title="确认进行操作?" color="#1890ff" onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton.Confirm>
-    //     </>
-    //   )
-    // },
+    {
+      title: '操作',
+      dataIndex: 'options',
+      key: 'options',
+      align: 'center',
+      render: (_, row) => (
+        <>
+          {/* <OperButton onClick={() => router.push(`/broker/announcement/edit?id=${row.screenId}`)}>详情</OperButton>
+          <OperButton.Confirm title="确认进行操作?" color="#1890ff" onClick={() => onPublish(row)}>{row.status === 1 ? '取消发布' : '发布'}</OperButton.Confirm> */}
+          {/* to={`/admin/bkBankCard?personId=${row}`}  , router.push(`/admin/bkBankCard?personId=${row.personId}`) */}
+          <Button
+            type="link" onClick={() => {
+              setDetail(row), setOpen(true)
+            }}
+          >
+            查看详情
+          </Button>
+        </>
+      )
+    },
   ]
-
+  // console.log('尝试', row.detail);
   return (
-    <QueryTable
-      ref={ref}
-      rowKey="personId"
-      api={apis.broker.getBrokerList}
-      searchFields={searchFields}
-      columns={tableColumns}
-    />
+    <>
+      <QueryTable
+        ref={ref}
+        rowKey="personId"
+        api={apis.broker.getBrokerList}
+        searchFields={searchFields}
+        columns={tableColumns}
+      />
+      <Modal title="经纪人详情" visible={open} onOk={hideModal} onCancel={hideModal} footer={null}>
+        <DealDetail detail={detail} personId={personId} api={apis.broker.getBrokerDetails} />
+      </Modal>
+    </>
   )
 }

src/pages/customer/deal/detail.jsx

@@ -1,73 +1,71 @@
-import React from 'react';
-import { Avatar, Row, Col } from 'antd';
-import apis from '../../../services/apis';
-import moment from 'moment';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import BuildingSelect from '@/components/SelectButton/BuildSelect';
-import QueryTable from '@/components/QueryTable';
-
-function costomerDeal(props) {
-  const { detail } = props;
-
-  const list = [
-    {
-      title: '所属项目',
-      render: detail.buildingName,
-    },
-    {
-      title: '客户姓名',
-      render: detail.name,
-    },
-    {
-      title: '归属渠道',
-      render: detail.recommendName
-        ? `${detail.recommendName}/${detail.recommendTel}`
-        : '--',
-    },
-    {
-      title: '内场接待',
-      render: detail.realtyConsultantName ? `${detail.realtyConsultantName}/${detail.realtyConsultantTel}` : '--',
-    },
-    {
-      title: '业绩分成人|占比%',
-      render: detail.dividendsName,
-    },
-    {
-      title: '户型',
-      render: detail.houseTypeName,
-    },
-    {
-      title: '房号',
-      render: detail.houseInfo,
-    },
-    {
-      title: '签约日期',
-      render: moment(detail.createDate).format('YYYY-MM-DD HH:mm:ss'),
-    },
-    {
-      title: '成交金额',
-      render: detail.price,
-    },
-    {
-      title: '备注',
-      render: detail.remark,
-    },
-  ];
-
-  return (
-    <>
-      <Row>
-        {list.map((x, index) => {
-          return (
-            <div key={index} style={{ marginBottom: '20px', display: 'flex' }}>
-              <Col span={7}>{x.title}:</Col>
-              <Col span={17}>{x.render || '--'}</Col>
-            </div>
-          );
-        })}
-      </Row>
-    </>
-  );
-}
-
-export default costomerDeal;
+import React from 'react';
+import { Avatar, Row, Col } from 'antd';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import QueryTable from '@/components/QueryTable';
+
+function costomerDeal (props) {
+  const { detail } = props;
+  const list = [
+    {
+      title: '所属项目',
+      render: detail.buildingName,
+    },
+    {
+      title: '客户姓名',
+      render: detail.name,
+    },
+    {
+      title: '归属渠道',
+      render: detail.recommendName
+        ? `${detail.recommendName}/${detail.recommendTel}`
+        : '--',
+    },
+    {
+      title: '内场接待',
+      render: detail.realtyConsultantName ? `${detail.realtyConsultantName}/${detail.realtyConsultantTel}` : '--',
+    },
+    {
+      title: '业绩分成人|占比%',
+      render: detail.dividendsName,
+    },
+    {
+      title: '户型',
+      render: detail.houseTypeName,
+    },
+    {
+      title: '房号',
+      render: detail.houseInfo,
+    },
+    {
+      title: '签约日期',
+      render: moment(detail.createDate).format('YYYY-MM-DD HH:mm:ss'),
+    },
+    {
+      title: '成交金额',
+      render: detail.price,
+    },
+    {
+      title: '备注',
+      render: detail.remark,
+    },
+  ];
+  return (
+    <>
+      <Row>
+        {list.map((x, index) => {
+          return (
+            <div key={index} style={{ marginBottom: '20px', display: 'flex' }}>
+              <Col span={7}>{x.title}:</Col>
+              <Col span={17}>{x.render || '--'}</Col>
+            </div>
+          );
+        })}
+      </Row>
+    </>
+  );
+}
+
+export default costomerDeal;

src/pages/customer/deal/index.jsx

@@ -1,156 +1,156 @@
-import React, { useState } from 'react';
-import { Avatar, Modal } from 'antd';
-import apis from '../../../services/apis';
-import moment from 'moment';
-import WxDictSelect from '@/components/SelectButton/WxDictSelect';
-import BuildingSelect from '@/components/SelectButton/BuildSelect';
-import QueryTable from '@/components/QueryTable';
-import DealDetail from './detail';
-
-function costomerDrift(props) {
-  const [visible, setVisible] = useState(false);
-  const [detail, setDetail] = useState({});
-  const columns = [
-    {
-      title: '头像',
-      dataIndex: 'picture',
-      key: 'picture',
-      align: 'center',
-      render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
-    },
-    {
-      title: '姓名',
-      dataIndex: 'name',
-      key: 'name',
-      align: 'center',
-    },
-    {
-      title: '电话',
-      dataIndex: 'phone',
-      key: 'phone',
-      align: 'center',
-    },
-
-    {
-      title: '性别',
-      dataIndex: 'sex',
-      key: 'sex',
-      align: 'center',
-      // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => (
-        <span>{record.sex === '1' ? '男' : record.sex === '2' ? '女' : '未知'}</span>
-      ),
-    },
-    {
-      title: '所属项目',
-      dataIndex: 'buildingName',
-      key: 'buildingName',
-      align: 'center',
-    },
-    {
-      title: '成交金额',
-      dataIndex: 'price',
-      key: 'price',
-      align: 'center',
-    },
-    {
-      title: '报备人',
-      dataIndex: 'recommendName',
-      key: 'recommendName',
-      align: 'center',
-      width: 200,
-      render: (_, record) => {
-        const phone = record.recommendTel ? ` ${record.recommendTel}` : ''
-        return <span>{`${record.recommendName}${phone}`}</span>
-      },
-    },
-    {
-      title: '签约日期',
-      dataIndex: 'createDate',
-      key: 'createDate',
-      align: 'center',
-      render: t => moment(t).format('YYYY-MM-DD HH:mm:ss'),
-    },
-    {
-      title: '状态',
-      dataIndex: 'type',
-      key: 'type',
-      align: 'center',
-      render: t => t=='signatory'?'签约':t=='commission'?'结佣':'--'
-      
-    },
-    {
-      title: '操作',
-      dataIndex: 'edit',
-      key: 'edit',
-      align: 'center',
-      render: (_, record) => (
-        <>
-          <a
-            onClick={() => {
-              setDetail(record), setVisible(true);
-            }}
-          >
-            查看详情
-          </a>
-        </>
-      ),
-    },
-  ];
-
-  const searchFields = [
-    {
-      name: 'buildingId',
-      label: '项目',
-      placeholder: '请选择项目',
-      render: () => <BuildingSelect style={{ width: 160 }} />,
-    },
-    {
-      name: 'name',
-      label: '姓名',
-      placeholder: '请输入姓名',
-    },
-    {
-      name: 'phone',
-      label: '电话',
-      placeholder: '请输入电话',
-    },
-    {
-      name: 'type',
-      label: '状态',
-      placeholder: '请选择状态',
-      type: 'select',
-      options: [
-        { label: '全部', value: '' },
-        { label: '签约', value: 'signatory' },
-        { label: '结佣', value: 'commission' },
-      ],
-    },
-  ];
-  // pageNum=1&pageSize=10&buildingId=&name=&phone=&type=
-  return (
-    <>
-      <QueryTable
-        rowKey="customerSignatoryId"
-        api={apis.customer.getDealList}
-        searchFields={searchFields}
-        columns={columns}
-      />
-      <Modal
-      title='客户详情'
-        visible={visible}
-        onOk={() => {
-          setVisible(false);
-        }}
-        onCancel={() => {
-          setVisible(false);
-        }}
-        footer={null}
-      >
-        <DealDetail detail={detail} />
-      </Modal>
-    </>
-  );
-}
-
-export default costomerDrift;
+import React, { useState } from 'react';
+import { Avatar, Modal } from 'antd';
+import apis from '../../../services/apis';
+import moment from 'moment';
+import WxDictSelect from '@/components/SelectButton/WxDictSelect';
+import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import QueryTable from '@/components/QueryTable';
+import DealDetail from './detail';
+
+function costomerDrift (props) {
+  const [visible, setVisible] = useState(false);
+  const [detail, setDetail] = useState({});
+  const columns = [
+    {
+      title: '头像',
+      dataIndex: 'picture',
+      key: 'picture',
+      align: 'center',
+      render: (_, record) => <Avatar shape="square" src={record.picture} size={64} icon="user" />,
+    },
+    {
+      title: '姓名',
+      dataIndex: 'name',
+      key: 'name',
+      align: 'center',
+    },
+    {
+      title: '电话',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+
+    {
+      title: '性别',
+      dataIndex: 'sex',
+      key: 'sex',
+      align: 'center',
+      // eslint-disable-next-line no-nested-ternary
+      render: (_, record) => (
+        <span>{record.sex === '1' ? '男' : record.sex === '2' ? '女' : '未知'}</span>
+      ),
+    },
+    {
+      title: '所属项目',
+      dataIndex: 'buildingName',
+      key: 'buildingName',
+      align: 'center',
+    },
+    {
+      title: '成交金额',
+      dataIndex: 'price',
+      key: 'price',
+      align: 'center',
+    },
+    {
+      title: '报备人',
+      dataIndex: 'recommendName',
+      key: 'recommendName',
+      align: 'center',
+      width: 200,
+      render: (_, record) => {
+        const phone = record.recommendTel ? ` ${record.recommendTel}` : ''
+        return <span>{`${record.recommendName}${phone}`}</span>
+      },
+    },
+    {
+      title: '签约日期',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: t => moment(t).format('YYYY-MM-DD HH:mm:ss'),
+    },
+    {
+      title: '状态',
+      dataIndex: 'type',
+      key: 'type',
+      align: 'center',
+      render: t => t == 'signatory' ? '签约' : t == 'commission' ? '结佣' : '--'
+
+    },
+    {
+      title: '操作',
+      dataIndex: 'edit',
+      key: 'edit',
+      align: 'center',
+      render: (_, record) => (
+        <>
+          <a
+            onClick={() => {
+              setDetail(record), setVisible(true);
+            }}
+          >
+            查看详情
+          </a>
+        </>
+      ),
+    },
+  ];
+
+  const searchFields = [
+    {
+      name: 'buildingId',
+      label: '项目',
+      placeholder: '请选择项目',
+      render: () => <BuildingSelect style={{ width: 160 }} />,
+    },
+    {
+      name: 'name',
+      label: '姓名',
+      placeholder: '请输入姓名',
+    },
+    {
+      name: 'phone',
+      label: '电话',
+      placeholder: '请输入电话',
+    },
+    {
+      name: 'type',
+      label: '状态',
+      placeholder: '请选择状态',
+      type: 'select',
+      options: [
+        { label: '全部', value: '' },
+        { label: '签约', value: 'signatory' },
+        { label: '结佣', value: 'commission' },
+      ],
+    },
+  ];
+  // pageNum=1&pageSize=10&buildingId=&name=&phone=&type=
+  return (
+    <>
+      <QueryTable
+        rowKey="customerSignatoryId"
+        api={apis.customer.getDealList}
+        searchFields={searchFields}
+        columns={columns}
+      />
+      <Modal
+        title='客户详情'
+        visible={visible}
+        onOk={() => {
+          setVisible(false);
+        }}
+        onCancel={() => {
+          setVisible(false);
+        }}
+        footer={null}
+      >
+        <DealDetail detail={detail} />
+      </Modal>
+    </>
+  );
+}
+
+export default costomerDrift;

src/services/apis.js

@@ -220,10 +220,10 @@ export default {
       }
 
     },
-    logs:{
+    logs: {
       url: `${prefix}/building/logs`,
-        method: 'GET',
-        action: 'admin.building.logs.get',
+      method: 'GET',
+      action: 'admin.building.logs.get',
     }
 
   },
@@ -346,7 +346,7 @@ export default {
     },
     //回访
     reply: {
-      
+
       method: 'PUT',
       url: `${prefix}/reply/:id`,
       action: '',
@@ -414,8 +414,8 @@ export default {
       url: `${prefix}/marking/signatory`,
       action: 'admin.marking.signatory.put',
     },
-     // 结佣
-     commission: {
+    // 结佣
+    commission: {
       method: 'PUT',
       url: `${prefix}/marking/commission`,
       action: 'admin.marking.commission.put',
@@ -426,7 +426,7 @@ export default {
       url: `${prefix}/marking/invalidCustomer`,
       action: 'admin.marking.invalidCustomer.put',
     },
-    
+
     recommendGetById: {
       method: 'GET',
       url: `${prefix}/customer/recommend/getById/:id`,
@@ -999,35 +999,35 @@ export default {
       method: 'DELETE',
       action: 'admin.taPolicy.id.delete',
     },
-  
-    getPolicyTypeList:{
+
+    getPolicyTypeList: {
       url: `${prefix}/taPolicyType`,
       method: 'GET',
       action: 'admin.taPolicyType.get',
     },
-    addPolicyType:{
+    addPolicyType: {
       url: `${prefix}/taPolicyType`,
       method: 'Post',
       action: 'admin.taPolicyType.Post',
     },
 
-    getPolicyTypeDetail:{
+    getPolicyTypeDetail: {
       url: `${prefix}/taPolicyType/:id`,
       method: 'GET',
       action: 'admin.taPolicyType.id.get',
     },
 
-    upDatePolicyType:{
+    upDatePolicyType: {
       url: `${prefix}/taPolicyType/:id`,
       method: 'PUT',
       action: 'admin.taPolicyType.id.put',
     },
-    deletePolicyType:{
+    deletePolicyType: {
       url: `${prefix}/taPolicyType/:id`,
       method: 'DELETE',
       action: 'admin.taPolicyType.id.delete',
     },
- 
+
     // getPolicyTypeList:{
     //   url: `${prefix}/taPolicyType`,
     //   method: 'GET',
@@ -1170,7 +1170,7 @@ export default {
       method: 'DELETE',
       action: 'admin.channel.id.delete',
     },
- 
+
     // getListBroker: {
     //   url: `${prefix}/channel/InviteClientsList`,
     //   method: 'GET',
@@ -2469,5 +2469,10 @@ export default {
       method: 'GET',
       url: `${prefix}/broker/customer`,
     },
+    // 获取经纪人详情
+    getBrokerDetails: {
+      method: 'GET',
+      url: `${prefix}/admin/bkBankCard`,
+    },
   }
 };

src/utils/imageQC.js

@@ -1,29 +1,42 @@
-
-import { message } from 'antd';
-//测试封装
-export default function PictureQRcode(res, title) {
-  if (res.qrCode === null || res.qrCode == 'null') {
-    message.error(`保存失败${res.qrCode}`);
-
-  } else {
-    const x = new XMLHttpRequest();
-    const resourceUrl = res.qrCode;
-    x.open('GET', resourceUrl, true);
-    x.responseType = 'blob';
-    x.onload = function (e) {
-      const url = window.URL.createObjectURL(x.response);
-      const a = document.createElement('a');
-      a.href = url;
-      a.style.display = 'none';
-      a.download = `${title}.png`;
-      a.click();
-    };
-    x.send();
-    message.info(`保存成功`);
-
-
-  }
-
-
-}
-
+
+import { message } from 'antd';
+//测试封装
+export default function PictureQRcode(res, title) {
+  if (res.qrCode === null || res.qrCode == 'null') {
+    message.error(`保存失败${res.qrCode}`);
+    const x = new XMLHttpRequest();
+    const resourceUrl = res.qrCode;
+    x.open('GET', resourceUrl, true);
+    x.responseType = 'blob';
+    x.onload = function (e) {
+      const url = window.URL.createObjectURL(x.response);
+      const a = document.createElement('a');
+      a.href = url;
+      a.style.display = 'none';
+      a.download = `${title}.png`;
+      a.click();
+    };
+    x.send();
+
+  } else {
+    const x = new XMLHttpRequest();
+    const resourceUrl = res.qrCode;
+    x.open('GET', resourceUrl, true);
+    x.responseType = 'blob';
+    x.onload = function (e) {
+      const url = window.URL.createObjectURL(x.response);
+      const a = document.createElement('a');
+      a.href = url;
+      a.style.display = 'none';
+      a.download = `${title}.png`;
+      a.click();
+    };
+    x.send();
+    message.info(`保存成功`);
+
+
+  }
+
+
+}
+