diff --git a/package.json b/package.json
index 51dcdcb..1c22271 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "glass-player",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "private": true,
-  "proxy": "http://node.dengtongyu.com",
+  "proxy": "https://node.dengtongyu.com",
   "homepage":"/pages/glassplayer/",
   "dependencies": {
     "antd": "^3.2.3",
diff --git a/src/components/SearchBar.js b/src/components/SearchBar.js
index f4f0863..21b651c 100644
--- a/src/components/SearchBar.js
+++ b/src/components/SearchBar.js
@@ -11,7 +11,7 @@ class SearchBar extends Component {
         value:''
     }
 
-    onClickBtn = () => {
+    searchKeyword = () => {
         if(this.state.value) {
             DataStore.keyword = this.state.value;
             DataStore.page = 1;
@@ -23,6 +23,16 @@ class SearchBar extends Component {
         }
     }
 
+    onClickBtn = (event) => {
+        this.searchKeyword();
+    }
+
+    onKeyUp = (event) => {
+        if(event.keyCode === 13 || event.keyCode === 108) {
+            this.searchKeyword();
+        }
+    }
+
     onTextChange = (event) => {
         this.setState({
             value: event.target.value
@@ -35,7 +45,7 @@ class SearchBar extends Component {
                 <div className="search-input">
                     <input type="text" placeholder="搜索歌曲或歌手"
                     value={this.state.value} 
-                    onChange={this.onTextChange} />
+                    onChange={this.onTextChange} onKeyUp={this.onKeyUp} />
                 </div>
                 <div className="search-btn">
                     <button className="iconfont icon-search" 
diff --git a/src/components/SongList.js b/src/components/SongList.js
index 44b4771..04a349d 100644
--- a/src/components/SongList.js
+++ b/src/components/SongList.js
@@ -49,7 +49,7 @@ class SongList extends Component {
 
             if(DataStore.listType === 0 && list.length >= DataStore.pageSize) {
                 listItems.push(
-                    <div className="more-box">
+                    <div className="more-box" key={'morebutton'}>
                         <a onClick={this.onClickMore}>点击加载更多</a>
                     </div>
                 );