feats

config/proxy.js

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

src/models/login.js

@@ -1,4 +1,6 @@
-import { routerRedux } from 'dva/router';
+// import { routerRedux } from 'dva/router';
+import { routerRedux, router } from 'dva';
+const { Redirect, Switch, Route } = router
 import { stringify } from 'querystring';
 // import { fakeAccountLogin, getFakeCaptcha } from '@/services/login';
 // import { setAuthority } from '@/utils/authority';
@@ -7,7 +9,6 @@ import { fetch, apis } from '@/utils/request';
 
 const signin = fetch(apis.user.signin);
 const signout = fetch(apis.user.signout);
-
 const Model = {
   namespace: 'login',
   state: {
@@ -67,6 +68,7 @@ const Model = {
       }
     },
   },
+  
   reducers: {
     changeLoginStatus(state, { payload }) {
       // setAuthority((payload.user.roles || []).map(x => x.roleId));

src/pages/activity/groupRoomActivity/detail.jsx

@@ -197,10 +197,7 @@ const BasicForm = props => {
             <span
               style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }}
               // onClick={newQrcode.bind(this, detailData)}
-
-              onClick={() => {
-                PictureQRcode(detailData, '活动二维码')
-              }}
+              onClick={() => { PictureQRcode(detailData, '活动二维码') }}
             >
               {<Button>下载二维码</Button>}
             </span>

src/pages/broker/list/detail.jsx

@@ -0,0 +1,66 @@
+import { getBrokerDetails } from '@/services/apis';
+import { useEffect } from 'react';
+import React from 'react';
+import { Avatar, Row, Col } from 'antd';
+import apis from '@/services/apis';
+import request from '@/utils/request';
+
+function agentDeal (props) {
+  const { detail } = props;
+  // const formRef = useRef();
+
+  // useEffect(() => {
+  //   if (personId) {
+  //     getBrokerDetails(personId).then((res) => {
+  //       res; console.log('方方', res)
+  //     });
+  //   }
+
+  // }, [personId]);
+
+  useEffect(() => {
+  if (detail.personId) {
+    request({
+      ...apis.broker.getBrokerDetails
+    }).then((res) => {
+        res;console.log('res',res)
+      });
+  }
+});
+
+
+  const list = [
+    {
+      title: '姓名',
+      render: detail.name,
+    },
+    {
+      title: '手机号',
+      render: detail.phone,
+    },
+    {
+      title: '身份证号',
+      render: detail.idNo,
+    },
+    {
+      title: '银行卡号',
+      // render: detail,
+    },
+  ];
+  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 apis from '@/services/apis';
+// import { useSearchParams } from '@umijs/max';
 
 const searchFields = [
   {
@@ -48,7 +50,13 @@ 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 +65,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 +85,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 +123,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} ref={ref}/>
+      </Modal>
+    </>
   )
 }

src/pages/customer/deal/detail.jsx

@@ -6,9 +6,8 @@ import WxDictSelect from '@/components/SelectButton/WxDictSelect';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
 import QueryTable from '@/components/QueryTable';
 
-function costomerDeal(props) {
+function costomerDeal (props) {
   const { detail } = props;
-
   const list = [
     {
       title: '所属项目',
@@ -53,7 +52,6 @@ function costomerDeal(props) {
       render: detail.remark,
     },
   ];
-
   return (
     <>
       <Row>

src/pages/customer/deal/index.jsx

@@ -7,7 +7,7 @@ import BuildingSelect from '@/components/SelectButton/BuildSelect';
 import QueryTable from '@/components/QueryTable';
 import DealDetail from './detail';
 
-function costomerDrift(props) {
+function costomerDrift (props) {
   const [visible, setVisible] = useState(false);
   const [detail, setDetail] = useState({});
   const columns = [
@@ -76,8 +76,8 @@ function costomerDrift(props) {
       dataIndex: 'type',
       key: 'type',
       align: 'center',
-      render: t => t=='signatory'?'签约':t=='commission'?'结佣':'--'
-      
+      render: t => t == 'signatory' ? '签约' : t == 'commission' ? '结佣' : '--'
+
     },
     {
       title: '操作',
@@ -137,7 +137,7 @@ function costomerDrift(props) {
         columns={columns}
       />
       <Modal
-      title='客户详情'
+        title='客户详情'
         visible={visible}
         onOk={() => {
           setVisible(false);

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}/bkBankCard`,
+    },
   }
 };

src/utils/imageQC.js

@@ -4,6 +4,19 @@ 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();