fix

src/components/XForm/WrapperForm.jsx

@@ -53,14 +53,14 @@ class WrapperForm extends React.Component {
       FieldSubmit = <Button htmlType="submit" type="primary">提交</Button>
     }
     if (cancelBtn !== false) {
-      FieldCancel = <Button htmlType="button" onClick={this.handleCancel} style={{ marginLeft: '48px' }}>取消</Button>
+      FieldCancel = <Button htmlType="button" onClick={this.handleCancel} style={{ marginLeft: '48px' }}>{this.props.cancelText||'取消'}</Button>
     }
 
     return FieldSubmit || FieldCancel ? <WrapperItem action render={<>{FieldSubmit}{FieldCancel}</>} /> : null
   }
 
   render () {
-    const {fields, form, children, submitBtn, cancelBtn, ...formProps} = this.props;
+    const {fields, form, children, submitBtn, cancelBtn, cancelText,...formProps} = this.props;
     console.log('fields:', fields)
     const FeildItems = (fields || []).filter(x => x).map((props, inx) => (<WrapperItem key={inx} {...props} form={form} />))
     

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

@@ -232,7 +232,7 @@ const header = props => {
             initialValue: liveActivityData.weight,
           })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
-        <Form.Item label="发布状态">
+        {/* <Form.Item label="发布状态">
           {getFieldDecorator('status', {
             initialValue: liveActivityData.status == 1 ? '已发布' : '未发布',
             rules: [{ required: true, message: '请选择发布状态' }],
@@ -242,7 +242,7 @@ const header = props => {
               <Option value="1">已发布</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <AuthButton name="live.edit.submit" noRight={null}>
             <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>

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

@@ -81,14 +81,43 @@ const header = props => {
     });
   }
 
+  const onLivePublish = row => {
+    request({ ...apis.taliveActivity.livePublish, urlData: { id: row.liveActivityId } })
+      .then(data => {
+        message.info('操作成功');
+        getList({ pageNum: data.current, pageSize: 10 });
+      })
+      .catch(err => {
+        // message.info(err.msg)
+      });
+  };onDelete
+
+  const onDelete = rowData  => {
+
+    Modal.confirm({
+      title: '确认删除?',
+      okText: '确定',
+      cancelText: '取消',
+      onOk() {
+        request({ ...apis.taliveActivity.deleteTaLiveActivity, data: [rowData] })
+          .then(data => {
+            message.info('操作成功');
+            getList({ pageNum: 1, pageSize: 10 });
+          })
+          .catch(err => {
+            // message.info(err.msg)
+          });
+      },
+    });
+  };
+
   const toDelLiveActivity = rowData => () => {
-    console.log(liveIdList, 'liveIdListliveIdList');
     if (liveIdList.length < 1) {
       openNotificationWithIcon('error', '请先选择需要删除的直播活动');
       return;
     }
     Modal.confirm({
-      title: '删除后当前直播活动关联的小程序端开屏图、banner图等也会自动下架',
+      title: '确认删除?',
       okText: '确定',
       cancelText: '取消',
       onOk() {
@@ -215,10 +244,21 @@ const header = props => {
         // <AuthButton name="admin.liveActivity.dataRecord" noRight={null}>
         //   <EditIcon type="record" text="数据记录" onClick={toDataReacord(record)} />
         // </AuthButton>,
+        <AuthButton name="live.publish" noRight={null}>
+          <EditIcon
+            type={record.status === 1 ? 'cancel' : 'publish'}
+            text={record.status === 1 ? '取消发布' : '发布'}
+            onClick={() => onLivePublish(record)}
+          />
+        </AuthButton>,
 
         <AuthButton name="live.edit" noRight={null}>
           <EditIcon type="look" text="查看详情" onClick={toAddLive(record)} />
         </AuthButton>,
+
+        <AuthButton name="live.delete" noRight={null}>
+          <EditIcon type="delete" text="删除" onClick={()=>onDelete(record)} />
+        </AuthButton>,
       ]),
     },
   ];
@@ -253,7 +293,7 @@ const header = props => {
         } else {
           values.time = null;
         }
-
+        // values.status=0
         getList({ pageNum: 1, pageSize: 10, ...values });
       }
     });
@@ -326,7 +366,7 @@ const header = props => {
         dataSource={data.records}
         columns={columns}
         pagination={false}
-        rowKey="activityList"
+        rowKey="liveActivityId"
       />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination

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

@@ -81,7 +81,7 @@ const header = props => {
           message.info('直播结束时间大于开始时间');
           return;
         }
-
+        submitValue.status=0
         request({ ...apis.taliveActivity.addTaLiveActivity, data: { ...submitValue } })
           .then(data => {
             message.info('保存成功');
@@ -196,7 +196,7 @@ const header = props => {
           {getFieldDecorator('weight', {
           })(<InputNumber placeholder="权重越大越靠前" style={{ width: '150px' }} />)}
         </Form.Item>
-        <Form.Item label="发布状态">
+        {/* <Form.Item label="发布状态">
           {getFieldDecorator('status', {
             rules: [{ required: true, message: '请选择发布状态' }],
           })(
@@ -205,7 +205,7 @@ const header = props => {
               <Option value="1">是</Option>
             </Select>,
           )}
-        </Form.Item>
+        </Form.Item> */}
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <AuthButton name="live.add.submit" noRight={null}>
             <Button type="primary" htmlType="submit" style={{ marginRight: '20px' }}>

src/pages/carouselFigure/customImg/edit.jsx

@@ -8,7 +8,6 @@ import request from '../../../utils/request';
 
 let helpTips = '';
 
-
 // const handleFormValueChange = (props, changedValues, allValues) => {
 //   setExtraData(allValues);
 // };
@@ -16,10 +15,7 @@ let helpTips = '';
 const XForm = createForm();
 
 const header = props => {
-
-
-  const imgId =1;
-
+  const imgId = 1;
 
   const [data, setData] = useState({});
 
@@ -30,10 +26,11 @@ const header = props => {
 
     // 查询列表
     const getData = imgId => {
-
-      request({ ...apis.carsuseFigure.getCustomImg, urlData: { id: 1 } }).then(data => {
-
-        setData(data);
+      request({ ...apis.carsuseFigure.customImg, params: { imgType: 'index' } }).then(data => {
+        if (data?.records?.length > 0) {
+          setData(data.records[0]);
+        }
+        // setData(data);
       });
     };
   }
@@ -71,47 +68,55 @@ const header = props => {
       value: data.imgDocument,
       rules: [{ required: true, message: '请输入分享文案' }],
     },
-    {
-      label: '是否启用',
-      name: 'status',
-      type: FieldTypes.Switch,
-      value: data.status===1?true:false,
-      // rules: [{ required: true, message: '请输入分享文案' }],
-    },
+    // {
+    //   label: '是否启用',
+    //   name: 'status',
+    //   type: FieldTypes.Switch,
+    //   value: data.status===1?true:false,
+    //   // rules: [{ required: true, message: '请输入分享文案' }],
+    // },
   ];
 
   const handleSubmit = values => {
-    if (imgId) {
-      values.imgId = imgId;
-      values.imgType = 'index'
-      values.status = values.status==true?1:-1
+    if (data.imgId) {
+      values.imgId = data.imgId;
+      values.imgType = 'index';
       request({ ...apis.carsuseFigure.updateCustomImg, data: values })
         .then(data => {
           message.info('操作成功');
+          setData(data);
           // cancelPage();
         })
         .catch(err => {
           message.info(err.msg || err.message);
         });
-    } 
-    // else {
-    //   request({ ...apis.carsuseFigure.addCustomImg, data: values })
-    //     .then(data => {
-    //       cancelPage();
-    //     })
-    //     .catch(err => {
-    //       message.info(err.msg || err.message);
-    //     });
-    // }
+    }
+    else {
+      values.imgType = 'index';
+      request({ ...apis.carsuseFigure.addCustomImg, data: values })
+        .then(data => {
+          setData(data);
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
+    }
   };
 
   const cancelPage = () => {
-    router.go('-1')
+    if(data.imgId)
+    request({ ...apis.carsuseFigure.deleteCustomImg, urlData:{id:data.imgId} })
+        .then(data => {
+          setData({});
+        })
+        .catch(err => {
+          message.info(err.msg || err.message);
+        });
   };
 
   return (
     <Card>
-      <XForm onSubmit={handleSubmit} onCancel={cancelPage} fields={fields}></XForm>
+      <XForm onSubmit={handleSubmit} onCancel={cancelPage} cancelText='删除' cancelBtn={data.imgId?true:false} fields={fields}></XForm>
     </Card>
   );
 };

src/pages/statistics/activity/index.jsx

@@ -8,6 +8,7 @@ import request from '@/utils/request';
 import apis from '@/services/apis';
 import TimeSelect from '../compents/TimeSelect';
 import BuildingSelect from '@/components/SelectButton/BuildSelect';
+import Navigate from '@/components/Navigate';
 // import Count from './components/Count';
 // import SourceRole from './components/SourceRole';
 // import UserSex from './components/UserSex';
@@ -42,6 +43,7 @@ const DataReport = props => {
       key: 'visitPersonNum',
       width:'25%',
       sorter: true,
+      render: (text)=>text||0
     },
     {
       title: '访问次数',
@@ -49,6 +51,7 @@ const DataReport = props => {
       key: 'visitNum',
       width:'25%',
       sorter: true,
+      render: (text)=>text||0
     },
     {
       title: '报名人数',
@@ -56,13 +59,23 @@ const DataReport = props => {
       key: 'signNum',
       width:'25%',
       sorter: true,
-        // render: (text, record) => (
-        //   <Navigate onClick={toAddVisitNum(record)}>{record.signNum}</Navigate>
-        //   // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
-        // ),
+      // render: (text)=>text||0
+        render: (text, record) => (
+          text? <Navigate onClick={()=>toAddVisitNum(record)}>{record.signNum}</Navigate>:0
+          // <a style={{ color: '#66B3FF' }} onClick={toAddVisitNum(record)}><span>{record.visitNum}</span></a>
+        ),
     },
   ];
 
+  const  toAddVisitNum = (record)=>{
+    router.push({
+      pathname: '/activity/SignupActivity/registrationRecord',
+      query: {
+        dynamicId:record.dynamicId
+      },
+    });
+  }
+
   //排序
   const handleTableChange = (pagination, filters, sorter) => {
     console.log(pagination, filters, sorter);

src/pages/statistics/dataReport/components/SourceRole.jsx

@@ -34,11 +34,13 @@ const SourceRole = props => {
   }
   const dataset = data || {};
 
-  const { person_estate_agent = 0, person_null = 0, person_realty_consultant = 0 } =
-    dataset.pie || {};
+  const { allPersonNum = 0, consultantNum = 0, customerNum = 0 ,estageNum=0,orherNum=0} =
+    dataset || {};
 
   const pieoptions = {
-    color: ['#6B82E6', '#F02D40', '#FF834E'],
+    color: ['#F12B3E', '#FE929C', '#647CE1', '#A2B9FF', '#FF844F', '#FFBB9D'],
+  
+    // color: ['#6B82E6', '#F02D40', '#FF834E'],
     tooltip: {
       trigger: 'item',
       formatter: '{a} <br/>{b}: {c} ({d}%)',
@@ -46,7 +48,7 @@ const SourceRole = props => {
     legend: {
       orient: 'horizontal',
       left: 10,
-      data: [`来源置业`, `来源客户`, `其他`],
+      data: [`来源置业`, `来源客户`, '来源经纪人',`其他`],
     },
     // :${person_realty_consultant}:${person_estate_agent}${person_null}
     series: [
@@ -70,9 +72,10 @@ const SourceRole = props => {
           show: false,
         },
         data: [
-          { value: person_realty_consultant, name: '来源置业' },
-          { value: person_estate_agent, name: '来源客户' },
-          { value: person_null, name: '其他' },
+          { value: consultantNum, name: '来源置业' },
+          { value: customerNum, name: '来源客户' },
+          { value: estageNum, name: '来源经纪人' },
+          { value: orherNum, name: '其他' },
         ],
         // data: [
         //     { '用户来源': '来源置业', value: person_realty_consultant, },

src/pages/statistics/dataReport/components/UserConversion.jsx

@@ -22,36 +22,40 @@ const UserConversion = props => {
 
     request({
       ...apis.indexEcharts.userConversion,
-      params,
+      // params,
     }).then(data => {
-      console.log(data.data_count.registeredCount / data.data_count.pvNum, '1241234')
+
       setDataset(data, params.conversion)
     })
   }
-
+  // pvNum: 0
+  // registeredCount: 0
   function setDataset(data, theStatis) {
-    const { pvNum, ...other } = data.data_count
-
-    // 获取第一个值
-    let num = 0
-    for (const v of Object.keys(other)) {
-      num = other[v]
-      break
-    }
-
-    if (pvNum < num) {
-      setTheCurrent([
-        { name: getStatisName(theStatis), value: '0' },
-        { name: '其余', value:  '0' },
+    const { registerPersonNum, allPersonNum } = data
+    setTheCurrent([
+        { name: getStatisName(theStatis), value: registerPersonNum },
+        { name: '其余', value: allPersonNum - registerPersonNum },
       ])
-    } else {
-
-      setConversionRate(num / pvNum)
-      setTheCurrent([
-        { name: getStatisName(theStatis), value: num },
-        { name: '其余', value: pvNum - num },
-      ])
-    }
+    // 获取第一个值
+    // let num = 0
+    // for (const v of Object.keys(other)) {
+    //   num = other[v]
+    //   break
+    // }
+
+    // if (pvNum < num) {
+    //   setTheCurrent([
+    //     { name: getStatisName(theStatis), value: '0' },
+    //     { name: '其余', value:  '0' },
+    //   ])
+    // } else {
+
+    //   setConversionRate(num / pvNum)
+    //   setTheCurrent([
+    //     { name: getStatisName(theStatis), value: num },
+    //     { name: '其余', value: pvNum - num },
+    //   ])
+    // }
   }
 
   function getStatisName(theStatis) {

src/pages/statistics/dataReport/components/UserSex.jsx

@@ -34,8 +34,6 @@ const UserSource = props => {
       setData(data);
     });
   }
-  undefined;
-  const dataset = data.selectSexUser || [];
 
   const options = {
     color: ['#6B82E6', '#F02D40', '#FF834E'],
@@ -72,7 +70,13 @@ const UserSource = props => {
       labelLine: {
         show: false,
       },
-      data: dataset,
+      data: [
+        { name: '男', value: data.maleNum||0 },
+        {
+          name: '女',
+          value: data.femaleNum||0,
+        },
+      ],
     },
   };
 

src/services/apis.js

@@ -532,7 +532,7 @@ export default {
     // },
     userResource: {
       method: 'GET',
-      url: `${prefix}/selectUserResource`,
+      url: `${prefix}/statistics/userOrigin`,
       action: 'userStatistics',
     },
     selectPersonFrom: {
@@ -596,7 +596,7 @@ export default {
     },
     userSex: {
       method: 'GET',
-      url: `${prefix}/selectSexUser`,
+      url: `${prefix}/statistics/userGender`,
       action: 'selectSexUser',
     },
     newUser: {
@@ -611,7 +611,7 @@ export default {
     },
     userConversion: {
       method: 'GET',
-      url: `${prefix}/selectConversion`,
+      url: `${prefix}/statistics/userAuthor`,
       action: 'selectConversion',
     },
     intentionUsers: {
@@ -915,6 +915,11 @@ export default {
       method: 'GET',
       action: 'admin.taCustomImg.id.get',
     },
+    deleteCustomImg: {
+      url: `${prefix}/taCustomImg/:id`,
+      method: 'DELETE',
+      action: 'admin.taCustomImg.id.delete',
+    },
   },
   //Course课程+
   course: {
@@ -1807,6 +1812,11 @@ export default {
       method: 'get',
       action: 'admin.taLiveActivity.get',
     },
+    livePublish: {
+      url: `${prefix}/publish/live/:id`,
+      method: 'put',
+      action: 'admin.publish.live.id.put',
+    },
   },
   taH5SampleManager: {
     taH5Demand: {