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

src/pages/h5SampleManager/h5Sample/components/ContactInfo.jsx

                   <div className={styles.right}>{this.props.type.address}</div>
                 </div>}
               </div>
+              {this.props.type.avatar != null &&
               <div style={{ textAlign: 'center' }}>
                 <img src={this.props.type.wxCardImg} height="80px" width="80px" />
                 <p style={{ margin: ' 0px', fontSize: '0.096rem', color: '#666' }}>扫码添加微信好友</p>
                 <p sstyle={{ margin: ' 0px', fontSize: '0.096rem', color: '#666' }}>备注H5活动咨询</p>
-              </div>
+              </div>}
             </div>
           </Form>
         </Col>

src/pages/h5SampleManager/h5Sample/detail.jsx

         <Form.Item label="样例名">
           <span>{demandData.sampleName}</span>
         </Form.Item>
-        <Form.Item label="样例体验链接">
+        {demandData.sampleTryLink != '' && demandData.sampleTryLink != null && <Form.Item label="样例体验链接">
           <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>
-        <Form.Item label="样例体验小程序码/二维码" help="请使用微信扫码查看样例体验">
+        </Form.Item>}
+        {demandData.sampleTryCode != '' && demandData.sampleTryCode != null &&<Form.Item label="样例体验小程序码/二维码" help="请使用微信扫码查看样例体验">
             <img src={demandData.sampleTryCode} height="100px" width="120px" />
-        </Form.Item>
-        <Form.Item label="联系人">
+        </Form.Item>}
+        {demandData.taContactList != null &&demandData.taContactList != ''   && <Form.Item label="联系人">
             <span style={{color:'rgba(0, 0, 0, 0.45)', fontSize:'14px'}}>若您想在您的小程序举办类似活动，请联系以下联系人咨询，或直接点击底部的 提交需求 按钮下单，下单后与联系人沟通定制活动</span>
             <DragableUploadImageList sampleId={sampleId}></DragableUploadImageList>
-        </Form.Item>
+        </Form.Item>}
         <Form.Item label="样例内容">
             {demandData.sampleType === 'rich' ? getFieldDecorator('sampleContent')(<Wangedit contenteditable={false}/>) : getFieldDecorator('sampleContentLink')(<a href={demandData.sampleContentLink} target="_blank">{demandData.sampleContentLink}</a>)}
         </Form.Item>