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

src/pages/h5SampleManager/h5Sample/detail.jsx

@@ -93,7 +93,7 @@ const header = props => {
           <span>{demandData.sampleName}</span>
         </Form.Item>
         {demandData.sampleTryLink != '' && demandData.sampleTryLink != null && <Form.Item label="样例体验链接" help="请复制发送到手机，用手机微信打开，PC端打开样式比例与手机端不同，以手机端为准">
-          <span>{demandData.sampleTryLink}</span><span style={{marginLeft:'10px'}}><a onClick={(e) => copyLink(demandData.sampleTryLink)} style={{ color: 'orange' }}> <img src={copyImg} height="16px" width="14px" /> 复制链接</a></span>
+          <span>{demandData.sampleTryLink}</span><span style={{ marginLeft: '10px' }}><a onClick={(e) => copyLink(demandData.sampleTryLink)} style={{ color: 'orange' }}> <img src={copyImg} height="16px" width="14px" /> 复制链接</a></span>
         </Form.Item>}
         {demandData.sampleTryCode != '' && demandData.sampleTryCode != null && <Form.Item label="样例体验小程序码/二维码" help="请使用微信扫码查看样例体验">
           <img src={demandData.sampleTryCode} height="100px" width="120px" />
@@ -103,7 +103,7 @@ 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 === 'rich' ? getFieldDecorator('sampleContent')(<Wangedit contenteditable={false} />) : 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' }}>
@@ -115,7 +115,7 @@ const header = props => {
           </Button>
           </div>
         </Form.Item>
-        <div style={{ position: 'absolute', right: '0', bottom: '-16px' }}>
+        <div style={{ position: 'fixed', right: '0.4rem', bottom: '6%' }}>
           <div style={{ display: 'flex', alignItems: 'center', minWidth: '1.1rem', justifyContent: 'space-between' }}>我想办类似活动 <span style={{ color: '#EF273A', margin: '0 0.1rem' }}>>></span>
             <Button type="primary" onClick={toDetail(sampleId)} >
               提交需求

src/pages/swiper/style.less

@@ -9,10 +9,10 @@
 }
 
 .content{
-    width: 36vw;
+    width: 32vw;
     min-width: 757px;
     height: 21.3vw;
-    min-height: 435.6px;
+    min-height: 504px;
     position: absolute;
     left: 50%;
     top: 110px;
@@ -55,18 +55,18 @@
     }
 }
 .carousel {
-    width: 36vw;
+    width: 32vw;
     min-width: 757px;
     height: 21.3vw;
-    min-height: 435.6px;
+    min-height: 504px;
     border-radius: 10px;
     // overflow: hidden;
     
     .carouselItem{
-        width: 36vw;
+        width: 32vw;
         min-width: 757px;
         height: 21.3vw;
-        min-height: 435.6px;
+        min-height: 504px;
         position: relative;
         display: inline-block;
         .title{