Merge branch 'release/4.8'

@@ -81,7 +81,7 @@ let index = (req, res, next) => {
             passport: {
                 region: passportHelper.getCountry(),
                 location: '+86',
-                captchaUrl: helpers.urlFormat('/passport/images', {t: Date.now()}),
+                captchaUrl: helpers.urlFormat('/passport/imagesNode', {t: Date.now()}),
                 itemUrl: helpers.urlFormat('/help/', {category_id: 9}),
                 referUrl: refer,
                 loginUrl: helpers.urlFormat('/passport/login', {refer: refer}),

@@ -108,7 +108,7 @@ const indexPageDataAsync = () => {
                 coverImg: banner.img,
                 countryCode: 86,
                 countryName: '中国',
-                captchaUrl: helpers.urlFormat('/passport/images', {t: moment().unix()}),
+                captchaUrl: helpers.urlFormat('/passport/imagesNode', {t: moment().unix()}),
                 countryList: countryList
             }
         };

@@ -150,6 +150,6 @@ router.get('/passport/back/resetSuccess',
     back.validateSuccessStatusPage,
     back.resetPwdSuccessPage);
 
-router.get('/passport/images', captcha.generate);
+router.get('/passport/imagesNode', captcha.generate);
 
 module.exports = router;

@@ -598,6 +598,11 @@ exports.handleSaleFilterData = (origin, params) => {
 
     });
 
+    // 如果年龄就一个，默认选中
+    if (dest.ageLevel && dest.ageLevel.length === 1) {
+        _.set(dest, 'ageLevel[0].checked', true);
+    }
+
     // 清除所有选中数据
     let remainParams = {};
 

@@ -15,12 +15,8 @@ module.exports = {
     port: 6002,
     siteUrl: 'http://www.yohobuy.com',
     domains: {
-        // api: 'http://devapi.yoho.cn:58078/',
-        // service: 'http://devservice.yoho.cn:58077/',
-        // search: 'http://192.168.102.216:8080/yohosearch/'
-
-        api: 'http://api.yoho.cn/',
-        service: 'http://testservice.yoho.cn:28077/',
+        api: 'http://devapi.yoho.cn:58078/',
+        service: 'http://devservice.yoho.cn:58077/',
         search: 'http://192.168.102.216:8080/yohosearch/'
     },
     subDomains: {
@@ -36,12 +32,9 @@ module.exports = {
     useOneapm: false,
     useCache: false,
     memcache: {
-        // master: ['192.168.102.222:11213'],
-        // slave: ['192.168.102.222:11213'],
-        // session: ['192.168.102.222:11213'],
-        master: ['192.168.102.205:12111'],
-        slave: ['192.168.102.205:12111'],
-        session: ['192.168.102.205:12111'],
+        master: ['192.168.102.222:11213'],
+        slave: ['192.168.102.222:11213'],
+        session: ['192.168.102.222:11213'],
         timeout: 1000,
         retries: 0
     },

@@ -51,7 +51,7 @@
 
     {{#if ageLevel}}
         <div class="channel section">
-            <span class="title">性别：</span>
+            <span class="title">年龄：</span>
 
             <div class="attr-content clearfix">
                 {{#each ageLevel}}

@@ -25,7 +25,7 @@ var mailAc = require('../common/ac-email'); // 邮箱自动完成
 
 var $remember = $('.remember-me');
 
-var captchaUrl = '/passport/images?t='; // /passport/images?t=1454464125
+var captchaUrl = '/passport/imagesNode?t='; // /passport/images?t=1454464125
 
 var $captchaWrap = $('.captcha-wrap'),
     $captchaImg = $captchaWrap.find('#captcha-img');