Merge branch 'hotfix/error' into 'release/6.4'

'修复频道页undifined'



See merge request !1196

@@ -89,7 +89,7 @@ module.exports = class extends global.yoho.BaseModel {
         list = list || [];
 
         _.forEach(list, (item, i) => {
-            if (item.sub) {
+            if (_.isArray(item.sub)) {
                 item.sub.unshift({
                     sort_name: item.sort_name,
                     sort_name_en: item.sort_name_en,

@@ -153,7 +153,7 @@ module.exports = class extends global.yoho.BaseModel {
         return this.get({
             data: {
                 method: 'app.brand.newBrandList',
-                yh_channel: yhChannel[channel].channel,
+                yh_channel: _.get(yhChannel, `${channel}.channel`, '1'),
                 app_type: 1
             },
             params: {