diff --git a/src/components/player/player.js b/src/components/player/player.js
index f920cdb..b89bf5c 100644
--- a/src/components/player/player.js
+++ b/src/components/player/player.js
@@ -90,10 +90,11 @@ class Player extends React.Component{
         currentLineNum: 0
       })
     }
-    this.refs.audio.src = nextSong.url
+    let audio = this.refs.audio
+    audio.src = nextSong.url
     //
     setTimeout(() => {
-      this.refs.audio.play()
+      audio.play()
     }, 20)
     clearTimeout(this.timer)
     this.timer = setTimeout(() => {
diff --git a/src/components/user/user.js b/src/components/user/user.js
index 641e01e..fbf3a17 100644
--- a/src/components/user/user.js
+++ b/src/components/user/user.js
@@ -1,13 +1,16 @@
 import React, {Component} from 'react'
 import {connect} from 'react-redux'
 
+import {CSSTransition} from 'react-transition-group'
+
 import Switch from 'base/switch/switch'
 import Scroll from 'base/scroll/scroll'
 import SongList from 'base/songlist/songlist'
+import NoResult from 'base/noResult/noResult';
 
 import {Song} from 'common/js/song'
 
-import {insertSong} from 'store/action'
+import {insertSong, randomPlay} from 'store/action'
 
 import './user.styl'
 
@@ -15,17 +18,35 @@ class User extends Component{
   constructor(props) {
     super(props)
     this.state ={
+      showFlag: false,
       switches: [
         {
-          name: '最近播放'
+          name: '我喜欢的'
         },
         {
-          name: '搜索历史'
+          name: '最近听的'
         }
       ],
       currentIndex: 0
     }
     this.selectSong = this.selectSong.bind(this)
+    this.back = this.back.bind(this)
+    this.switch = this.switch.bind(this)
+    this.random = this.random.bind(this)
+  }
+
+  componentDidMount() {
+    this.setState({
+      showFlag: true
+    })
+  }
+
+  shouldComponentUpdate(nextProps, nextState) {
+    const bottom = nextProps.player.playList.length > 0 ? '60px' : 0
+    this.refs.listWrapper.style.bottom = bottom
+    this.refs.favoriteList && this.refs.favoriteList.refresh()
+    this.refs.playList && this.refs.playList.refresh()
+    return true
   }
 
   switch(i) {
@@ -38,50 +59,75 @@ class User extends Component{
     this.props.insertSong(new Song(v))
   }
 
+  back() {
+    this.props.history.goBack()
+  }
+
+  random() {
+    let list = this.state.currentIndex === 0? this.props.favoriteList : this.props.playHistory
+    if (list.length === 0) {
+      return
+    }
+    list = list.map(v => (new Song(v)))
+    this.props.randomPlay({list})
+  }
+
   render() {
+    const noResultDesc = this.state.currentIndex === 0 ? '暂无收藏歌曲' : '你还没有听过歌曲'
+    const showNoResult = this.state.currentIndex === 0 ? !this.props.favoriteList.length : !this.props.playHistory.length
     return(
-      <div className={"user-center" + (this.props.showUserCenter ? 'fade' : '')}>
-        <div className="back">
-          <i className="icon-back"></i>
-        </div>
-        <div className="switches-wrapper">
-          <Switch 
-            switches={this.state.switches}
-            currentIndex={this.state.currentIndex}
-            switch={this.switch}></Switch>
-        </div>
-        <div className="play-btn">
-          <i className="icon-play"></i>
-          <span className="text">随机播放全部</span>
-        </div>
-        <div className="list-wrapper">
-          {
-            this.state.currentIndex === 0
-            ? 
-            <Scroll
-              className="list-scroll"
-              probeType={3}
-            >
-              <div className="list-inner">
-                <SongList songs={this.props.favoriteList} select={this.selectSong}></SongList>
-              </div>
-            </Scroll>
-            :
-            <Scroll
-              className="list-scroll"
-              probeType={3}
-            >
-              <div className="list-inner">
-                <SongList songs={this.props.playHistory} select={this.selectSong}></SongList>
-              </div>
-            </Scroll>
-          }
+      <CSSTransition
+        in={this.state.showFlag}
+        timeout={200}
+        classNames="fade">
+        <div className="user-center">
+          <div className="back" onClick={this.back}>
+            <i className="icon-back"></i>
+          </div>
+          <div className="switches-wrapper">
+            <Switch
+              switches={this.state.switches}
+              currentIndex={this.state.currentIndex}
+              switch={this.switch}></Switch>
+          </div>
+          <div className="play-btn" onClick={this.random}>
+            <i className="icon-play"></i>
+            <span className="text">随机播放全部</span>
+          </div>
+          <div className="list-wrapper" ref="listWrapper">
+            {
+              this.state.currentIndex === 0
+              ?
+              <Scroll
+                ref="favoriteList"
+                className="list-scroll"
+                probeType={3}
+              >
+                <div className="list-inner">
+                  <SongList songs={this.props.favoriteList} select={this.selectSong}></SongList>
+                </div>
+              </Scroll>
+              :
+              <Scroll
+                ref="playList"
+                className="list-scroll"
+                probeType={3}
+              >
+                <div className="list-inner">
+                  <SongList songs={this.props.playHistory} select={this.selectSong}></SongList>
+                </div>
+              </Scroll>
+            }
+          </div>
+          <div className="no-result-wrapper" style={{'display': showNoResult ? 'block' : 'none'}}>
+            <NoResult title={noResultDesc}></NoResult>
+          </div>
         </div>
-      </div>
+      </CSSTransition>
     )
   }
 }
 
-User = connect(state => state, {insertSong})(User)
+User = connect(state => state, {insertSong, randomPlay})(User)
 
 export default  User
\ No newline at end of file
diff --git a/src/components/user/user.styl b/src/components/user/user.styl
index 88dfcb5..d9de6e8 100644
--- a/src/components/user/user.styl
+++ b/src/components/user/user.styl
@@ -7,10 +7,6 @@
   z-index: 100
   width: 100%
   background: $color-background
-  transform translate3d(100%, 0, 0)
-  transition all 0.3s
-  &.fade
-    transform translate3d(0, 0, 0)
   .back
     position absolute
     top: 0