账号密码登录优化

@@ -15,6 +15,9 @@ class SmsNew {
             let bannerData = yield req.ctx(LoginNewModel).getTopBanner();
             let bannerData = yield req.ctx(LoginNewModel).getTopBanner();
             let banner = _.get(bannerData, 'data[0].data[0].src', '');
             let banner = _.get(bannerData, 'data[0].data[0].src', '');
 
 
+            // 是否打开账号登录
+            let openPassword = !_.get(req.app.locals.wap, 'close.passwordLogin', false);
+
             res.render('sms/sms-login-new', {
             res.render('sms/sms-login-new', {
                 module: 'passport',
                 module: 'passport',
                 page: 'sms-login-new',
                 page: 'sms-login-new',
@@ -32,7 +35,8 @@ class SmsNew {
                 internationalUrl: '/passport/international', // 国际号登录的URL链接
                 internationalUrl: '/passport/international', // 国际号登录的URL链接
                 phoneRetriveUrl: '/passport/back/mobile', // 通过手机号找回密码的URL链接
                 phoneRetriveUrl: '/passport/back/mobile', // 通过手机号找回密码的URL链接
                 emailRetriveUrl: '/passport/back/email', // 通过邮箱找回密码的URL链接
                 emailRetriveUrl: '/passport/back/email', // 通过邮箱找回密码的URL链接
-                isWechat: req.yoho.isWechat
+                isWechat: req.yoho.isWechat,
+                openPassword
             });
             });
         })().catch(next);
         })().catch(next);
     }
     }

@@ -28,8 +28,10 @@
         <div data-geetest="{{useGeetest}}" id="js-img-check" {{#unless useGeetest}} class="full-img-verify" {{/unless}}></div>
         <div data-geetest="{{useGeetest}}" id="js-img-check" {{#unless useGeetest}} class="full-img-verify" {{/unless}}></div>
         <button id="smsLoginBtn" class="sms-login-btn">登录</button>
         <button id="smsLoginBtn" class="sms-login-btn">登录</button>
         <div class="other-info">
         <div class="other-info">
+            {{#if openPassword}}
             <a href="{{internationalUrl}}">海外账号登录</a>
             <a href="{{internationalUrl}}">海外账号登录</a>
             <a href="{{loginUrl}}">账号密码登录</a>
             <a href="{{loginUrl}}">账号密码登录</a>
+            {{/if}}
             <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a>
             <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a>
         </div>
         </div>
     </div>
     </div>
@@ -54,4 +56,4 @@
             <a class="by-mobile" onclick="location.href='{{phoneRetriveUrl}}'">手机找回</a>
             <a class="by-mobile" onclick="location.href='{{phoneRetriveUrl}}'">手机找回</a>
         </div>
         </div>
     </div>
     </div>
-</div>
+</div>

@@ -166,6 +166,7 @@ $disable-gray:       #b0b0b0;
             }
             }
 
 
             a:last-child {
             a:last-child {
+                float: right;
                 text-align: right;
                 text-align: right;
             }
             }
         }
         }

@@ -213,6 +213,7 @@ $disable-gray: #b0b0b0;
             }
             }
 
 
             a:last-child {
             a:last-child {
+                float: right;
                 text-align: right;
                 text-align: right;
             }
             }
         }
         }