Merge branch 'bug'

# Conflicts:
#	src/components/search/searchHead.js

src/components/search/searchHead.js

@@ -38,9 +38,8 @@ class SearchHead extends PureComponent {
     render() {
         const { isFocus } = this.state;
         const cls = classnames('submit-btn', {'submit-btn--active': isFocus})
-        // console.log(isFocus);
         return (
-            <div className="search-head">
+            <div className="search-head" style={this.props.style} ref={this.props.forwardedRef}>
 
                 <div className="left" onClick={this.returnPage}>
                     <i className="iconfont iconiconfront-68"/>
@@ -57,6 +56,7 @@ class SearchHead extends PureComponent {
                         placeholder="搜索课程"
                         onFocus={() => this.changeFontColor(true)}
                         onBlur={() => this.changeFontColor(false)}
+                        onSubmit={ this.search }
                     />
                 </div>
                 <div className="right right-btn" onClick={this.search}>