Merge remote-tracking branch 'origin/master'

@@ -120,12 +120,12 @@ const _processSideBar = (list, choosed) => {
 const _getChannelResource = (params) => {
     params.gender = params.gender || 'boys';
 
-    params = Object.assign({
-        gender: genderData[params.gender],
+    params = Object.assign(params, {
+        gender: genderData[params.gender] || '1,2,3',
         content_code: contentCode[params.gender], // eslint-disable-line
         page: 1,
         limit: 30
-    }, params);
+    });
     if (!params.uid) {
         params.new_device = true; // eslint-disable-line
     }