调整开关

@@ -35,7 +35,7 @@ const geetest = {
         };
 
         // 使用极验证
-        let useGeetest = _.get(req.app.locals.wap, 'geetest.validation', true);
+        let useGeetest = !_.get(req.app.locals.wap, 'geetest.validation', false);
 
         if (!useGeetest) {
             return next();

@@ -112,7 +112,7 @@ const local = {
         res.render('login', {
             width750: true,
             loginIndex: true, // 模板中使用JS的标识
-            useGeetest: _.get(req.app.locals.wap, 'geetest.validation', true), // 使用极验证
+            useGeetest: !_.get(req.app.locals.wap, 'geetest.validation', false), // 使用极验证
             captchaShow: true, // 170306 因为暴力破解密码问题，要求每次都展示验证码
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             showHeaderImg: true, // 控制显示头部图片
@@ -165,7 +165,7 @@ const local = {
             width750: true,
             backUrl: 'javascript:history.go(-1)', // eslint-disable-line
             loginInternational: true, // 模板中使用JS的标识
-            useGeetest: _.get(req.app.locals.wap, 'geetest.validation', true), // 使用极验证
+            useGeetest: !_.get(req.app.locals.wap, 'geetest.validation', false), // 使用极验证
             captchaShow: true, // 170306 因为暴力破解密码问题，要求每次都展示验证码
             isPassportPage: true, // 模板中模块标识
             headerText: '登录',
@@ -184,7 +184,7 @@ const local = {
     login: (req, res, next) => {
 
         // 使用极验证
-        let useGeetest = _.get(req.app.locals.wap, 'geetest.validation', true);
+        let useGeetest = !_.get(req.app.locals.wap, 'geetest.validation', false);
 
         // 关闭极验证的时候使用有货自有验证码
         if (!useGeetest) {

@@ -23,12 +23,11 @@ const geetest = require(cRoot + '/geetest');
 
 const router = express.Router(); // eslint-disable-line
 
+// geetest
 router.get('/passport/geetest/register', geetest.register);
 
 // 兼容老的路由
-router.get('/signin.html', login.common.beforeLogin, login.local.loginPage);
-
-// router.get('/signin.html', login.common.beforeLogin, smsLogin.loginPage);
+router.get('/signin.html', login.common.beforeLogin, smsLogin.loginPage);
 router.get('/reg.html', disableBFCahce, reg.index);
 router.get('/login.html', login.common.beforeLogin, login.local.international);
 router.get('/phoneback.html', back.indexMobilePage);
@@ -39,8 +38,6 @@ router.get('/passport/signout/index', login.local.logout);
 
 // 登录页面
 router.get('/passport/login', login.common.beforeLogin, login.local.loginPage);
-
-
 router.get('/passport/international', login.common.beforeLogin, login.local.international);
 
 // 本地登录

@@ -13,5 +13,34 @@
         </div>
         {{!--图片验证 end--}}
         <button id="btn-next" class="btn btn-next disable row" disabled>获取短信验证码</button>
+        <p class="op-container">
+            <a class="op-item internat" href={{accountUrl}}>账号密码登录</a>
+            <span id="forget-pwd" class="op-item forget-pwd">忘记密码</span>
+        </p>
+        <div class="third-party-login">
+            <div class="tp-link">
+                <a class="qq" href={{qqLoginUrl}}></a>
+                <a class="wechat" href={{wechatLoginUrl}}></a>
+                <a class="weibo" href={{weiboLoginUrl}}></a>
+                <a class="alipay" href={{aliLoginUrl}}></a>
+            </div>
+        </div>
+        <div class="login-tip">
+            <div class="info-icon"></div>
+            Yoho!Family账号可登录Yoho!Buy有货
+        </div>
+
+        <div id="retrive-pwd-mask" class="mask"></div>
+        <ul id="retrive-pwd-ways" class="retrive-pwd-ways">
+            <li>
+                <a href={{phoneRetriveUrl}}>通过手机找回密码</a>
+            </li>
+            <li>
+                <a href={{emailRetriveUrl}}>通过邮箱找回密码</a>
+            </li>
+            <li id="cancel-retrive">
+                取消
+            </li>
+        </ul>
     </div>
 </div>