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

src/pages/h5SampleManager/h5Demand/detail.jsx

@@ -43,14 +43,17 @@ const header = props => {
     }
   }
 
-  function sampleDetail(e){
-    console.log(e,'eeeeeeeeeee')
-    router.push({
-      pathname: '/h5SampleManager/h5Sample/detail',
-      query: {
-        id: e,
-      },
-    });
+  function sampleDetail(sampleId){
+    request({ ...apis.taH5SampleManager.taH5SampleById, urlData: { id: sampleId } }).then((data) => {
+      router.push({
+        pathname: '/h5SampleManager/h5Sample/detail',
+        query: {
+          id: sampleId,
+        },
+      });
+    }).catch(err => {
+      message.info("该H5样例已取消发布或已删除")
+    })
   }
 
   function handleSubmit (e) {

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -37,16 +37,23 @@ const header = props => {
 
   // 跳转到编辑
   const toDetail = rowData => () => {
-    if (rowData) {
-      router.push({
-        pathname: '/h5SampleManager/h5Sample/add',
-        query: {
-          id: sampleId,
-          sampleName: demandData.sampleName
-        },
-      });
-      return
-    }
+
+    request({ ...apis.taH5SampleManager.taH5SampleById, urlData: { id: sampleId } }).then((data) => {
+      if (rowData) {
+        router.push({
+          pathname: '/h5SampleManager/h5Sample/add',
+          query: {
+            id: sampleId,
+            sampleName: demandData.sampleName
+          },
+        });
+        return
+      }
+    }).catch(err => {
+      message.info("该H5样例已取消发布或已删除")
+    })
+
+    
   }
   const toCancel = () => {
     router.go(-1)
@@ -96,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>)}
+          <span style={{ color: 'rgba(0, 0, 0, 0.45)', fontSize: '14px' }}>若您想在您的小程序举办类似活动，请联系以下联系人咨询，或直接点击底部的 提交需求 按钮下单，下单后与联系人沟通定制活动</span><br/>
+          {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' }}>