Merge branch 'develop' into release/1.0

@@ -26,7 +26,7 @@ module.exports = {
     getNewsListData(params) {
         return serviceAPI.get('guang/api/v2/article/getList', {
             sort_id: '',
-            gender: yhChannel[params.channel].channel,
+            gender: yhChannel[params.channel || 'all'].channel,
             uid: params.uid || '0',
             page: params.page,
             limit: '10'

@@ -31,5 +31,7 @@
 </script>
 
 <style>
-
+    #channel {
+        padding-top: 90px;
+    }
 </style>

@@ -69,6 +69,10 @@
 
 <style>
     .channel-tab {
+        position: fixed;
+        top: 0;
+        left: 0;
+        z-index: 1;
         width: 100%;
         height: 90px;
         font-size: 24px;