Merge branch 'master' of http://git.ycjcjy.com/estateagents/pc-channel

src/pages/sample/demand/edit.jsx

@@ -63,9 +63,8 @@ const header = props => {
       {
         label: '下单时间',
         name: 'createDate',
-        type: FieldTypes.DatePicker ,
-        value: data.createDate != null ? moment(data.createDate, 'YYYY-MM-DD') : null,
-        props: {disabled: true}
+        value: data.createDate,
+        render: <span>{`${moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
       },
       {
         label: '需求单状态',
@@ -87,9 +86,8 @@ const header = props => {
       {
         label: '最后修改时间',
         name: 'updateDate',
-        type: FieldTypes.DatePicker ,
-        value: data.updateDate != null ? moment(data.updateDate, 'YYYY-MM-DD') : null,
-        props: {disabled: true}
+        value: data.updateDate,
+        render: <span>{`${moment(data.updateDate).format('YYYY-MM-DD HH:mm:ss')}`}</span>
       },
       {
         label: '需求描述',

src/pages/sample/h5/components/H5Card.jsx

@@ -56,14 +56,14 @@ const H5Card = props => {
           padding: '0.1rem'
         }}
         // style={{ width: 480,height: 450,marginTop: 50,position: "relative" }}
-        cover={<img  width="100%" style={{height:'1.3rem'}} alt="example" onClick={toEdit} src={h5Data.coverImg} />}
+        cover={<img width="100%" style={{ height: '1.3rem' }} alt="example" onClick={toEdit} src={h5Data.coverImg} />}
         extra={<a onClick={deleteSample}>删除</a>}
         title={h5Data.status == 1 ? '已发布' : h5Data.status == 0 ? '未发布' : ''}
       >
         <Meta onClick={toEdit} title={h5Data.sampleName} />
-        <div style={{ position: "absolute", bottom: "50px", right: "20px", margin: '20px 0' }}>
+        <div style={{ position: "absolute", bottom: "50px", right: "0px", margin: '20px', }}>
           {(h5Data.tags || []).map((x, i) => {
-            return <Tag color={colerArr[i]}>{x}</Tag>
+            return <Tag style={{marginTop:'10px'}} color={colerArr[i]}>{x}</Tag>
           })}
         </div>
       </Card>

src/pages/sample/h5/components/SelectContact.jsx

@@ -99,7 +99,6 @@ const SelectContact = props => {
       key: 'drainageId',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
     },
     {
       title: '手机号',
@@ -107,7 +106,6 @@ const SelectContact = props => {
       key: 'drainageId',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
     },
     {
       title: '内部岗位',
@@ -115,7 +113,6 @@ const SelectContact = props => {
       key: 'drainageId',
       align: 'center',
       ellipsis: true,
-      render: text => <a>{text}</a>,
     },
     {
       title: '操作',

src/pages/sample/h5/edit.jsx

@@ -124,7 +124,7 @@ const header = props => {
             </Select>)}
           </Form.Item>
           <Form.Item label="权重" help="数值越大越靠前">
-            {getFieldDecorator('orderNo')(<InputNumber placeholder="权重越大，在列表中的排序越靠前" />)}
+            {getFieldDecorator('orderNo')(<InputNumber />)}
           </Form.Item>
           <Form.Item label="标签" help="标签长度6个字，最多3个标签">
             {getFieldDecorator('tags')(

src/pages/sample/h5/index.jsx

@@ -18,7 +18,7 @@ function header(props) {
   const [ data, setData ] = useState({})
 
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 10 });
+    getList({ pageNum: 1, pageSize: 12 });
   },[])
 
   // 查询列表
@@ -45,13 +45,13 @@ function header(props) {
           submitValue.startCreateDate = null
           submitValue.endCreateDate = null
         }
-        getList({ pageNum: 1, pageSize: 10, ...submitValue })
+        getList({ pageNum: 1, pageSize: 12, ...submitValue })
       }
     });
   }
 
   const changePageNum = (pageNumber) => {
-    getList({ pageNum: pageNumber, pageSize: 10 })
+    getList({ pageNum: pageNumber, pageSize: 12 })
   }
 
 
@@ -76,7 +76,7 @@ function header(props) {
         if(row.status === 0){
           request({ ...apis.channel.put, urlData: { id: newsId }, data: { ...row, status: 1 } }).then((data) => {
             message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10 });
+            getList({ pageNum: 1, pageSize: 12 });
           }).catch((err) => {
             console.log(err)
             message.info(err.msg || err.message)
@@ -84,7 +84,7 @@ function header(props) {
         }else{
           request({ ...apis.channel.put, urlData: { id: newsId }, data: { ...row, status: 0 } }).then((data) => {
             message.info('操作成功！')
-            getList({ pageNum: 1, pageSize: 10 });
+            getList({ pageNum: 1, pageSize: 12 });
           }).catch((err) => {
             console.log(err)
             message.info(err.msg || err.message)
@@ -97,7 +97,7 @@ function header(props) {
    
   function handleReset() {
     props.form.resetFields();
-    getList({ pageNum: 1, pageSize: 10 })
+    getList({ pageNum: 1, pageSize: 12 })
   }
 
   const { getFieldDecorator } = props.form