账号登录开关

@@ -82,6 +82,12 @@ const common = {
 
 
 const local = {
 const local = {
     loginPage: (req, res) => {
     loginPage: (req, res) => {
+        // 是否关闭账号登录
+        let closePassword = _.get(req.app.locals.wap, 'close.passwordLogin', false);
+
+        if (closePassword) {
+            return res.redirect(`/signin.html?refer=${req.query.refer || ''}`);
+        }
         if (req.session.captchaValidCount == null) { // eslint-disable-line
         if (req.session.captchaValidCount == null) { // eslint-disable-line
             req.session.captchaValidCount = 5;
             req.session.captchaValidCount = 5;
         }
         }
@@ -182,6 +188,15 @@ const local = {
         });
         });
     },
     },
     login: (req, res, next) => {
     login: (req, res, next) => {
+        // 是否关闭账号登录
+        let closePassword = _.get(req.app.locals.wap, 'close.passwordLogin', false);
+
+        if (closePassword) {
+            return res.json({
+                code: 403,
+                message: '请使用快速登录'
+            });
+        }
 
 
         // 使用极验证
         // 使用极验证
         let useGeetest = !_.get(req.app.locals.wap, 'geetest.validation', false);
         let useGeetest = !_.get(req.app.locals.wap, 'geetest.validation', false);

@@ -44,43 +44,9 @@ const _step1 = (req, res, next) => {
         req.session.captchaValidCount = 5;
         req.session.captchaValidCount = 5;
     }
     }
 
 
+    // 是否打开账号登录
+    let openPassword = !_.get(req.app.locals.wap, 'close.passwordLogin', false);
     let template = 'sms/login';
     let template = 'sms/login';
-
-    // let viewData = {
-    //     width750: true,
-    //     module: 'passport',
-    //     page: 'sms-login',
-    //     title: '手机短信登录',
-    //     isPassportPage: true,
-    //     headerText: '手机号码快捷登录',
-    //     captchaUrl: helpers.urlFormat('/passport/sms_login/captcha.png', {t: Date.now()}),
-    //     areaCode: '+86', // 默认的区号
-    //     countrys: RegService.getAreaData() // 地区信息列表
-    // };
-
-    // 登陆切换到短信登陆
-    // let viewData = {
-    //     width750: true,
-    //     module: 'passport',
-    //     page: 'sms-login',
-    //     backUrl: 'javascript:history.go(-1)', // eslint-disable-line
-    //     showHeaderImg: true, // 控制显示头部图片
-    //     title: '手机短信登录',
-    //     isPassportPage: true,
-    //     captchaUrl: helpers.urlFormat('/passport/sms_login/captcha.png', {t: Date.now()}),
-    //     smsLoginUrl: '/passport/sms_login',
-    //     registerUrl: '/passport/reg/index', // 注册的URL链接
-    //     aliLoginUrl: '/passport/login/alipay', // 支付宝快捷登录的URL链接
-    //     weiboLoginUrl: '/passport/login/sina', // 微博登录的URL链接
-    //     qqLoginUrl: '/passport/login/qq', // 腾讯QQ登录的URL链接
-    //     wechatLoginUrl: '/passport/login/wechat', // 微信登录的URL链接
-    //     internationalUrl: '/passport/international', // 国际号登录的URL链接
-    //     phoneRetriveUrl: '/passport/back/mobile', // 通过手机号找回密码的URL链接
-    //     emailRetriveUrl: '/passport/back/email', // 通过邮箱找回密码的URL链接
-    //     areaCode: '+86', // 默认的区号
-    //     countrys: RegService.getAreaData(), // 地区信息列表
-    //     reg: true
-    // };
     let viewData = {
     let viewData = {
         width750: true,
         width750: true,
         module: 'passport',
         module: 'passport',
@@ -102,6 +68,7 @@ const _step1 = (req, res, next) => {
         emailRetriveUrl: '/passport/back/email', // 通过邮箱找回密码的URL链接
         emailRetriveUrl: '/passport/back/email', // 通过邮箱找回密码的URL链接
         areaCode: '+86', // 默认的区号
         areaCode: '+86', // 默认的区号
         countrys: RegService.getAreaData(), // 地区信息列表
         countrys: RegService.getAreaData(), // 地区信息列表
+        openPassword,
         reg: true
         reg: true
     };
     };
 
 

@@ -14,7 +14,9 @@
         {{!--图片验证 end--}}
         {{!--图片验证 end--}}
         <button id="btn-next" class="btn btn-next disable row" disabled>获取短信验证码</button>
         <button id="btn-next" class="btn btn-next disable row" disabled>获取短信验证码</button>
         <p class="op-container">
         <p class="op-container">
+            {{#if openPassword}}
             <a class="op-item internat" href={{accountUrl}}>账号密码登录</a>
             <a class="op-item internat" href={{accountUrl}}>账号密码登录</a>
+            {{/if}}
             <span id="forget-pwd" class="op-item forget-pwd">忘记密码</span>
             <span id="forget-pwd" class="op-item forget-pwd">忘记密码</span>
         </p>
         </p>
         <div class="third-party-login">
         <div class="third-party-login">

@@ -8,7 +8,9 @@ var $countrySelect,
     $resetBtn,
     $resetBtn,
     $captcha,
     $captcha,
     $captchaPNG,
     $captchaPNG,
-    $phoneNum;
+    $phoneNum,
+    $mask = $('#retrive-pwd-mask'),
+    $ways = $('#retrive-pwd-ways');
 
 
 var page;
 var page;
 
 
@@ -67,8 +69,27 @@ page = {
                 .toggleClass('disable', true);
                 .toggleClass('disable', true);
             $resetBtn.hide();
             $resetBtn.hide();
         });
         });
-    },
+        $('#forget-pwd').on('touchstart', () => {
+            this.showRetrivePanel();
+        });
+
+        $mask.on('touchstart', () => {
+            this.hideRetrivePanel();
+        });
 
 
+        $('#cancel-retrive').on('touchstart', (e) => {
+            e.preventDefault();
+            this.hideRetrivePanel();
+        });
+    },
+    showRetrivePanel: () => {
+        $mask.show();
+        $ways.show();
+    },
+    hideRetrivePanel: () => {
+        $mask.hide();
+        $ways.hide();
+    },
     // 切换$nextBtn disable状态
     // 切换$nextBtn disable状态
     toggleNextBtn: function() {
     toggleNextBtn: function() {
         var bool = Boolean($.trim($phoneNum.val()));
         var bool = Boolean($.trim($phoneNum.val()));

@@ -19,18 +19,18 @@
         margin: 20PX 0;
         margin: 20PX 0;
         text-align: center;
         text-align: center;
         font-size: 16PX;
         font-size: 16PX;
-        display: flex;
 
 
         .op-item {
         .op-item {
-            flex: 1;
+            margin: 0 auto;
             color: #fff;
             color: #fff;
         }
         }
 
 
-        .internat {
+        .op-item:first-child {
+            float: left;
             text-align: left;
             text-align: left;
         }
         }
-
-        .forget-pwd {
+        .op-item:last-child {
+            float: right;
             text-align: right;
             text-align: right;
         }
         }
     }
     }

@@ -44,25 +44,25 @@
         color: #858585;
         color: #858585;
     }
     }
 }
 }
-
-.op-container {
+ .op-container {
     position: relative;
     position: relative;
     width: 100%;
     width: 100%;
     margin: 20PX 0;
     margin: 20PX 0;
+    height: 40px;
     text-align: center;
     text-align: center;
     font-size: 16PX;
     font-size: 16PX;
-    display: flex;
 
 
     .op-item {
     .op-item {
-        flex: 1;
+        margin: 0 auto;
         color: #fff;
         color: #fff;
     }
     }
 
 
-    .internat {
+    .op-item:first-child {
+        float: left;
         text-align: left;
         text-align: left;
     }
     }
-
-    .forget-pwd {
+    .op-item:last-child {
+        float: right;
         text-align: right;
         text-align: right;
     }
     }
 }
 }