fix

config/routes.js

@@ -191,10 +191,17 @@ export default [
               },
               {
                 path: '/Live/LiveActivity/Edit',
-                name: '直播活动',
+                name: '编辑活动',
                 hideInMenu: true,
                 component: './Live/LiveActivity/Edit',
               },
+              {
+                path: '/Live/LiveActivity/add',
+                name: '新增活动',
+                hideInMenu: true,
+                component: './Live/LiveActivity/add',
+              },
+              
               // {
               //   path: '/staff/Staff/Edit',
               //   name: '编辑员工',

src/pages/Live/LiveActivity/Edit/components/base.jsx

@@ -1,5 +1,17 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload, InputNumber } from 'antd';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Select,
+  Tabs,
+  Radio,
+  DatePicker,
+  message,
+  Upload,
+  InputNumber,
+} from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import moment from 'moment';
 import router from 'umi/router';
@@ -7,56 +19,58 @@ import styles from '../../../../style/GoodsList.less';
 import XForm, { FieldTypes, createForm } from '../../../../../components/XForm';
 import apis from '../../../../../services/apis';
 import BuildSelect2 from '../../../../../components/SelectButton/BuildSelect2';
-import LivePlatSelect from '../../../../../components/SelectButton/LivePlatSelect'
+import LivePlatSelect from '../../../../../components/SelectButton/LivePlatSelect';
 import CitySelect3 from '../../../../../components/SelectButton/CitySelect3';
-import ImageUpload from '../../../../../components/XForm/ImageUpload'
+import ImageUpload from '../../../../../components/XForm/ImageUpload';
 import request from '../../../../../utils/request';
 import Navigate from '@/components/Navigate';
 
 const { Option } = Select;
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
-let cityId = ''
+let cityId = '';
 
 const header = props => {
-  console.log(props)
-  const liveActivityId = props.liveActivityId.liveId
-  console.log(liveActivityId)
-  const [ liveActivityData, setLiveActivityData ] = useState({})
-  const [showHelp, setShowHelp] = useState(false)
+  console.log(props);
+  const liveActivityId = props.liveActivityId.liveId;
+  console.log(liveActivityId);
+  const [liveActivityData, setLiveActivityData] = useState({});
+  const [showHelp, setShowHelp] = useState(false);
 
-  if(liveActivityId){
-    useEffect(() => {
+  useEffect(() => {
+    if (liveActivityId) {
       getLiveActivityData(liveActivityId);
-    },[])
+    }
+  }, []);
 
   // 查询列表
-  const getLiveActivityData = (liveActivityId) => {
-    request({ ...apis.taliveActivity.getTaLiveActivity, urlData: {id: liveActivityId} }).then((data) => {
-        console.log(data, 'getLiveActivityData')
-        setLiveActivityData(data.data)
+  const getLiveActivityData = liveActivityId => {
+    request({ ...apis.taliveActivity.getTaLiveActivity, urlData: { id: liveActivityId } }).then(
+      data => {
+        console.log(data, 'getLiveActivityData');
+        setLiveActivityData(data.data);
         // if(data.qrCode == 'null'){
         //   message.error("暂时无法获取二维码")
         // }
-    })
-  }
-  }
+      },
+    );
+  };
 
-  const cancelPage = () =>{
+  const cancelPage = () => {
     router.push({
       pathname: '/activity/liveActivity/list/index',
     });
-  }
+  };
 
   //打开新页面
   const openIndexImg = () => {
-    const newWin=window.open('about:blank');
-    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
-  }
+    const newWin = window.open('about:blank');
+    newWin.location.href = 'http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png';
+  };
 
   function highlightsTypeChange(e) {
-    console.log(e.target.value,"ee")
-    setTypeState(e.target.value)
+    console.log(e.target.value, 'ee');
+    setTypeState(e.target.value);
   }
 
   function disabledDate(current) {
@@ -64,30 +78,38 @@ const header = props => {
     return current && current < moment().endOf('day');
   }
 
-  function handleSubmit (e) {
+  function handleSubmit(e) {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       console.log(values, 'values');
-      if (!err){
-        let {liveTime, ...submitValue} = values
-        if (submitValue.status == '已发布' || submitValue.status == '1'){
-          submitValue.status = 1
-        }else{
-          submitValue.status = 0
+      if (!err) {
+        let { liveTime, ...submitValue } = values;
+        if (submitValue.status == '已发布' || submitValue.status == '1') {
+          submitValue.status = 1;
+        } else {
+          submitValue.status = 0;
         }
-        if (values.liveStartDate > values.liveEndDate){
-          message.info("直播结束时间大于开始时间")
+        if (values.liveStartDate > values.liveEndDate) {
+          message.info('直播结束时间大于开始时间');
           return;
         }
-        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
-        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
-        console.log(submitValue)
-        request({ ...apis.taliveActivity.updateTaLiveActivity, urlData: {id: liveActivityId},data: submitValue, }).then((data) => {
-          message.info("保存成功")
-          cancelPage()
-        }).catch((err) => {
-          message.info(err.msg || err.message)
+        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format(
+          'YYYY-MM-DD HH:mm:ss',
+        );
+        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss');
+        console.log(submitValue);
+        request({
+          ...apis.taliveActivity.updateTaLiveActivity,
+          urlData: { id: liveActivityId },
+          data: submitValue,
         })
+          .then(data => {
+            message.info('保存成功');
+            cancelPage();
+          })
+          .catch(err => {
+            message.info(err.msg || err.message);
+          });
       }
     });
   }
@@ -101,12 +123,12 @@ const header = props => {
           {getFieldDecorator('cityId', {
             initialValue: liveActivityData.cityId,
             rules: [{ required: true, message: ' 请输入所属城市' }],
-          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
+          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')} />)}
         </Form.Item>
         <Form.Item label="所属楼盘">
           {getFieldDecorator('buildingId', {
             initialValue: liveActivityData.buildingId,
-          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
+          })(<BuildSelect2 cityId={props.form.getFieldValue('cityId')} />)}
         </Form.Item>
         <Form.Item label="直播活动标题">
           {getFieldDecorator('liveActivityTitle', {
@@ -115,92 +137,114 @@ const header = props => {
           })(<Input maxLength={20} placeholder="给直播活动起个名字" />)}
         </Form.Item>
         <Form.Item label="直播开始时间">
-          {getFieldDecorator('liveStartDate', { initialValue : liveActivityData.liveStartDate ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss') : null,
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播开始时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计开始时间" style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+          {getFieldDecorator('liveStartDate', {
+            initialValue: liveActivityData.liveStartDate
+              ? moment(liveActivityData.liveStartDate, 'YYYY-MM-DD HH:mm:ss')
+              : null,
+            rules: [
+              {
+                required: true,
+                message: '请选择直播开始时间',
+              },
+            ],
+          })(
+            <DatePicker
+              placeholder="预计开始时间"
+              style={{ width: '500px' }}
+              format="YYYY-MM-DD HH:mm:ss"
+              showTime={{ format: 'HH:mm:ss' }}
+            />,
+          )}
         </Form.Item>
         <Form.Item label="直播结束时间">
-          {getFieldDecorator('liveEndDate', { initialValue : liveActivityData.liveEndDate ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss') : null,
-                rules: [
-                  {
-                    required: true,
-                    message: '请选择直播结束时间',
-                  },
-                ],
-              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+          {getFieldDecorator('liveEndDate', {
+            initialValue: liveActivityData.liveEndDate
+              ? moment(liveActivityData.liveEndDate, 'YYYY-MM-DD HH:mm:ss')
+              : null,
+            rules: [
+              {
+                required: true,
+                message: '请选择直播结束时间',
+              },
+            ],
+          })(
+            <DatePicker
+              placeholder="预计结束时间"
+              disabledDate={disabledDate}
+              style={{ width: '500px' }}
+              format="YYYY-MM-DD HH:mm:ss"
+              showTime={{ format: 'HH:mm:ss' }}
+            />,
+          )}
         </Form.Item>
         <Form.Item label="直播小程序">
           {getFieldDecorator('liveApp', {
-              initialValue: liveActivityData.liveApp,
-              rules: [{ required: true, message: '请选择直播小程序' }],
-            })(<LivePlatSelect />)}
+            initialValue: liveActivityData.liveApp,
+            rules: [{ required: true, message: '请选择直播小程序' }],
+          })(<LivePlatSelect />)}
         </Form.Item>
         <Form.Item label="房间参数">
           {getFieldDecorator('liveRoomParam', {
             initialValue: liveActivityData.liveRoomParam,
             rules: [{ required: true, message: '请输入房间参数' }],
-          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}
+          })(
+            <Input
+              maxLength={1000}
+              placeholder="点击右侧按钮查看如何获取房间参数"
+              style={{ width: '680px' }}
+            />,
+          )}
           <Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
         </Form.Item>
-        <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
-              {getFieldDecorator('listImg', {
-                  initialValue: liveActivityData.listImg,
-                  rules: [{ required: true, message: '请上传封面图1' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
+        <Form.Item
+          label="封面图1"
+          help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表"
+        >
+          {getFieldDecorator('listImg', {
+            initialValue: liveActivityData.listImg,
+            rules: [{ required: true, message: '请上传封面图1' }],
+          })(<ImageUpload />)}
+        </Form.Item>
         <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
-              {getFieldDecorator('detailImg', {
-                  initialValue: liveActivityData.detailImg,
-                  rules: [{ required: true, message: '请上传封面图2' }],
-              })(
-                <ImageUpload />,
-              )}
-        </Form.Item>  
+          {getFieldDecorator('detailImg', {
+            initialValue: liveActivityData.detailImg,
+            rules: [{ required: true, message: '请上传封面图2' }],
+          })(<ImageUpload />)}
+        </Form.Item>
         <Form.Item label="详情图" help="格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
-              {getFieldDecorator('detailTypeImg', {
-                  initialValue: liveActivityData.detailTypeImg,
-                  rules: [{ required: true, message: '请上传详情图' }],
-              })(
-                <ImageUpload style={{width:'300px',height:'600px'}}/>,
-              )}
-        </Form.Item>      
+          {getFieldDecorator('detailTypeImg', {
+            initialValue: liveActivityData.detailTypeImg,
+            rules: [{ required: true, message: '请上传详情图' }],
+          })(<ImageUpload style={{ width: '300px', height: '600px' }} />)}
+        </Form.Item>
         <Form.Item label="权重">
-              {getFieldDecorator('weight', {
-                  initialValue: liveActivityData.weight,
-                  rules: [{ required: true, message: '请设置权重' }],
-              })(
-                <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
-              )}
+          {getFieldDecorator('weight', {
+            initialValue: liveActivityData.weight,
+            rules: [{ required: true, message: '请设置权重' }],
+          })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
         <Form.Item label="发布状态">
           {getFieldDecorator('status', {
-              initialValue: liveActivityData.status == 1 ? '已发布' : '未发布',
-              rules: [{ required: true, message: '请选择发布状态' }],
-            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
-            <Option value="0">未发布</Option>
-            <Option value="1">已发布</Option>
-          </Select>)}
+            initialValue: liveActivityData.status == 1 ? '已发布' : '未发布',
+            rules: [{ required: true, message: '请选择发布状态' }],
+          })(
+            <Select placeholder="发布状态" style={{ width: '300px' }}>
+              <Option value="0">未发布</Option>
+              <Option value="1">已发布</Option>
+            </Select>,
+          )}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
-          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+          <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>
             确定
           </Button>
-          <Button onClick={() => router.go(-1)}>
-            取消
-          </Button>
+          <Button onClick={() => router.go(-1)}>取消</Button>
         </Form.Item>
       </Form>
     </>
-  )
-}
+  );
+};
 
 const Base = Form.create({ name: 'header' })(header);
 
-export default Base
+export default Base;

src/pages/Live/LiveActivity/Edit/index.jsx

@@ -1,19 +1,34 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Radio, Tag, Tooltip, Tabs, notification } from 'antd';
+import {
+  Form,
+  Input,
+  Button,
+  DatePicker,
+  Select,
+  Card,
+  Row,
+  Col,
+  Pagination,
+  Alert,
+  Radio,
+  Tag,
+  Tooltip,
+  Tabs,
+  notification,
+} from 'antd';
 import moment from 'moment';
 import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import { router } from 'umi';
 
-import Base from './components/base'
-import Poster from './components/poster'
-import Share from './components/share'
-import ShareRecord from './components/shareRecord'
-import VisitRecord from './components/visitRecord'
+import Base from './components/base';
+import Poster from './components/poster';
+import Share from './components/share';
+import ShareRecord from './components/shareRecord';
+import VisitRecord from './components/visitRecord';
 import Prompt from 'umi/prompt';
 
-
-const { Option } = Select
+const { Option } = Select;
 const { TabPane } = Tabs;
 
 const formItemLayout = {
@@ -30,37 +45,53 @@ const formItemLayout = {
 function openNotificationWithIcon(type, message) {
   notification[type]({
     message,
-    description:
-      '',
+    description: '',
   });
 }
 
 function EditHouse(props) {
-  const {liveActivityId} = props.location.query;
-  console.log(props.location.query.id)
-  const [tab, setTab] = useState('base')
-  const [liveActivity, setLiveActivity] = useState({ liveActivityId: undefined })
-  const [houseId, setHouseId] = useState('')
+  const { liveActivityId } = props.location.query;
+  console.log(props.location.query.id);
+  const [tab, setTab] = useState('base');
+  const [liveActivity, setLiveActivity] = useState({ liveActivityId: undefined });
+  const [houseId, setHouseId] = useState('');
 
   function tabsCallback(e) {
-    setTab(e.target.value)
+    setTab(e.target.value);
   }
 
   // building 回调
   function buildingOnSuccess(e) {
-    setBuildingData(e)
+    setBuildingData(e);
   }
 
   function housTabChange(e) {
-    setHouseId(e.houseId)
-    setTab('preselectionRecord')
+    setHouseId(e.houseId);
+    setTab('preselectionRecord');
   }
 
-  const liveId = liveActivity.liveActivityId || (props.location.query && props.location.query.id)
-  console.log(liveId)
+  const liveId = liveActivity.liveActivityId || (props.location.query && props.location.query.id);
+  console.log(liveId, 'liveId');
   return (
-    <>
-      <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
+    <Card>
+      <Tabs defaultActiveKey="1">
+        <TabPane tab="基本信息" key="1">
+          <Base liveActivityId={{ liveId }} onSuccess={e => buildingOnSuccess(e)} />
+        </TabPane>
+        <TabPane tab="海报设置" key="2">
+          <Poster liveActivityId={{ liveId }} />
+        </TabPane>
+        <TabPane tab="分享设置" key="3">
+          <Share liveActivityId={{ liveId }} />
+        </TabPane>
+        <TabPane tab="分享记录" key="4">
+          <ShareRecord liveActivityId={{ liveId }} />
+        </TabPane>
+        <TabPane tab="分享访问记录" key="5">
+          <VisitRecord liveActivityId={{ liveId }} />
+        </TabPane>
+      </Tabs>
+      {/* <Radio.Group value={ tab } buttonStyle="solid" onChange={e => tabsCallback(e)}>
         <Radio.Button value="base">基本信息</Radio.Button>
         <Radio.Button value="poster">海报设置</Radio.Button>
         <Radio.Button value="share">分享设置</Radio.Button>
@@ -73,15 +104,11 @@ function EditHouse(props) {
         { (tab === 'share' && <Share liveActivityId={{ liveId }}/>)}
         { (tab === 'shareRecord' && <ShareRecord liveActivityId={{ liveId }}/>)}
         { (tab === 'visitRecord' && <VisitRecord liveActivityId={{ liveId }}/>)}
-      </div>
-      <Prompt message={location =>
-        location.pathname.startsWith("/activity/liveActivity")
-          ? true
-          : localStorage.removeItem("liveActivePageParams")} />
-    </>
-  )
+      </div> */}
+    </Card>
+  );
 }
 
 const WrappedEditHouseForm = Form.create({ name: 'editHouse' })(EditHouse);
 
-export default WrappedEditHouseForm
+export default WrappedEditHouseForm;

src/pages/Live/LiveActivity/List/index.jsx

@@ -1,13 +1,25 @@
 import React, { useState, useEffect } from 'react';
-import { Form, Input, Button, Icon, Select, message, Table, Pagination, Modal, Card, notification } from 'antd';
+import {
+  Form,
+  Input,
+  Button,
+  Icon,
+  Select,
+  message,
+  Table,
+  Pagination,
+  Modal,
+  Card,
+  notification,
+} from 'antd';
 import router from 'umi/router';
 import moment from 'moment';
 import AuthButton from '@/components/AuthButton';
 import Prompt from 'umi/prompt';
 import withActions from '@/components/ActionList';
 import EditIcon from '@/components/EditIcon';
-import SelectCity from '@/components/SelectButton/CitySelect'
-import BuildSelect from '@/components/SelectButton/BuildSelect'
+import SelectCity from '@/components/SelectButton/CitySelect';
+import BuildSelect from '@/components/SelectButton/BuildSelect';
 import apis from '@/services/apis';
 import request from '@/utils/request';
 import Navigate from '@/components/Navigate';
@@ -17,86 +29,80 @@ const { Option } = Select;
 
 const header = props => {
   // eslint-disable-next-line react-hooks/rules-of-hooks
-  const [data, setData] = useState({ list: [], total: 0 })
+  const [data, setData] = useState({ list: [], total: 0 });
   //   const [page, changePage] = useState({})
-  const [liveIdList, setLiveIdList] = useState([])
-  const [time, setTime] = useState('')
-  const [showHelp, setShowHelp] = useState(false)
+  const [liveIdList, setLiveIdList] = useState([]);
+  const [time, setTime] = useState('');
+  const [showHelp, setShowHelp] = useState(false);
 
   // 查询列表
   const getList = params => {
     request({ ...apis.taliveActivity.taLiveActivity, params: { ...params } }).then(data => {
-      console.log(data)
-      setData(data)
-    })
-  }
+      console.log(data);
+      setData(data);
+    });
+  };
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-
-      getList({ pageNum: 1, pageSize: 10 });
-    
-   
-  }, [])
+    getList({ pageNum: 1, pageSize: 10 });
+  }, []);
 
   // 跳转到编辑
   const toAddLive = rowData => () => {
-    if(rowData) {
+    if (rowData) {
       router.push({
-      pathname: '/Live/LiveActivity/Edit',
-      query: {
-        id: rowData.liveActivityId,
-        buildingId: rowData.buildingId,
-      },
-    });
-      return
+        pathname: '/Live/LiveActivity/Edit',
+        query: {
+          id: rowData.liveActivityId,
+          buildingId: rowData.buildingId,
+        },
+      });
+      return;
     }
     router.push({
-      pathname: '/Live/LiveActivity/Edit',
+      pathname: '/Live/LiveActivity/add',
     });
-  }
+  };
 
   const toDataReacord = rowData => () => {
-  
-      router.push({
+    router.push({
       pathname: '/activity/liveActivity/liveActivityRecord',
       query: {
         id: rowData.liveActivityId,
       },
     });
-  }
+  };
 
   function openNotificationWithIcon(type, message) {
     notification[type]({
       message,
-      description:
-        '',
+      description: '',
     });
   }
 
-  
-  const toDelLiveActivity = rowData => () =>{
-    console.log(liveIdList, 'liveIdListliveIdList')
-    if(liveIdList.length < 1){
-      openNotificationWithIcon('error', '请先选择需要删除的直播活动')
-      return
+  const toDelLiveActivity = rowData => () => {
+    console.log(liveIdList, 'liveIdListliveIdList');
+    if (liveIdList.length < 1) {
+      openNotificationWithIcon('error', '请先选择需要删除的直播活动');
+      return;
     }
     Modal.confirm({
       title: '删除后当前直播活动关联的小程序端开屏图、banner图等也会自动下架',
       okText: '确定',
       cancelText: '取消',
-      onOk () {
-        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList, }).then((data) => {
-          message.info("操作成功")
-          getList({ pageNum: 1, pageSize: 10 });
-        }).catch((err) => {
-          // message.info(err.msg)
-        })
+      onOk() {
+        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: liveIdList })
+          .then(data => {
+            message.info('操作成功');
+            getList({ pageNum: 1, pageSize: 10 });
+          })
+          .catch(err => {
+            // message.info(err.msg)
+          });
       },
     });
-
-    
-  }
+  };
 
   /**
    *
@@ -110,7 +116,7 @@ const header = props => {
       dataIndex: 'liveActivityTitle',
       key: 'liveActivityTitle',
       align: 'center',
-      render:  (x, row) => <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>,
+      render: (x, row) => <Navigate onClick={toAddLive(row)}>{row.liveActivityTitle}</Navigate>,
     },
     {
       title: '所属城市',
@@ -129,14 +135,22 @@ const header = props => {
       dataIndex: 'liveStartDate',
       key: 'liveStartDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.liveStartDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.liveStartDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '直播结束时间',
       dataIndex: 'liveEndDate',
       key: 'liveEndDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.liveEndDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.liveEndDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '权重',
@@ -149,7 +163,11 @@ const header = props => {
       dataIndex: 'status',
       key: 'status',
       align: 'center',
-      render: status => <><span>{status == 0 ? '未发布' : '已发布'}</span></>,
+      render: status => (
+        <>
+          <span>{status == 0 ? '未发布' : '已发布'}</span>
+        </>
+      ),
     },
     {
       title: '新增人',
@@ -162,7 +180,11 @@ const header = props => {
       dataIndex: 'createDate',
       key: 'createDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '修改人',
@@ -175,17 +197,21 @@ const header = props => {
       dataIndex: 'updateDate',
       key: 'updateDate',
       align: 'center',
-      render: (x, row) => <><span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span></>,
+      render: (x, row) => (
+        <>
+          <span>{`${moment(row.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
+        </>
+      ),
     },
     {
       title: '操作',
       align: 'center',
       width: 240,
-      render: withActions((text, record) => [    
-        <AuthButton name="admin.liveActivity.dataRecord" noRight={null}>
-          <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
-        </AuthButton>,
- 
+      render: withActions((text, record) => [
+        // <AuthButton name="admin.liveActivity.dataRecord" noRight={null}>
+        //   <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
+        // </AuthButton>,
+
         <AuthButton name="admin.live.detail.get" noRight={null}>
           <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />
         </AuthButton>,
@@ -199,17 +225,16 @@ const header = props => {
         dynamicId,
       },
     });
-  }
+  };
 
   const changePageNum = pageNumber => {
-
-    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
-  }
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() });
+  };
 
   const rowSelection = {
     onChange: (selectedRowKeys, selectedRows) => {
       console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
-      setLiveIdList(selectedRows)
+      setLiveIdList(selectedRows);
     },
   };
 
@@ -218,93 +243,99 @@ const header = props => {
     e.preventDefault();
     props.form.validateFields((err, values) => {
       if (!err) {
-        console.log('提交数据: ', values)
+        console.log('提交数据: ', values);
         if (time) {
-          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`
+          values.time = `${moment(time).format('YYYY-MM-DDT00:00:00.000')}Z`;
         } else {
-          values.time = null
+          values.time = null;
         }
-      
-        getList({ pageNum: 1, pageSize: 10, ...values })
+
+        getList({ pageNum: 1, pageSize: 10, ...values });
       }
     });
-  }
+  };
 
   // 重置搜索
-  function handleReset () {
+  function handleReset() {
     props.form.resetFields();
-    setTime('')
+    setTime('');
 
-    getList({ pageNum: 1, pageSize: 10 })
+    getList({ pageNum: 1, pageSize: 10 });
   }
 
   // 时间回调
   function timeOnChange(date, dateString) {
-    console.log(date, dateString)
-    setTime(date)
+    console.log(date, dateString);
+    setTime(date);
   }
 
-
-  const { getFieldDecorator } = props.form
+  const { getFieldDecorator } = props.form;
   return (
-
     <Card>
       {/* style={{ display: 'none' }} */}
       <div id="qrcode"></div>
       <Form layout="inline" onSubmit={e => handleSubmit(e)}>
         <Form.Item>
           {getFieldDecorator('liveActivityTitle')(
-             <Input
-             prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-             placeholder="直播活动标题"
-           />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('cityId')(
-            <SelectCity />,
-          )}
-        </Form.Item>
-        <Form.Item>
-          {getFieldDecorator('buildingId')(
-            <BuildSelect />,
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="直播活动标题"
+            />,
           )}
         </Form.Item>
+        <Form.Item>{getFieldDecorator('cityId')(<SelectCity />)}</Form.Item>
+        <Form.Item>{getFieldDecorator('buildingId')(<BuildSelect />)}</Form.Item>
         <Form.Item>
           {getFieldDecorator('status')(
             <Select style={{ width: '180px' }} placeholder="发布状态">
-            <Option value="1">已发布</Option>
-            <Option value="0">未发布</Option>
-          </Select>,
+              <Option value="1">已发布</Option>
+              <Option value="0">未发布</Option>
+            </Select>,
           )}
         </Form.Item>
         <Form.Item>
           <AuthButton name="admin.buildingDynamic.search" noRight={null}>
-            <Button type="primary" htmlType="submit" >
+            <Button type="primary" htmlType="submit">
               搜索
             </Button>
           </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
-            </Button>
+          </Button>
         </Form.Item>
       </Form>
-      
+
       <AuthButton name="admin.live.add.post" noRight={null}>
-        <Button type="danger" style={{margin:'20px 0'}}  onClick={toAddLive()}>新增</Button>
+        <Button type="danger" style={{ margin: '20px 0' }} onClick={toAddLive()}>
+          新增
+        </Button>
       </AuthButton>
       <AuthButton name="admin.live.del" noRight={null}>
-        <Button type="primary"  onClick={toDelLiveActivity()} style={{marginLeft:'30px'}}>删除</Button>
-      </AuthButton><br/>
+        <Button type="primary" onClick={toDelLiveActivity()} style={{ marginLeft: '30px' }}>
+          删除
+        </Button>
+      </AuthButton>
+      <br />
       <span>共筛选出{data.total}条记录</span>
-      <Table rowSelection={rowSelection}
-       dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
+      <Table
+        rowSelection={rowSelection}
+        dataSource={data.records}
+        columns={columns}
+        pagination={false}
+        rowKey="activityList"
+      />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={e => changePageNum(e)} current={data.current}/>
+        <Pagination
+          showQuickJumper
+          defaultCurrent={1}
+          total={data.total}
+          onChange={e => changePageNum(e)}
+          current={data.current}
+        />
       </div>
     </Card>
-  )
-}
+  );
+};
 const WrappedHeader = Form.create({ name: 'header' })(header);
 
-export default WrappedHeader
+export default WrappedHeader;

src/pages/Live/LiveActivity/add/index.jsx

@@ -0,0 +1,176 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, Radio, Upload, InputNumber } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import XForm, { FieldTypes } from '../../../../components/XForm';
+import router from 'umi/router';
+import moment from 'moment';
+import styles from '../../../style/GoodsList.less';
+import SelectCity from '../../../../components/SelectButton/CitySelect'
+import BuildSelect2 from '../../../../components/SelectButton/BuildSelect2'
+import LivePlatSelect from '../../../../components/SelectButton/LivePlatSelect'
+import CitySelect3 from '../../../../components/SelectButton/CitySelect3'
+import ImageUpload from '../../../../components/XForm/ImageUpload'
+import Wangedit from '../../../../components/Wangedit/Wangedit'
+import Navigate from '@/components/Navigate';
+import apis from '../../../../services/apis';
+import request from '../../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Prompt from 'umi/prompt';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+let cityId = ''
+
+const header = props => {
+  const { salesBatchId } = props.location.query
+  console.log(salesBatchId)
+  const [ saleBatchData, setSaleBatchData ] = useState({})
+  const [showHelp, setShowHelp] = useState(false)
+
+  const cancelPage = () =>{
+    router.push({
+      pathname: '/activity/liveActivity/list',
+    });
+  }
+
+   //打开新页面
+   const openIndexImg = () => {
+    const newWin=window.open('about:blank');
+    newWin.location.href="http://njcj.oss-cn-shanghai.aliyuncs.com/%E6%95%99%E7%A8%8B.png"
+  }
+
+  function highlightsTypeChange(e) {
+    console.log(e.target.value,"ee")
+    setTypeState(e.target.value)
+  }
+
+  function disabledDate(current) {
+    // Can not select days before today and today
+    return current && current < moment().endOf('day');
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        let {liveTime, ...submitValue} = values
+        submitValue.liveStartDate = moment(submitValue.liveStartDate._d).format('YYYY-MM-DD HH:mm:ss')
+        submitValue.liveEndDate = moment(submitValue.liveEndDate._d).format('YYYY-MM-DD HH:mm:ss')
+        
+        if (values.liveStartDate > values.liveEndDate){
+          message.info("直播结束时间大于开始时间")
+          return;
+        }
+
+        request({ ...apis.taliveActivity.addTaLiveActivity, data: { ...submitValue },}).then((data) => {
+          message.info("保存成功")
+          console.log(data,"datattttttt")
+          router.go('-1');
+        }).catch((err) => {
+          message.info(err.msg || err.message)
+        })
+      }
+    });
+  }
+
+  const { getFieldDecorator } = props.form;
+
+  return (
+    <>
+      <Form labelCol={{ span: 7 }} wrapperCol={{ span: 12 }} onSubmit={handleSubmit}>
+        <Form.Item label="所属城市">
+          {getFieldDecorator('cityId', {
+            rules: [{ required: true, message: ' 请输入所属城市' }],
+          })(<CitySelect3 buildingId={props.form.getFieldValue('buildingId')}/>)}
+        </Form.Item>
+        <Form.Item label="所属楼盘">
+          {getFieldDecorator('buildingId')(<BuildSelect2 cityId={props.form.getFieldValue('cityId')}/>)}
+        </Form.Item>
+        <Form.Item label="直播活动标题">
+          {getFieldDecorator('liveActivityTitle', {
+            rules: [{ required: true, message: '请输入直播活动标题' }],
+          })(<Input maxLength={20} placeholder="给直播活动起个名字" />)}
+        </Form.Item>
+        <Form.Item label="直播开始时间">
+          {getFieldDecorator('liveStartDate', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择直播开始时间',
+                  },
+                ],
+              })(<DatePicker placeholder="预计开始时间"style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        </Form.Item>
+        <Form.Item label="直播结束时间">
+          {getFieldDecorator('liveEndDate', {
+                rules: [
+                  {
+                    required: true,
+                    message: '请选择直播结束时间',
+                  },
+                ],
+              })(<DatePicker placeholder="预计结束时间" disabledDate={disabledDate} style={{ width: '500px' }}format="YYYY-MM-DD HH:mm:ss" showTime={{ format: 'HH:mm:ss' }}/>)}
+        </Form.Item>
+        <Form.Item label="直播小程序">
+          {getFieldDecorator('liveApp', {
+              rules: [{ required: true, message: '请选择直播小程序' }],
+            })((<LivePlatSelect />))}
+        </Form.Item>
+        <Form.Item label="房间参数">
+          {getFieldDecorator('liveRoomParam', {
+            rules: [{ required: true, message: '请输入房间参数' }],
+          })(<Input maxLength={1000} placeholder="点击右侧按钮查看如何获取房间参数" style={{width:'680px'}}/>)}<Navigate onClick={openIndexImg}>不知道怎么填？查看说明</Navigate>
+        </Form.Item>
+        <Form.Item label="封面图1" help="建议尺寸：750px*420px，比例16:9，格式：jpg，用于：活动列表">
+              {getFieldDecorator('listImg', {
+                  rules: [{ required: true, message: '请上传封面图1' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>  
+        <Form.Item label="封面图2" help="建议尺寸：750*250px，比例3:1，格式：jpg，用于：项目详情页">
+              {getFieldDecorator('detailImg', {
+                  rules: [{ required: true, message: '请上传封面图2' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>  
+        <Form.Item label="详情图" help="格式：jpg，用于：直播活动详情页，点击可跳转到直播间">
+              {getFieldDecorator('detailTypeImg', {
+                  rules: [{ required: true, message: '请上传详情图' }],
+              })(
+                <ImageUpload />,
+              )}
+        </Form.Item>      
+        <Form.Item label="权重">
+              {getFieldDecorator('weight', {
+                  rules: [{ required: true, message: '请设置权重' }],
+              })(
+                <InputNumber placeholder="权重越大越靠前" style={{width:'150px'}}/>
+              )}
+        </Form.Item>
+        <Form.Item label="发布状态">
+          {getFieldDecorator('status', {
+              rules: [{ required: true, message: '请选择发布状态' }],
+            })(<Select placeholder="发布状态" style={{ width: '300px' }}>
+            <Option value="0">否</Option>
+            <Option value="1">是</Option>
+          </Select>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            确定
+          </Button>
+          <Button onClick={() => router.go(-1)}>
+            取消
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/Live/liveActivity copy/edit/components/shareRecord.jsx

@@ -26,7 +26,8 @@ const header = (props) => {
     request({ ...apis.taliveActivity.taLiveShare, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
-    })
+    }).catch(e=>
+      console.error(e))
   }
   
   const columns = [

src/pages/staff/staff/Edit/index.jsx

@@ -234,7 +234,7 @@ const StaffEdit = (props) => {
       value: userData.roleIds,
     },
     {
-      label: '授权项目',
+      label: '授权项目', //改成组织机构
       name: 'buildingId',
       render: <BuildingSelection userData={userData} />,
       value: userData.buildingId,
@@ -306,7 +306,7 @@ const StaffEdit = (props) => {
 
 
   return <Card>
-            <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
+            <XForm  onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
 
         </Card>
 }

src/pages/staff/staff/Edit/index1.jsx

@@ -0,0 +1,317 @@
+import React, { useState, useEffect } from 'react';
+
+import { Input, Card, message, Radio, Select, Modal } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import BuildSelect from '@/components/SelectButton/BuildSelect'
+import router from 'umi/router';
+import { FieldTypes, createForm } from '@/components/XForm';
+import Wangedit from '@/components/Wangedit/Wangedit'
+// import channels from './channelList.less';
+// import Tagss from '../components/Tagss.jsx';
+import apis from '@/services/apis';
+import request from '@/utils/request'
+import BuildingSelection from '../components/BuildingSelection'
+
+const { TextArea } = Input;
+const { Option } = Select;
+let consultantChecked = false;
+
+const setExtraData = (data) => {
+  consultantChecked = data.isConsultant
+}
+
+const handleFormValueChange = (props, changedValues, allValues) => {
+    setExtraData(allValues)
+}
+
+const XForm = createForm({ onValuesChange: handleFormValueChange })
+
+/**
+ *
+ *
+ * @param {*} props
+ * @returns
+ */
+const StaffEdit = (props) => {
+  const userId = props.location.query.userId
+  const [userData, setUserData] = useState({})
+  const [tagData, setTagData] = useState([])
+  const [roleData, setRoleData] = useState([])
+  const [buildData, setBuildData] = useState([])
+  const [visible, setVisible] = useState(false)
+
+  const getTagList = () => {
+    request({ ...apis.staff.taTags, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      setTagData(data.records)
+    })
+  }
+
+  const getRoleList = () => {
+    request({ ...apis.role.getRoleList, params: { pageNum: 1, pageSize: 999 } }).then((data) => {
+      console.log(data)
+      setRoleData(data.records)
+    })
+  }
+
+  //获取项目列表
+  const getBuildList = e => {
+    request({ ...apis.building.buildingSelect, params: { pageNum: 1, pageSize: 999 } }).then(data => {
+        setBuildData(data)
+    })
+  }
+
+  // 查询列表
+  const getUserData = (userId) => {
+    request({ ...apis.staff.getTaUser, urlData: { id: userId } }).then((data) => {
+      consultantChecked = data.isConsultant
+      setUserData(data)
+    })
+  }
+
+  if(userData.buildingIds && buildData.length > 0 && !consultantChecked){
+      const newBuildings = userData.buildingIds.filter(x => buildData.filter(it => it.buildingId === x)[0])
+      userData.buildingIds = newBuildings
+  }
+
+  if(userData.roleIds && roleData.length > 0){
+    const newRoleIds = userData.roleIds.filter(x => roleData.filter(it => it.roleId === x)[0])
+      userData.roleIds = newRoleIds
+  }
+
+  useEffect(() => {
+    getTagList();
+    getRoleList();
+    getBuildList();
+    if (userId) {
+      getUserData(userId);
+    }
+  }, [])
+
+  const tagsChange = (value) => {
+    console.log(`selected ${value}`);
+  }
+
+  const handleSubmit = val => {
+    if (userId) {
+      request({ ...apis.staff.updateTaUser, urlData: { id: userId }, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    } else {
+      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
+        console.log(data, "tauser")
+        message.info("保存成功")
+        router.go(-1)
+      }).catch(error => {
+        // message.info(error.message)
+      })
+    }
+  }
+
+  const photoBeforeUpload = (file) => {
+    // const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png';
+    // if (!isJpgOrPng) {
+    //   message.error('请上传 JPG/PNG 格式的图片!');
+    // }
+    console.log(file.size, file.size / 1024)
+    const isLt100k = (file.size / 1024) < 100;
+    if (!isLt100k) {
+      message.error('请上传小于100k的图片!');
+    }
+    return isLt100k;
+  }
+
+  //授权项目改变
+  const consultantBuildingChange =(e) => {
+    if(userData.isConsultant){
+      request({ ...apis.staff.check, params: { userId: userData.userId, personId: userData.consultantPersonId, buildingId: userData.buildingId } }).then(res => {
+        if(res.length > 0){
+          Modal.confirm({
+            title: '此置业顾问下有私客，是否转移私客？',
+            okText: '确认',
+            cancelText: '取消',
+            onOk () {
+              setVisible(true)
+            },
+          });
+        }
+     })
+    }
+  }
+
+   //迁移私客成功回调
+   const moveSuccess = (e) => {
+    setVisible(false)
+  }
+
+  const fields = [
+
+
+    
+    // {
+    //   label: '姓名',
+    //   name: 'userName',
+    //   type: FieldTypes.Text,
+    //   value: userData.userName,
+    //   rules: [
+    //     { required: true, message: '请输入姓名' },
+    //   ]
+    // },
+    // {
+    //   label: '公司',
+    //   name: 'orgName',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入公司名称',
+    //   value: userData.orgName,
+    //   rules: [
+    //     { required: true, message: '请输入公司名称' },
+    //   ]
+    // },
+    // {
+    //   label: '部门',
+    //   name: 'department',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入部门',
+    //   value: userData.department,
+    //   rules: [
+    //     { required: true, message: '请输入部门' },
+    //   ]
+    // },
+    // {
+    //   label: '职位',
+    //   name: 'position',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入职位',
+    //   value: userData.position,
+    //   rules: [
+    //     { required: true, message: '请输入职位' },
+    //   ]
+    // },
+    // {
+    //   label: '是否置业顾问',
+    //   name: 'isConsultant',
+    //   type: FieldTypes.Switch,
+    //   value: userData.isConsultant,
+    //   props: {disabled: userData.isConsultant},
+    // },
+    // {
+    //   label: '电话',
+    //   name: 'phone',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入电话号码',
+    //   value: userData.phone,
+    //   rules: [
+    //     {
+    //         required: true,
+    //         pattern: new RegExp('^1[0-9]{10}$'),
+    //         message: '请输入正确的电话号码',
+    //     },
+    //   ]
+    // },
+    // {
+    //   label: '登录名',
+    //   name: 'loginName',
+    //   type: FieldTypes.Text,
+    //   placeholder: '请输入登录名',
+    //   value: userData.loginName,
+    //   // hidden: () => consultantChecked,
+    //   help: '默认密码：123456',
+    // },
+    // {
+    //   label: '角色',
+    //   name: 'roleIds',
+    //   render: <Select
+    //     mode="multiple"
+    //     style={{ width: '100%' }}
+    //     placeholder="请选择标签"
+    //     onChange={tagsChange} >
+    //     {roleData.map(item => (
+    //       <Select.Option key={item.roleId} value={item.roleId}>
+    //         {item.roleName}
+    //       </Select.Option>
+    //     ))}
+    //   </Select>,
+    //   value: userData.roleIds,
+    // },
+    // {
+    //   label: '授权项目',
+    //   name: 'buildingId',
+    //   render: <BuildingSelection userData={userData} />,
+    //   value: userData.buildingId,
+    //   hidden: () => !consultantChecked,
+    //   rules: [
+    //     { required: true, message: '请选择授权项目' },
+    //   ]
+    // },
+    // {
+    //   label: '授权项目',
+    //   name: 'buildingIds',
+    //   render: <Select
+    //     mode="multiple"
+    //     showSearch
+    //     style={{ width: '100%' }}
+    //     placeholder="请选择授权项目"
+    //     filterOption={(input, option) =>
+    //       option.props.children && option.props.children.toLowerCase().indexOf(input.toLowerCase()) >= 0
+    //     }
+    //     >
+    //     {buildData.map(item => (
+    //       <Select.Option key={item.buildingId} value={item.buildingId}>
+    //         {item.buildingName}
+    //       </Select.Option>
+    //     ))}
+    //   </Select>,
+    //   value: userData.buildingIds,
+    //   hidden: () => consultantChecked,
+    //   rules: [
+    //     { required: true, message: '请选择授权项目' },
+    //   ]
+    // },
+    // {
+    //   label: '置业顾问头像',
+    //   name: 'photo',
+    //   type: FieldTypes.ImageUploader,
+    //   extra: '建议图片尺寸：320*320px，比例1:1,格式：jpg，用于置业顾问头像,限制大小：100k',
+    //   value: userData.photo,
+    //   beforeUpload: (e) => photoBeforeUpload(e),
+    //   rules: [
+    //     { required: true, message: '请选择头像' },
+    //   ]
+    // },
+    // {
+    //   label: '简介',
+    //   name: 'description',
+    //   render: <TextArea  ></TextArea>,
+    //   value: userData.description
+    //   // className={channels.inpuitTxt}
+    // },
+    // {
+    //   label: '状态',
+    //   name: 'status',
+    //   render: <Radio.Group initialValue="1" buttonStyle="solid">
+    //     <Radio.Button value="9">禁用</Radio.Button>
+    //     <Radio.Button value="1">启用</Radio.Button>
+    //   </Radio.Group>,
+    //   value: userData.status != null ? userData.status.toString() : "1"
+    // },
+    // {
+    //   label: '权重',
+    //   name: 'weight',
+    //   type: FieldTypes.Number,
+    //   render: <Input type="number" style={{ width: 150}} />,
+    //   value: userData.weight,
+    //   help: '数字越大越靠前',
+    // },
+  ]
+
+
+  return <Card>
+            <XForm  onSubmit={handleSubmit} fields={fields} onCancel={() => router.go(-1)}></XForm>
+
+        </Card>
+}
+
+export default StaffEdit

src/utils/request.js

@@ -68,6 +68,7 @@ request.interceptors.request.use((url, options) => {
 });
 
 request.interceptors.response.use(async (response, options) => {
+  
   if (response && response.status) {
     if (response.status != 200) {
       const errorText = codeMessage[response.status] || response.statusText;
@@ -81,6 +82,7 @@ request.interceptors.response.use(async (response, options) => {
     } else {
       // console.log('response.headers: ', response.headers)
       // console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
+      console.log(response,'response')
       if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
         return await response.clone().blob();
       }
@@ -89,8 +91,9 @@ request.interceptors.response.use(async (response, options) => {
       if (response.url.indexOf('gaode_amap') !== -1) {
         return await response.clone().json();
       }
-
+      console.log(response,'response')
       const { code, data, message } = await response.clone().json();
+     
       if (code != 1000) {
         if (code === 1001) {
           // notification.error({
@@ -99,6 +102,7 @@ request.interceptors.response.use(async (response, options) => {
           // });
           // throw new Error('请登录系统');
         } else {
+          console.log(code, data, message ,'code, data, message ')
           notification.error({
             message: message || '请求错误',
             // description: message,