bug fix

config/routes.js

@@ -623,6 +623,52 @@ export default [
               },
             ],
           },
+          {
+            path: '/h5SampleManager',
+            name: 'H5样例管理',
+            component: '../layouts/BlankLayout',
+            routes: [
+              {
+                path: '/h5SampleManager/h5Sample/list',
+                name: 'H5样例',
+                component: './h5SampleManager/h5Sample/list',
+              },
+              {
+                path: '/h5SampleManager/h5Sample/detail',
+                name: '详情',
+                hideInMenu: true,
+                component: './h5SampleManager/h5Sample/detail',
+              },
+              {
+                path: '/h5SampleManager/h5Sample/add',
+                name: '提交需求',
+                hideInMenu: true,
+                component: './h5SampleManager/h5Sample/add',
+              },
+              {
+                path: '/h5SampleManager/h5Demand/list',
+                name: 'H5需求单',
+                component: './h5SampleManager/h5Demand/list',
+              },
+              // {
+              //   path: '/drainageSampleManager/drainageDemand/add',
+              //   name: '新增需求单',
+              //   component: './drainageSampleManager/drainageDemand/add',
+              // },
+              {
+                path: '/h5SampleManager/h5Demand/detail',
+                name: '详情',
+                hideInMenu: true,
+                component: './h5SampleManager/h5Demand/detail',
+              },
+              {
+                path: '/h5SampleManager/h5Demand/edit',
+                name: '修改需求',
+                hideInMenu: true,
+                component: './h5SampleManager/h5Demand/edit',
+              },
+            ],
+          },
           // {
           //   path: '/miniapp',
           //   name: '小程序管理',

src/components/Wangedit/Wangedit.jsx

@@ -11,6 +11,7 @@ class Wangedit extends React.Component {
     super(props, context);
     this.state = {
       html: undefined,
+      contenteditable: props.contenteditable == false ? false : true
     }
     this.editor = undefined;
   }
@@ -77,6 +78,7 @@ class Wangedit extends React.Component {
     }
 
     this.editor.create()
+    this.editor.$textElem.attr('contenteditable',this.state.contenteditable);
     this.editor.customConfig.uploadImgShowBase64 = true
     this.editor.txt.html(this.props.value)
   }

src/pages/h5SampleManager/h5Demand/detail.jsx

@@ -0,0 +1,117 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker, InputNumber, Checkbox, Row, Col} 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 apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+import Wangedit from '../../../components/Wangedit/Wangedit'
+import TextArea from 'antd/lib/input/TextArea';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+
+const header = props => {
+  const demandId  = props.location.query.id;
+  const [demandData, setDemandData] = useState({})
+
+  useEffect(() => {
+    getDemandData(demandId);
+  },[])
+
+  // 查询列表
+  const getDemandData = (demandId) => {
+      request({ ...apis.taH5SampleManager.taH5DemandById, urlData: {id: demandId} }).then((data) => {
+          setDemandData(data)
+          props.form.setFieldsValue(data)
+      })
+  }
+
+  function handleSubmit (e) {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err){
+        console.log(values,'valuesvaluesvalues')
+        if (values.payType == 'onLine' && (values.payDescriptionOnline == '' || values.payDescriptionOnline == null)){
+            message.info("请填写线上缴费说明");
+            return;
+        }
+        if (values.payType == 'offLine' && (values.payDescriptionOffline == '' || values.payDescriptionOffline == null)){
+          message.info("请填写线下缴费说明");
+          return;
+        }
+        if ((values.payType == 'onLine' && (values.payDescriptionOnline == '' || values.payDescriptionOnline == null)) ||
+            (values.payType == 'offLine' && (values.payDescriptionOffline == '' || values.payDescriptionOffline == null))){
+          message.info("请填写缴费说明");
+          return;
+        }
+        
+        let {liveTime, ...submitValue} = values
+        if (values.raiseStartTime > values.raiseEndTime){
+          message.info("认筹结束时间大于认筹开始时间")
+          return;
+        }
+        submitValue.raiseStartTime = moment(submitValue.raiseStartTime).format('YYYY-MM-DD HH:mm:ss')
+        submitValue.raiseEndTime = moment(submitValue.raiseEndTime).format('YYYY-MM-DD HH:mm:ss')
+        submitValue.payType = values.payType.toString();
+        submitValue.raisePrice = submitValue.raisePrice * 100;
+        request({ ...apis.house.addRaise, data: { ...submitValue },}).then((data) => {
+          message.info("保存成功")
+          router.push({
+            pathname: '/house/raise/list',
+          });
+        }).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('sampleName')(<Input disabled={true}/>)} */}
+          <span>{demandData.sampleName}</span>
+        </Form.Item>
+        <Form.Item label="下单人">
+          {/* {getFieldDecorator('orderer')(<Input disabled={true}/>)} */}
+          <span>{demandData.orderer}</span>
+        </Form.Item>
+        <Form.Item label="联系方式">
+        <span>{demandData.phone}</span>
+          {/* {getFieldDecorator('phone')(<Input disabled={true}/>)} */}
+        </Form.Item>
+        <Form.Item label="下单时间">
+        <span>{`${moment(demandData.createDate).format('YYYY-MM-DD HH:mm')}`}</span>
+          {/* {getFieldDecorator('createDate')} */}
+        </Form.Item>
+        <Form.Item label="更新时间">
+        <span>{`${moment(demandData.updateDate).format('YYYY-MM-DD HH:mm')}`}</span>
+          {/* {getFieldDecorator('createDate')} */}
+        </Form.Item>
+        <Form.Item label="需求单状态">
+        <span>{demandData.demandStatus === 1 ? "已提交": demandData.demandStatus === 2 ?"处理中":demandData.demandStatus === 3?"已交付":"作废"}</span>
+          {/* {getFieldDecorator('demandStatus')(<Input disabled={true}/>)} */}
+        </Form.Item>
+        <Form.Item label="需求描述">
+          {getFieldDecorator('demandContent')(<Wangedit contenteditable={false}/>)}
+        </Form.Item>
+        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
+          <Button type="primary" htmlType="submit"style={{marginRight:'20px'}}>
+            修改需求
+          </Button>
+        </Form.Item>
+      </Form>
+    </>
+  )
+}
+
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/pages/h5SampleManager/h5Demand/list.jsx

@@ -0,0 +1,237 @@
+import React, { useState, useEffect } from 'react';
+import { Form, Input, Button, Icon, Select, message, Table, Divider, Tag, Pagination, Modal, DatePicker } from 'antd';
+import { FormattedMessage } from 'umi-plugin-react/locale';
+import styles from '../../style/GoodsList.less';
+import router from 'umi/router';
+import moment from 'moment';
+import SelectCity from '../../../components/SelectButton/CitySelect'
+import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import apis from '../../../services/apis';
+import request from '../../../utils/request';
+import AuthButton from '@/components/AuthButton';
+
+const { Option } = Select;
+const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
+
+const header = props => {
+  const [data, setData] = useState({})
+  const [demend, setDemend] = useState({})
+
+  useEffect(() => {
+    getList({ pageNum: 1, pageSize: 10 });
+  }, [])
+
+  // 查询列表
+  const getList = (params) => {
+    console.log(params);
+    request({ ...apis.taH5SampleManager.tataH5Demand, params: { ...params } }).then((data) => {
+      console.log(data)
+      setData(data)
+    })
+  }
+
+
+  // 跳转到拼团活动新增
+  const toEditActivity = (groupActivityId) => () => {
+    router.push({
+      pathname: '/activity/groupActivity/editGroupActivity',
+      query: {
+        groupActivityId
+      },
+    });
+  }
+
+  const getActivityDetail = (groupActivityId) => () => {
+    router.push({
+      pathname: '/activity/groupActivity/detailActivity',
+      query: {
+        groupActivityId,
+      },
+    });
+  } 
+
+  const getJoinPeople = (groupActivityId) => () => {
+    router.push({
+      pathname: '/activity/groupActivity/helpRecord',
+      query: {
+          groupActivityId,
+      },
+    });
+  } 
+
+  // 跳转到编辑
+  const toDetail = rowData => () => {
+    if(rowData) {
+      router.push({
+      pathname: '/h5SampleManager/h5Demand/detail',
+      query: {
+        id: rowData.demandId,
+      },
+    });
+      return
+    }
+  }
+
+  /**
+   *
+   *
+   * @param {*} props
+   * @returns
+   */
+
+  const columns = [
+    {
+      title: '样例名',
+      dataIndex: 'sampleName',
+      key: 'sampleName',
+      align: 'center',
+    },
+    {
+      title: '下单人',
+      dataIndex: 'orderer',
+      key: 'orderer',
+      align: 'center',
+      
+    },
+    {
+      title: '联系方式',
+      dataIndex: 'phone',
+      key: 'phone',
+      align: 'center',
+    },
+    {
+      title: '下单时间',
+      dataIndex: 'createDate',
+      key: 'createDate',
+      align: 'center',
+      render: (x, row) => <><span>{`${moment(row.startTime).format('YYYY-MM-DD HH:mm:ss')} —— ${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`}</span></>
+    },
+    {
+      title: '需求单状态',
+      dataIndex: 'demandStatus',
+      key: 'demandStatus',
+      align: 'center',
+      render: (text, records) => {
+        if (records.demandStatus === 1) { return '已提交' }
+        if (records.demandStatus === 2) { return '处理中' }
+        if (records.demandStatus === 3) { return '已交付' }
+        if (records.demandStatus === 4) { return '作废' }
+      },
+    },
+    {
+      title: '操作',
+      dataIndex: 'handle',
+      key: 'handle',
+      align: 'center',
+      render: (text, record) => (
+        <AuthButton name="admin.raise.detail.get" noRight={null}>
+          <a style={{ color: '#66B3FF' }} onClick={toDetail(record)} >查看详情</a>
+        </AuthButton>
+      ),
+    },
+  ];
+  
+  const rowSelection = {
+    onChange: (selectedRowKeys, selectedRows) => {
+      console.log('selectedRowKeys:', selectedRowKeys, 'selectedRows: ', selectedRows);
+      setDemend(selectedRows)
+    },
+  };
+
+  const changePageNum = pageNumber => {
+    getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
+  }
+
+  // 提交事件
+  const handleSubmit = (e, props) => {
+    e.preventDefault();
+    props.form.validateFields((err, values) => {
+      if (!err) {
+        console.log('提交数据: ', values)
+        getList({ pageNum: 1, pageSize: 10, ...values })
+      }
+    });
+  }
+
+  //重置搜索
+  function handleReset () {
+    props.form.resetFields();
+    getList({ pageNum: 1, pageSize: 10 })
+  }
+
+
+  const { getFieldDecorator } = props.form
+  return (
+
+    <>
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
+        <Form.Item>
+          {getFieldDecorator('sampleName')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="样例名"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('orderer')(
+            <Input
+            prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+            placeholder="下单人"
+          />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('phone')(
+            <Input
+              prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
+              placeholder="联系方式"
+            />,
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('createDate')(
+            <RangePicker placeholder={['开始时间','结束时间']}/>
+          )}
+        </Form.Item>
+        <Form.Item>
+          {getFieldDecorator('createDate')(
+            <Select style={{ width: '180px' }} placeholder="需求单状态">
+                <option value="">全部</option>
+                <option value="1">已提交</option>
+                <option value="2">处理中</option>
+                <option value="3">已交付</option>
+                <option value="4">作废</option>
+            </Select>
+          )}
+        </Form.Item>
+        <Form.Item>
+            <AuthButton name="admin.taShareActivity.search" noRight={null}>
+                <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                    搜索
+                </Button>
+            </AuthButton>
+            <AuthButton name="admin.taShareActivity.search" noRight={null}>
+                <Button style={{ marginLeft: 8 }} onClick={handleReset}>
+                        重置
+                </Button>
+            </AuthButton>
+        </Form.Item>
+      </Form>
+      <AuthButton name="admin.taShareActivity.post" noRight={null}>
+        <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
+      </AuthButton>
+      <AuthButton name="admin.taShareActivity.post" noRight={null}>
+        <Button type="primary" className={styles.addBtn} onClick={toEditActivity()} style={{marginLeft:'30px'}}>删除</Button>
+      </AuthButton>
+      <Table rowSelection={rowSelection}
+        style={{marginTop:'30px'}} 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={changePageNum} current={data.current} />
+      </div>
+    </>
+  )
+}
+const WrappedHeader = Form.create({ name: 'header' })(header);
+
+export default WrappedHeader

src/services/apis.js

@@ -1419,5 +1419,17 @@ export default {
     action: 'admin.taLiveActivity.get',
   },
  },
+ taH5SampleManager: {
+  tataH5Demand:{
+    url: `${prefix}/taH5Demand`,
+    method: 'GET',
+    action: 'admin.taH5Demand.get',
+  },
+  taH5DemandById:{
+    url: `${prefix}/taH5Demand/:id`,
+    method: 'GET',
+    action: 'admin.taH5Demand.get',
+  },
+ },
  
 }