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

src/pages/h5SampleManager/h5Sample/add.jsx

             {
               required: true,
               message: '请填写正确的联系方式',
-              max:11,
-              min:11,
-              pattern: new RegExp('^[0-9]*$'),
+              // max:11,
+              // min:11,
+              pattern: new RegExp('^1[0-9]{10}$'),
             },
           ],
         })(<Input/>)}

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

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