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

@@ -35,7 +35,7 @@ passport.use(new LocalStrategy({
     passReqToCallback: true
 }, (req, username, password, done) => {
 
-    let area = req.body.area || '86';
+    let area = req.body.areaCode || '86';
 
     if (isNaN(_.parseInt(area)) || _.isEmpty(username) || _.isEmpty(password)) {
         logger.info(`【Passport Login】bad params, area:${area} account:${username} password:${password}`);
@@ -43,7 +43,7 @@ passport.use(new LocalStrategy({
     }
 
     let verifyEmail = helpers.verifyEmail(username);
-    let verifyMobile = helpers.verifyAreaMobile(area + '-' + username, area);
+    let verifyMobile = area === '86' ? helpers.verifyAreaMobile(area + '-' + username) : true;
 
     if (!verifyEmail && !verifyMobile) {
         logger.info(`【Passport Login】bad account, email:${verifyEmail} mobile:${verifyMobile}`);

@@ -90,23 +90,23 @@ const sendCodePage = (req, res, next) => {
 const saveInSession = (req, res) => {
     switch (req.inputInfo.type) {
         case 'email':
-        {
-            req.session.email = req.inputInfo.phone;
-            res.redirect(helpers.urlFormat('/passport/back/sendEmail'));
-            break;
-        }
+            {
+                req.session.email = req.inputInfo.phone;
+                res.redirect(helpers.urlFormat('/passport/back/sendEmail'));
+                break;
+            }
         case 'mobile':
-        {
-            req.session.mobile = req.inputInfo.phone;
-            req.session.area = req.inputInfo.area;
-            req.session.verifyCode = req.session.captcha;
-            res.redirect(helpers.urlFormat('/passport/back/verification'));
-            break;
-        }
+            {
+                req.session.mobile = req.inputInfo.phone;
+                req.session.area = req.inputInfo.area;
+                req.session.verifyCode = req.session.captcha;
+                res.redirect(helpers.urlFormat('/passport/back/verification'));
+                break;
+            }
         default:
-        {
-            res.redirect(helpers.urlFormat('/passport/back/index'));
-        }
+            {
+                res.redirect(helpers.urlFormat('/passport/back/index'));
+            }
     }
 };
 

@@ -149,8 +149,8 @@ let sendBindMsg = (req, res, next) => {
             data: ''
         };
 
-        let mobile = +req.body.mobile;
-        let area = +req.body.area;
+        let mobile = req.body.mobile;
+        let area = req.body.area;
 
         // 检查是否检查过
         let checkNum = yield cache.get(`regCheckMobileNum_${passportHelper.makeAreaMobile(area, mobile)}`);
@@ -193,9 +193,9 @@ let msgCaptcha = (req, res, next) => {
         message: '',
         data: ''
     };
-    let area = +req.body.area;
-    let mobile = +req.body.mobile;
-    let code = +req.body.code; // 短信验证码
+    let area = req.body.area;
+    let mobile = req.body.mobile;
+    let code = req.body.code; // 短信验证码
 
     regService.validMobileCode(area, mobile, code).then((result) => {
         if (result.code) {
@@ -243,9 +243,9 @@ let mobileRegister = (req, res, next) => {
 
         yield cache.set(ipKey, ipTimes + 1, 3600);
 
-        let area = +req.body.area;
-        let mobile = +req.body.mobile;
-        let code = +req.body.code; // 短信验证码
+        let area = req.body.area;
+        let mobile = req.body.mobile;
+        let code = req.body.code; // 短信验证码
         let password = req.body.password;
         let result = yield regService.validMobileCode(area, mobile, code); // 验证注册的标识码是否有效
 

@@ -10,7 +10,11 @@
             </li>
             <li>
                 <div id="name" class="title center">
-                    <span>咸鸭蛋</span>
+                    {{#if name}}
+                        <span>{{name}}</span>
+                    {{^}}
+                        <span>咸鸭蛋</span>
+                    {{/if}}
                 </div>
             </li>
 

@@ -19,7 +19,7 @@ module.exports = {
     },
     cookieDomain: 'yohobuy.com',
     domains: {
-        api: 'http://api.yoho.cn/', // devapi.yoho.cn:58078 testapi.yoho.cn:28078 devapi.yoho.cn:58078
+        api: 'http://testapi.yoho.cn:28078/', // 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
         search: 'http://192.168.102.216:8080/yohosearch/'
     },

@@ -39,6 +39,7 @@ var $errTip = $('.tips'),
     $errMsg = $errTip.find('.rectangle');
 
 require('yoho-jquery-placeholder');
+require('../../plugins/tips');
 
 function errTip(ele, msg) {
     var topLeft = ele.offset();

@@ -7,7 +7,7 @@ var jQuery = require('yoho-jquery'),
 
 ((function($) {
 
-    var tpl = '<div class="tips">' +
+    var tpl = '<div class="tips hide">' +
         '<div class="triangle"></div>' +
         '<div class="rectangle"> {{content}}</div>' +
         '</div>';
@@ -19,6 +19,8 @@ var jQuery = require('yoho-jquery'),
 
     var methods = {
         show: function() {
+            var topLeft = this.offset();
+
             if (_that.isInit) {
                 $tips = this.find('.tips');
                 this.find('.rectangle').text(arguments[0]);
@@ -26,14 +28,23 @@ var jQuery = require('yoho-jquery'),
                 _that.isInit = true;
                 this.append(tplFn({content: arguments[0]}));
                 $tips = this.find('.tips');
-                $tips.css('top', this.height() - 2);
+                $tips.css({
+                    top: topLeft.top + this.height() - 2,
+                    left: topLeft.left,
+                    width: this.width() + 2,
+                    height: this.height
+                });
             }
+
+            return this.removeClass('hide');
         },
         hide: function() {
             if (_that.isInit) {
-                this.find('.tips').remove();
+                this.find('.tips').addClass('hide');
                 _that.isInit = false;
             }
+
+            return this;
         },
         status: function() {
             return _that.isInit;