git pull

src/components/XForm/ImageUpload.jsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import { Upload, Icon, message } from 'antd';
 import './style.less';
-import { uploaderProps } from '../../utils/upload';
-
+import { uploaderProps } from '@/utils/upload';
+import { getImgURL } from '@/utils/image';
 
 
 class ImageUpload extends React.Component {
@@ -65,7 +65,7 @@ class ImageUpload extends React.Component {
         onSuccess={this.handleUploadSucess}
       >
         {(this.state.imageUrl || value) ? (
-          <img src={this.state.imageUrl || value} alt="avatar" style={{ width: "100%" }} />
+          <img src={getImgURL(this.state.imageUrl) || getImgURL(value)} alt="avatar" style={{ width: "100%" }} />
         ) : (
             uploadButton
           )}

src/pages/course/Edit/index.jsx

@@ -1,259 +1,207 @@
-import React, { useState, useEffect } from 'react';
-import { UploadOutlined } from '@ant-design/icons';
-import { Input, Card, message, Radio, Select,Upload, Button } from 'antd';
-import { FormattedMessage } from 'umi-plugin-react/locale';
-import BuildSelect from '@/components/SelectButton/BuildSelectCourse'
-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'
-import { render } from 'react-dom';
+import React, { useEffect, useState, useCallback } from 'react';
+import { Button, Form, Select, Input, InputNumber, Radio, message, Card } from 'antd';
 import ImageUpload from '@/components/XForm/ImageUpload';
-//下拉
-function handleChange(value) {
-  console.log(`selected ${value}`);
-}
-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 roleId = props.location.query.roleId
-  const [userData, setUserData] = useState({})
-  const [tagData, setTagData] = useState([])
-  const [roleData, setRoleData] = useState([])
-  const [buildData, setBuildData] = useState([])
-  const [visible, setVisible] = useState(false)
-  //图文单选详情Radio
-  const [newsDetailType, setNewsOenType] = useState(1);
-
-  //视频组件
+import FileUpload from '@/components/XForm/FileUpload';
+import Wangedit from '@/components/Wangedit/Wangedit';
+import router from 'umi/router';
+import { fetch, apis } from '@/utils/request';
+
+const FormItem = Form.Item;
+const Option = Select.Option;
+const getCurriculumData = fetch(apis.course.searchCourse);
+const saveCurriculumData = fetch(apis.course.addCourse);
+const updateCurriculumData = fetch(apis.course.alterCourse);
+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 { form, history } = props;
+  const { getFieldDecorator, setFieldsValue, validateFields } = form;
+  const { curriculumId } = history.location.query || {}
   
-  const getVideo = {
-    action: '//jsonplaceholder.typicode.com/posts/',
-    listType: 'picture',
-    previewFile(file) {
-      console.log('Your upload file:', file);
-      // Your process logic. Here we just mock to the same file
-      return fetch('https://next.json-generator.com/api/json/get/4ytyBoLK8', {
-        method: 'POST',
-        body: file,
-      })
-        .then(res => res.json())
-        .then(({ thumbnail }) => thumbnail);
-    },
-  };
+  const formItemLayout = {
+    //布局
+    labelCol: { span: 6 },
+    wrapperCol: { span: 14 },
 
-  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 handleSubmit = (e) => {
+    e.preventDefault();
+    validateFields((err, values) => {
+      if (err) {
+        return;
+        //字符验证未填写---返回
+      }
+
+      setLoading(true);//loading开始
+
+      if (curriculumId) {
+        //如果有这个id拿。没有就，拿返回的curriculumId
+        updateCurriculumData({
+          data: {
+            ...values,
+            curriculumId
+          },
+          urlData: { id: curriculumId }
+        }).then(() => {
+          setLoading(false);
+          message.success('数据更新成功');
+          goBack()
+        }).catch((err) => {
+          setLoading(false);//loading消失
+          message.error(err.message || err);
+        })
+      } else {
+        saveCurriculumData({ data: values }).then(() => {
+          setLoading(false);
+          message.success('数据保存成功');
+          goBack()
+        }).catch((err) => {
+          setLoading(false);//loading消失
+          message.error(err.message || err);
+        })
+      }
+    });
   }
 
-  // 查询列表
-  const getUserData = (roleId) => {
-    request({ ...apis.staff.getTaUser, urlData: { id: roleId } }).then((data) => {
-      consultantChecked = data.isConsultant
-      setUserData(data)
-      setNewsOenType(Number(data.newsDetailType))
+  const getCourseData = useCallback(({ curriculumId }) => {//函数结果存 初始化运行一次，等待调用。
+    getCurriculumData({urlData: { id: curriculumId }}).then((res) => {
+      setFormData(res)
     })
-  }
-
-  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 (roleId) {
-      getUserData(roleId);
-    }
   }, [])
 
-  // const tagsChange = (value) => {
-  //   console.log(`selected ${value}`);
-  // }
-
-  const handleSubmit = val => {
-    if (roleId) {
-      request({ ...apis.course.alterCourse, urlData: { id: roleId }, data: val, }).then((data) => {
-        console.log(data, "tauser")
-        message.info("保存成功")
-        router.go(-1)
-      }).catch(error => {
-        // message.info(error.message)
-      })
-    } else {
-      request({ ...apis.course.addCourse, data: val, }).then((data) => {
-        console.log(data, "tauser")
-        message.info("保存成功")
-        router.go(-1)
-      }).catch(error => {
-        // message.info(error.message)
-      })
+  useEffect(() => {
+    if (curriculumId) {
+      getCourseData({curriculumId})//第一次渲染前//获取id
     }
-  }
-
-
-  //视频--------------------
- 
+  }, [curriculumId])//第二次id一样不执行
 
-
-
-
-  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的图片!');
+  useEffect(() => {
+    if (formData) {//1.form表单数据{2} 执行。无变更不执行
+      setFieldsValue(formData)
     }
-    return isLt100k;
-  }
-  const handleChange = (value) => {
-    console.log(`selected ${value}`);
-  }
-
-  const fields = [
-    {
-      label: '参与对象',
-      name: 'roleId',
-      render:<Select  initialValue={'0'} style={{ width: 200 }}>
-        <Option value='0'>置业顾问</Option>
-        <Option value='1'>经纪人</Option>
-        <Option value='2'>置业顾问&amp;经纪人</Option>
-      </Select> ,
-      rules: [
-        { required: true, message: '请输入参与对象' },
-      ],
-    },
-    {
-      label: '主图',
-      name: 'curriculumImg',
-      type: FieldTypes.ImageUploader,
-      extra: '建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情',
-      value: userData.curriculumImg,
-      // render:<ImageUpload/>,
-      // beforeUpload: (e) => photoBeforeUpload(e),
-      rules: [
-        { required: true, message: '主图' },
-      ]
-    },
-
-    {
-      label: '课程标题',
-      name: 'content',
-      render: <Input style={{width:'550px'}} ></Input>,
-      value: userData.usernew,
-    
-      // className={channels.inpuitTxt}
-      rules: [
-        { required: true, message: '请输入课程标题' },
-      ]
-    },
-    {
-      label: '简介',
-      name: 'remark',
-      render: <TextArea  style={{width:'550px'}}  rows='5' ></TextArea>,
-      value: userData.description,
-      rules: [
-        { required: true, message: '请输入简介' },
-      ]
+  }, [formData])//2.有变更跟的话
   
-      // className={channels.inpuitTxt}
-    },
-    {
-      label:'详情',
-      name:'newsOen',
-      render:(
-        <Radio.Group 
-        onChange={e=>{
-          setNewsOenType(e.target.value)
-        }} >
-          <Radio value='1'>图文</Radio>,
-          <Radio value='0'>视频</Radio>,
-        </Radio.Group>
-      ),
-      value:userData,
-      rules: [{ required: true, message: '请选择详情类型' }],
 
-    },
-    {
-      label: '详情内容',
-      name: 'newsDetail',
-      render: <Wangedit />,
-      hidden: newsDetailType == 0,
-      value: userData.newsDetail,
-      rules: [{ required: true, message: '请输入详情内容' }],
-    },
-    {
-      label:'视频详情',
-      name:'newVideo',
-      hidden: newsDetailType == 1,
-      value:userData.newVideo,
-      render: <Upload {...getVideo} maxCount='1' accept='.avi,.mp4,.wmv,.flv'>
-      <Button ><UploadOutlined />上传视频</Button>
-    </Upload>,
-      extra: '仅支AVI、MP4、WMV、FIV格式视频',
-    rules:[{required:true,message:'请上传视频详情'}]
-    },
-    {
-      label: '权重',
-      name: 'weight',
-      type: FieldTypes.Number,
-      render: <Input type="number" style={{ width: 150}} />,
-      value: '1',
-      help: '数字越大越靠前',
-    },
-  ]
+  return (
+  <Card>
+    <Form {...formItemLayout} onSubmit={handleSubmit}>
+      {/* 布局提交表单 */}
+      <FormItem label="参与对象">
+        {
+          getFieldDecorator('roleId', {
+            rules: [
+              { required: true, message: '请选择参与对象' }
+            ]
+          })(
+            <Select style={{width:'500px'}}>
+              <Option value="1">经纪人</Option>
+              <Option value="2">职业顾问</Option>
+              <Option value="0">职业顾问&amp;经纪人</Option>
+            </Select>
+          )
+        }
+      </FormItem>
+      <FormItem label="主图" help="建议尺寸：750px*600px，比例5:4，格式：jpg，用于：列表和详情">
+        {
+          getFieldDecorator('curriculumImg', {
+            rules: [
+              { required: true, message: '请上传主图' }
+            ]
+          })(
+            <ImageUpload  />
+          )
+        }
+      </FormItem>
+      <FormItem label="课程标题">
+        {
+          getFieldDecorator('name', {
+            rules: [
+              { required: true, message: '请输入课程标题' }
+            ]
+          })(
+            <Input style={{width:'500px'}} />
+          )
+        }
+      </FormItem>
+      <FormItem label="简介">
+        {
+          getFieldDecorator('remark', {
+            rules: [
+              { required: true, message: '请填写简介' }
+            ]
+          })(
+            <Input.TextArea  rows='5'  style={{width:'500px'}}/>
+          )
+        }
+      </FormItem>
+
+      <FormItem label="详情">
+        {
+          getFieldDecorator('type', {
+            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>
+          )
+        }
+      </FormItem>
+{/*       
+      <FormItem label="详情">
+        {
+        getFieldDecorator('type'),{
+          rules:[
+            {required:true,message:'请选择详情类型'}
+          ]
+
+        },
+        <Radio.Group value={contentType} onChange={e => setContentType(e.target.value)}>
+        <Radio value={1} type='0'>图文</Radio>
+        <Radio value={2}type='1'>视频</Radio>
+      </Radio.Group>
+        }
+
+      </FormItem> */}
+
+      <FormItem label="详情内容">
+        {
+          getFieldDecorator('content', {
+            rules: [
+              { required: true, message: '请输入详情内容' }
+            ]
+          })(
+            contentType == 1 ? <Wangedit style={{width:'500px'}}  /> : <FileUpload />
+          )
+        }
+      </FormItem>
+      <FormItem label="权重" >
+        {
+          getFieldDecorator('weight', {
+            rules: [{ required: true, message: '请设置权重' }]})(
+            <InputNumber min='0'   />
+          )
+        }
+      </FormItem>
+
+      <FormItem wrapperCol={{ span: 12, offset: 6 }}>
+        <Button loading={loading} type="primary" htmlType="submit">
+          保存
+        </Button>
+        <Button style={{marginLeft: '2em'}} onClick={goBack}>
+          取消
+        </Button>
+      </FormItem>
+    </Form>
+    </Card>
+  
+  )
+})
 
-  return <Card>
-            <XForm onChange={console.log} onSubmit={handleSubmit} fields={fields.filter(Boolean)} onCancel={() => router.go(-1)}></XForm>
-        </Card>
-}
-export default StaffEdit
+export default Form.create({})(CurriculumForm);

src/pages/course/list/index.jsx

@@ -1,5 +1,5 @@
 import React, { useMemo, useRef, useCallback, useState } from 'react';
-import { Button, Avatar,Radio ,Modal, message } from 'antd';
+import { Button, Avatar, Radio, Modal, message } from 'antd';
 import moment from 'moment';
 import apis from '@/services/apis';
 import request from '@/utils/request';
@@ -9,95 +9,65 @@ import BuildingSelect from '@/components/SelectButton/BuildSelect';
 import OperButton from '@/components/OperButton';
 import withActions from '@/components/ActionList';
 import { router } from 'umi';
+import { getImgURL } from '@/utils/image';
+import Navigate from '@/components/Navigate';
 
 
 export default props => {
   const ref = useRef();
-  const [visible, setVisible] = useState(false);
-  const [data, setData] = useState(false);
   const toEdit = useCallback(row => {
     //跳转到编辑页面
     router.push({
       pathname: '/course/Edit',
       query: {
-        userId: row?.userId || undefined,
+        curriculumId: row?.curriculumId || undefined,
       },
     });
   }, []);
 
 
-  const confirm = data => () => {
-    // console.log(data, "11111")
-    if (data.status === 1) {
-      if (data.isConsultant) {
-        request({
-          // ...apis.staff.check,
-          ...apis.course.alterCourse,
-          
-          params: {
-            content: data.content,
-            // roleId: data.consultantPersonId,
-            roleId: data.roleId,
-            createdBy: data.createdBy,
-          },
-        }).then(res => {
-          if (res.length > 0) {
-          } else {
-            const titleMessahe = data.isConsultant
-              ? '确认取消发布此课程吗？'
-              : '确认发布此课程吗？';
-            Modal.confirm({
-              title: titleMessahe,
-              okText: '确认',
-              cancelText: '取消',
-              onOk() {
-                // ...apis.staff.change,
-                request({ ...apis.course.alterCourse, urlData: { id: data.userId, type: 'off' } }).then(
-                  res => {
-                    message.info('操作成功');
-                    ref.current.reload();
-                  },
-                );
-              },
-            });
-          }
-        });
-      } else {
-        const titleMessahe = data.isConsultant
-          ? '确认发布此课程吗？'
-          : '确认取消发布此课程吗？';
-        Modal.confirm({
-          title: titleMessahe,
-          okText: '确认',
-          cancelText: '取消',
-          onOk() {
-            request({ ...apis.course.alterCourse, urlData: { id: data.userId, type: 'off' } }).then(
-              res => {
+  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();
-              },
-            );
-          },
-        });
-      }
-    } else {
-      Modal.confirm({
-        title: '确认发布此课程吗？',
-        okText: '确认',
-        cancelText: '取消',
-        onOk() {
-          request({ ...apis.course.alterCourse, urlData: { id: data.userId, type: 'on' } }).then(res => {
-            message.info('操作成功');
-            ref.current.reload();
+                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: 'content',
+      name: 'name',
       label: '课程标题',
       placeholder: '请输入课程标题',
     },
@@ -107,26 +77,30 @@ export default props => {
       placeholder: '请选阅读对象',
       type: 'select',
       options: [
-        { label: '全部', value: '' },
-        { label: '置业顾问', value: '0' },
         { label: '经纪人', value: '1' },
+        { label: '置业顾问', value: '2' },
+        { label: '置业顾问&经纪人', value: '0' },
+
+
       ],
     },
   ];
   const tableColumns = [
     {
       title: '课程标题',
-      dataIndex: 'content',
-      key: 'content',
+      dataIndex: 'name',
+      key: 'name',
       align: 'center',
+      render: (text, record) => <Navigate to={`/${record.curriculumUrl}`}>{text}</Navigate>
     },
     {
-      title:'课程主图',
-      dataIndex:'curriculumImg',
-      key:'curriculumImg',
-      align:'center',
-      render: (_,record) => <img src={record.curriculumImg} style={{ width: '165px', height: '104px' }} />,
-      // render:(record)=>(<img src={require(record)}/>)
+      title: '课程主图',
+      dataIndex: 'curriculumImg',
+      key: 'curriculumImg',
+      align: 'center',
+      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: '阅读人数',
@@ -139,9 +113,9 @@ export default props => {
       dataIndex: 'roleId',
       key: 'roleId',
       align: 'center',
-      render: text  => (text === '0' ? '置业顾问' :text === '1' ? '经纪人':'置业顾问&经纪人'),
+      render: text => (text === '2' ? '置业顾问' : text === '1' ? '经纪人' : '置业顾问&经纪人'),
     },
-    
+
     {
       //权重---
       title: '权重',
@@ -152,18 +126,16 @@ export default props => {
     },
     {
       title: '操作',
+      dataIndex: 'isPublish',
       key: 'isPublish',
       //isPublish
       align: 'center',
       render: withActions(
         (_, row) => [
-          <AuthButton name="admin.building.public" noRight={null}>
-            <OperButton onClick={confirm(row)}> {row.status === 1 ? '取消发布' : '发布'}</OperButton>
-          </AuthButton>,
+            <OperButton onClick={()=>confirm(row)}> {row.isPublish === 0 ? '发布' : '取消发布'}</OperButton>,
           <AuthButton name="admin.building.delete" noRight={null}>
-               <OperButton onClick>添加标签</OperButton>
-               <OperButton onClick={()=>toEdit(row)}>{row.status ===1? '编辑':''}</OperButton>
-               {/* <OperButton onClick={()=>toEdit(row)} >编辑</OperButton> */}
+            <OperButton>添加标签</OperButton>
+            <OperButton onClick={() => toEdit(row)}>{row.isPublish === 1 ? '编辑' : ''}</OperButton>
           </AuthButton>,
         ],
         { noMargin: true },
@@ -184,9 +156,7 @@ export default props => {
     <>
       <QueryTable
         ref={ref}
-        rowKey="curriculumId"
-        // api={apis.staff.taUser}
-        
+        rowKey='curriculumId'
         api={apis.course.Tablecourse}
         columns={tableColumns}
         searchFields={searchFields}

src/pages/staff/Organization/index.jsx

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Tree } from 'antd';
+import { Card, Tree } from 'antd';
 const { DirectoryTree } = Tree;
 
 // function Organization(props) {
@@ -134,7 +134,9 @@ class Treetest extends Component {
     render() {
         return (
           <div>
-            <DirectoryTree  treeData={treeData} />
+            <Card style={{width:'60%'}}>
+              <DirectoryTree  treeData={treeData} />
+            </Card>
           </div>
         )
     }

src/services/apis.js

@@ -730,19 +730,22 @@ export default {
       action: 'admin.taCustomImg.id.get',
     },
   },
-  //Course+
+  //Course课程+
   course:{
+    //查询
   Tablecourse:{
     method:'GET',
     url:`${prefix}/curriculum`,
     action: 'admin.curriculum.get',
   },
+  //根据ID查询
     searchCourse:{
       method:'GET',
       url:`${prefix}/curriculum/:id`,
       // action:'admin.curriculum.id.get'
-      action: 'admin.taCustomImg.id.get',
+      action: 'admin.curriculum.id.get',
     },
+    //新增
     addCourse:{
       method:'POST',
       // POST /api/admin/curriculum
@@ -754,7 +757,13 @@ export default {
       method:'PUT',
       url:`${prefix}/curriculum/:id`,
       action:'admin.curriculum.id.put'
-    }
+    },
+    //deleteCourse
+    deleteCourse: {
+      url: `${prefix}/curriculum/:id`,
+      method: 'DELETE',
+      action: 'admin.curriculum.id.delete',
+    },
   },
   system: {
     taPolicy: {

src/utils/image.js

@@ -0,0 +1,7 @@
+
+export function getImgURL(img) {
+    if (!img) return undefined;
+
+    const isProd = process.env.NODE_ENV === 'production'
+    return isProd ? img : `http://81.69.196.8:8567${img}`;
+}