Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

# Conflicts:
#	src/pages/activity/drainage/DrainageList.jsx

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -103,7 +103,8 @@ const header = props => {
           <DragableUploadImageList sampleId={sampleId}></DragableUploadImageList>
         </Form.Item>}
         <Form.Item label="样例内容">
-          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<Wangedit contenteditable={false} />) : getFieldDecorator('sampleContentLink')(<a style={{ color: "blue" }} href={demandData.sampleContentLink} target="_blank" >{demandData.sampleContentLink}</a>)}
+          {demandData.sampleType === 'link' && <div><span style={{ color: 'rgba(0, 0, 0, 0.45)', fontSize: '14px' }}>点击链接查看内容</span><br/></div>}
+          {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<div dangerouslySetInnerHTML={{ __html: demandData.sampleContent}}></div>) : getFieldDecorator('sampleContentLink')(<a style={{ color: "blue" }} href={demandData.sampleContentLink} target="_blank" >{demandData.sampleContentLink}</a>)}
         </Form.Item>
         <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
           <div style={{ margin: '0.16rem 0 0.06rem' }}>

src/pages/h5SampleManager/h5Sample/list.jsx

@@ -60,14 +60,11 @@ function CartBody(props) {
       </div>
 
       }
-      <img className={Styles.cover} style={{ backgroundImage: `url(` + data.coverImg + `)` }}   ></img>
-      <div style={{ padding: '0.05rem 0.096rem' }}>
-        <p className={Styles.cardText}>
-          {/* <span className={Styles.title}>样例名</span> */}
-          <span style={{ textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>{data.sampleName}</span>
-        </p>
-
-      </div>
+      <img className={Styles.cover} style={{ backgroundImage: `url('` + data.coverImg + `')` }}   ></img>
+      <p className={Styles.cardText} style={{ padding: '0.05rem 0.096rem' }}>
+        {/* <span className={Styles.title}>样例名</span> */}
+        <span style={{ textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>{data.sampleName}</span>
+      </p>
     </Card>
   )
 }

src/pages/h5SampleManager/h5Sample/style.less

@@ -77,7 +77,7 @@
 .cover{
   width: 100%;
 
-  padding-bottom: 56.25%;
+  padding-bottom: 66.8%;
   background-size: 100% 100% !important;
  
   border-radius: 12px 12px 0 0;