Merge remote-tracking branch 'origin/dev/byll' into dev/new1

src/components/DiagResultSearch/index.jsx

@@ -99,7 +99,7 @@ class DiagResultSearch extends Component {
                         onPropertyChange={(e)=>this.handleInput(e.target.value)} 
                         />
                     <img  className={style['search-img']} src={search} alt="搜索"/>
-                     <img className={style['search-close']} onClick={this.clearInput} style={showClose ? '': {display: 'none'}} src={close} alt=""/>
+                    <img className={style['search-close']} onClick={this.clearInput} style={showClose ? '': {display: 'none'}} src={close} alt=""/>
                 </div>
                 <div className={style['search-result']}>
                     {