fix

src/pages/activity/SignupActivity/registrationRecord.jsx

@@ -57,17 +57,17 @@ const columns = [
     key: 'orgName',
     align: 'center',
   },
-  {
-    title: '状态',
-    dataIndex: 'isCheckin',
-    key: 'isCheckin',
-    align: 'center',
-    render: (x, row) => (
-      <>
-        <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
-      </>
-    ),
-  },
+  // {
+  //   title: '状态',
+  //   dataIndex: 'isCheckin',
+  //   key: 'isCheckin',
+  //   align: 'center',
+  //   render: (x, row) => (
+  //     <>
+  //       <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
+  //     </>
+  //   ),
+  // },
 ];
 
 const header = props => {

src/pages/activity/groupRoomActivity/registrationRecord.jsx

@@ -57,17 +57,17 @@ const columns = [
     key: 'orgName',
     align: 'center',
   },
-  {
-    title: '状态',
-    dataIndex: 'isCheckin',
-    key: 'isCheckin',
-    align: 'center',
-    render: (x, row) => (
-      <>
-        <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
-      </>
-    ),
-  },
+  // {
+  //   title: '状态',
+  //   dataIndex: 'isCheckin',
+  //   key: 'isCheckin',
+  //   align: 'center',
+  //   render: (x, row) => (
+  //     <>
+  //       <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
+  //     </>
+  //   ),
+  // },
 ];
 
 const header = props => {

src/pages/activity/lookHouseActivity/registrationRecord.jsx

@@ -57,17 +57,17 @@ const columns = [
     key: 'orgName',
     align: 'center',
   },
-  {
-    title: '状态',
-    dataIndex: 'isCheckin',
-    key: 'isCheckin',
-    align: 'center',
-    render: (x, row) => (
-      <>
-        <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
-      </>
-    ),
-  },
+  // {
+  //   title: '状态',
+  //   dataIndex: 'isCheckin',
+  //   key: 'isCheckin',
+  //   align: 'center',
+  //   render: (x, row) => (
+  //     <>
+  //       <span>{row.isCheckin === 1 ? '已签到' : '未签到'}</span>
+  //     </>
+  //   ),
+  // },
 ];
 
 const header = props => {

src/pages/course/Edit/index.jsx

@@ -15,10 +15,10 @@ const goBack = () => router.goBack(-1);
 
 const CurriculumForm = React.forwardRef((props, ref) => {
   const [loading, setLoading] = useState(false);//防止多次点击 定义loadind
-  const [formData, setFormData] = useState();//提交表单的数据
-  const [contentType, setContentType] = useState(1);//单选。初始默认显示1 富文本框。点击视频， 渲染2
+  // const [formData, setFormData] = useState({});//提交表单的数据
+  const [contentType, setContentType] = useState(0);//单选。初始默认显示0 富文本框。点击视频， 渲染1
   const { form, history } = props;
-  const { getFieldDecorator, setFieldsValue, validateFields } = form;
+  const { getFieldDecorator, setFieldsValue, validateFields,getFieldValue } = form;
   const { curriculumId } = history.location.query || {}
   
   const formItemLayout = {
@@ -28,6 +28,18 @@ const CurriculumForm = React.forwardRef((props, ref) => {
 
   };
 
+  const fileUploadBeforeUpload = (file, fileList) => {
+    return new Promise((resolve, reject) => {
+      if (file.type === 'video/mp4' || file.type === '.mp4') {
+        // setVideoImage(true)
+        resolve(file);
+      } else {
+        notification.error({ message: '项目视频，仅支持MP4格式' });
+        reject();
+      }
+    });
+  };
+
   const handleSubmit = (e) => {
     e.preventDefault();
     validateFields((err, values) => {
@@ -37,7 +49,9 @@ const CurriculumForm = React.forwardRef((props, ref) => {
       }
 
       setLoading(true);//loading开始
-
+      if (values.curriculumUrl) {
+        values.curriculumUrl = values.curriculumUrl[0];
+      }
       if (curriculumId) {
         //如果有这个id拿。没有就，拿返回的curriculumId
         updateCurriculumData({
@@ -69,7 +83,12 @@ const CurriculumForm = React.forwardRef((props, ref) => {
 
   const getCourseData = useCallback(({ curriculumId }) => {//函数结果存 初始化运行一次，等待调用。
     getCurriculumData({urlData: { id: curriculumId }}).then((res) => {
-      setFormData(res)
+      if(res.curriculumUrl){
+        res.curriculumUrl = [res.curriculumUrl];
+      }
+      setFieldsValue(res)
+      // setFormData(res)
+      // setContentType(res.type)
     })
   }, [])
 
@@ -79,11 +98,11 @@ const CurriculumForm = React.forwardRef((props, ref) => {
     }
   }, [curriculumId])//第二次id一样不执行
 
-  useEffect(() => {
-    if (formData) {//1.form表单数据{2} 执行。无变更不执行
-      setFieldsValue(formData)
-    }
-  }, [formData])//2.有变更跟的话
+  // useEffect(() => {
+  //   if (formData) {//1.form表单数据{2} 执行。无变更不执行
+  //     setFieldsValue(formData)
+  //   }
+  // }, [formData])//2.有变更跟的话
   
 
   return (
@@ -99,8 +118,8 @@ const CurriculumForm = React.forwardRef((props, ref) => {
           })(
             <Select style={{width:'500px'}}>
               <Option value="1">经纪人</Option>
-              <Option value="2">职业顾问</Option>
-              <Option value="0">职业顾问&amp;经纪人</Option>
+              <Option value="2">置业顾问</Option>
+              <Option value="3">{`置业顾问&经纪人`}</Option>
             </Select>
           )
         }
@@ -142,13 +161,14 @@ const CurriculumForm = React.forwardRef((props, ref) => {
       <FormItem label="详情">
         {
           getFieldDecorator('type', {
+            initialValue:0,
             rules: [
               { required: true, message: '请选择详情类型' }
             ]
           })(
-              <Radio.Group value={contentType} onChange={e=> setContentType(e.target.value)} style={{width:'500px'}} defaultValue={1}>
-                <Radio value={1}>图文</Radio>
-                <Radio value={2}>视频</Radio>
+              <Radio.Group style={{width:'500px'}} >
+                <Radio value={0}>图文</Radio>
+                <Radio value={1}>视频</Radio>
               </Radio.Group>
           )
         }
@@ -169,18 +189,30 @@ const CurriculumForm = React.forwardRef((props, ref) => {
         }
 
       </FormItem> */}
-
-      <FormItem label="详情内容">
+     { getFieldValue('type')==0?<FormItem label="图文">
         {
           getFieldDecorator('content', {
             rules: [
               { required: true, message: '请输入详情内容' }
             ]
           })(
-            contentType == 1 ? <Wangedit style={{width:'500px'}}  /> : <FileUpload />
+           <Wangedit style={{width:'500px'}}  /> 
           )
         }
-      </FormItem>
+      </FormItem>:
+       <FormItem label="视频">
+       {
+         getFieldDecorator('curriculumUrl', {
+           rules: [
+             { required: true, message: '请上传视频文件' }
+           ]
+         })(
+          <FileUpload accept=".mp4" beforeUpload={fileUploadBeforeUpload} label="上传视频" size={1} />,
+         )
+       }
+     </FormItem>}
+
+     
       <FormItem label="权重" >
         {
           getFieldDecorator('weight', {

src/pages/course/list/index.jsx

@@ -12,7 +12,6 @@ import { router } from 'umi';
 import { getImgURL } from '@/utils/image';
 import Navigate from '@/components/Navigate';
 
-
 export default props => {
   const ref = useRef();
   const toEdit = useCallback(row => {
@@ -25,46 +24,45 @@ export default props => {
     });
   }, []);
 
-
   const confirm = data => {
-      // {...data,isPublish}
-        if (data.isPublish === 1) {
-          const titleCourse = data.isPublish
-            ? '确认取消发布此课程吗？' : '确认发布此课程吗？'
-          Modal.confirm({
-            title: titleCourse,
-            okText: '确认',
-            cancelText: '取消',
-            onOk() {
-              request({ ...apis.course.alterCourse, urlData: { id: data.curriculumId }, data: { ...data, isPublish: 0 } }).then(res => {
-                message.info('操作成功');
-                ref.current.reload();//
-              });
-            },
+    // {...data,isPublish}
+    if (data.isPublish === 1) {
+      const titleCourse = data.isPublish ? '确认取消发布此课程吗？' : '确认发布此课程吗？';
+      Modal.confirm({
+        title: titleCourse,
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({
+            ...apis.course.alterCourse,
+            urlData: { id: data.curriculumId },
+            data: { ...data, isPublish: 0 },
+          }).then(res => {
+            message.info('操作成功');
+            ref.current.reload(); //
           });
-        } else {
-          const titleCourse = data.isPublish
-            ? '确认取消发布此课程吗？' : '确认发布此课程吗？'
-          Modal.confirm({
-            title: titleCourse,
-            okText: '确认',
-            cancelText: '取消',
-            onOk() {
-              request({ ...apis.course.alterCourse, urlData: { id: data.curriculumId }, data: { ...data, isPublish: 1 } }).then(res => {
-                message.info('操作成功');
-                ref.current.reload();//
-              });
-            },
+        },
+      });
+    } else {
+      const titleCourse = data.isPublish ? '确认取消发布此课程吗？' : '确认发布此课程吗？';
+      Modal.confirm({
+        title: titleCourse,
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({
+            ...apis.course.alterCourse,
+            urlData: { id: data.curriculumId },
+            data: { ...data, isPublish: 1 },
+          }).then(res => {
+            message.info('操作成功');
+            ref.current.reload(); //
           });
-        }
-  }
+        },
+      });
+    }
+  };
 
-  
-  
-  
-  
-  
-  
   const searchFields = [
     {
       name: 'name',
@@ -79,9 +77,7 @@ export default props => {
       options: [
         { label: '经纪人', value: '1' },
         { label: '置业顾问', value: '2' },
-        { label: '置业顾问&经纪人', value: '0' },
-
-
+        { label: '置业顾问&经纪人', value: '3' },
       ],
     },
   ];
@@ -91,16 +87,21 @@ export default props => {
       dataIndex: 'name',
       key: 'name',
       align: 'center',
-      render: (text, row) => <Button type='link' onClick={() => toEdit(row)}>{text}</Button>
+      render: (text, row) => (
+        <Button type="link" onClick={() => toEdit(row)}>
+          {text}
+        </Button>
+      ),
     },
     {
       title: '课程主图',
       dataIndex: 'curriculumImg',
       key: 'curriculumImg',
       align: 'center',
-      render: (_, record) => <img src={getImgURL(record.curriculumImg)} style={{ width: '165px', height: '104px' }} />,
+      render: (_, record) => (
+        <img src={getImgURL(record.curriculumImg)} style={{ width: '165px', height: '104px' }} />
+      ),
       // render:(_,record)=>(record.curriculumImg)==''?<img src={require(record)}/>:<img src={getImgURL(record.curriculumImg)} style={{ width: '165px', height: '104px' }} />
-
     },
     {
       title: '阅读人数',
@@ -132,10 +133,11 @@ export default props => {
       align: 'center',
       render: withActions(
         (_, row) => [
-            <OperButton onClick={()=>confirm(row)}> {row.isPublish === 0 ? '发布' : '取消发布'}</OperButton>,
+          <OperButton onClick={() => confirm(row)}>
+            {row.isPublish === 0 ? '发布' : '取消发布'}
+          </OperButton>,
           <AuthButton name="admin.building.delete" noRight={null}>
-            <OperButton>添加标签</OperButton>
-            <OperButton onClick={() => toEdit(row)}>{row.isPublish === 1 ? '编辑' : ''}</OperButton>
+            <OperButton onClick={() => toEdit(row)}>编辑</OperButton>
           </AuthButton>,
         ],
         { noMargin: true },
@@ -156,7 +158,7 @@ export default props => {
     <>
       <QueryTable
         ref={ref}
-        rowKey='curriculumId'
+        rowKey="curriculumId"
         api={apis.course.Tablecourse}
         columns={tableColumns}
         searchFields={searchFields}