Merge branch 'develop' into feature/me

# Conflicts:
#	config/common.js

@@ -10,7 +10,7 @@ const _processIndexData = (list) => {
     list = camelCase(list);
 
     _.forEach(list, (data, index) => {
-        //data.url = `//guang.yohobuy.com/index/index?type=${data.id}`;
+        // data.url = `//guang.yohobuy.com/index/index?type=${data.id}`;
         data.url = `//127.0.0.1:6003/editorial?type=${data.id}`;
         if (index === 0) {
             data.isActive = true;
@@ -29,7 +29,7 @@ const getIndexData = () => {
         if (result && result.code === 200) {
             return _processIndexData(result.data);
         } else {
-            logger.error('资讯首页数据返回 code 不是 200');
+            // logger.error('资讯首页数据返回 code 不是 200');
             return {};
         }
     });

@@ -11,6 +11,6 @@ const cRoot = './controllers';
 const editorial = require(cRoot + '/editorial');
 
 router.get('/', editorial.index); // 咨询首页
-//router.get('/list', editorial.list); // 咨询列表页
+// router.get('/list', editorial.list); // 咨询列表页
 
 module.exports = router;