Merge branch 'release/1.0' of http://git.yoho.cn/fe/yoho-blk into release/1.0

@@ -66,7 +66,7 @@ let index = (req, res) => {
             location: '+86',
             location: '+86',
             countryName: {text: '中国'},
             countryName: {text: '中国'},
             captchaUrl: helpers.urlFormat('/passport/images', {t: Date.now()}),
             captchaUrl: helpers.urlFormat('/passport/images', {t: Date.now()}),
-            itemUrl: helpers.urlFormat('/help/', {category_id: 9}),
+            itemUrl: helpers.urlFormat('/help'),
             referUrl: refer,
             referUrl: refer,
             loginUrl: helpers.urlFormat('/passport/login', {refer: refer}),
             loginUrl: helpers.urlFormat('/passport/login', {refer: refer}),
             regBtnText: '立即注册'
             regBtnText: '立即注册'

@@ -98,7 +98,7 @@ const Auth = {
                 domain: config.cookieDomain
                 domain: config.cookieDomain
             }); // esline-disable-line
             }); // esline-disable-line
 
 
-        }).catch(console.log);
+        });
     },
     },
     rememberAccount(accountInfo, req, res) {
     rememberAccount(accountInfo, req, res) {
         let aWeek = (new Date()).getTime() / 1000 + 504000; // 504000-一周
         let aWeek = (new Date()).getTime() / 1000 + 504000; // 504000-一周

@@ -104,7 +104,7 @@ const indexPageDataAsync = () => {
                 countryName: {text: '中国'},
                 countryName: {text: '中国'},
                 location: '+86',
                 location: '+86',
                 country: {list: countryList},
                 country: {list: countryList},
-                captchaUrl: helpers.urlFormat('/passport/images'),
+                captchaUrl: helpers.urlFormat('/passport/images')
             }
             }
         };
         };
     })();
     })();

@@ -19,7 +19,7 @@ module.exports = {
     },
     },
     cookieDomain: 'yohobuy.com',
     cookieDomain: 'yohobuy.com',
     domains: {
     domains: {
-        api: 'http://testapi.yoho.cn:58078/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
+        api: 'http://devapi.yoho.cn:58078/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
         service: 'http://testservice.yoho.cn:28077/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
         service: 'http://testservice.yoho.cn:28077/', // testservice.yoho.cn:28077 devservice.yoho.cn:58077
         search: 'http://192.168.102.216:8080/yohosearch/'
         search: 'http://192.168.102.216:8080/yohosearch/'
     },
     },