修改了滑动效果，修改界面外观
Merge remote-tracking branch 'origin/master'