fe / yohobuywap-node · Commits

Go to a project

Authored by 郭成尧
Commit ce03a61fc23045a239b43f77e228faa9e67845e1 2 parents 4e44d2b9 6fe5cb1b

Merge branch 'feature/third' into release/6.5.5

Inline Side-by-side
Showing 3 changed files with 21 additions and 20 deletions
@@ -43,23 +43,23 @@ router.post('/passport/sms_login/password.json', smsLogin.password); @@ -43,23 +43,23 @@ router.post('/passport/sms_login/password.json', smsLogin.password);
43 // jsonp获取用户uid 43 // jsonp获取用户uid
44 router.get('/passport/login/user', login.user); 44 router.get('/passport/login/user', login.user);
45 45
46 -// 微信登录  
47 -router.get('/passport/login/wechat', login.common.beforeLogin, login.common.isLoginUser, login.wechat.login);  
48 -router.get('/passport/login/wechat/callback', login.wechat.callback);  
49 -router.get('/passport/login/wechat/redirect', login.wechat.redirect); 46 +// // 微信登录
  47 +// router.get('/passport/login/wechat', login.common.beforeLogin, login.common.isLoginUser, login.wechat.login);
  48 +// router.get('/passport/login/wechat/callback', login.wechat.callback);
  49 +// router.get('/passport/login/wechat/redirect', login.wechat.redirect);
50 50
51 -// sina登录  
52 -router.get('/passport/login/sina', login.common.beforeLogin, login.sina.login);  
53 -router.get('/passport/login/sina/callback', login.sina.callback);  
54 -router.get('/passport/login/sina/redirect', login.sina.redirect); 51 +// // sina登录
  52 +// router.get('/passport/login/sina', login.common.beforeLogin, login.sina.login);
  53 +// router.get('/passport/login/sina/callback', login.sina.callback);
  54 +// router.get('/passport/login/sina/redirect', login.sina.redirect);
55 55
56 -// qq登录  
57 -router.get('/passport/login/qq', login.common.beforeLogin, login.qq.login);  
58 -router.get('/passport/login/qq/callback', login.qq.callback); 56 +// // qq登录
  57 +// router.get('/passport/login/qq', login.common.beforeLogin, login.qq.login);
  58 +// router.get('/passport/login/qq/callback', login.qq.callback);
59 59
60 -// 支付宝登录  
61 -router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);  
62 -router.get('/passport/login/alipay/callback', login.alipay.callback); 60 +// // 支付宝登录
  61 +// router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);
  62 +// router.get('/passport/login/alipay/callback', login.alipay.callback);
63 63
64 // 登录绑定 64 // 登录绑定
65 // router.get('/passport/bind/index', validateCode.load, bind.indexPage); 65 // router.get('/passport/bind/index', validateCode.load, bind.indexPage);
@@ -171,7 +171,8 @@ router.post('/passport/sms_login/step1_check', validateCode.check, smsLogin.inde @@ -171,7 +171,8 @@ router.post('/passport/sms_login/step1_check', validateCode.check, smsLogin.inde
171 router.get('/signin.html', 171 router.get('/signin.html',
172 login.common.clearCookie, 172 login.common.clearCookie,
173 login.common.thirdLogin, 173 login.common.thirdLogin,
174 - login.common.weixinCheck, 174 +
  175 + // login.common.weixinCheck,
175 validateCode.load, 176 validateCode.load,
176 login.common.beforeLogin, 177 login.common.beforeLogin,
177 smsLogin.smsLoginPage); // 短信验证码登录 178 smsLogin.smsLoginPage); // 短信验证码登录
@@ -26,7 +26,7 @@ @@ -26,7 +26,7 @@
26 <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a> 26 <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a>
27 </div> 27 </div>
28 </div> 28 </div>
29 - <div class="third-party-login"> 29 + {{!-- <div class="third-party-login">
30 <div class="tip-box"> 30 <div class="tip-box">
31 <span class="left-line"></span> 31 <span class="left-line"></span>
32 <span class="tip">使用第三方登录</span> 32 <span class="tip">使用第三方登录</span>
@@ -41,11 +41,11 @@ @@ -41,11 +41,11 @@
41 <a href="{{weiboLoginUrl}}" class="iconfont">&#xe729;</a> 41 <a href="{{weiboLoginUrl}}" class="iconfont">&#xe729;</a>
42 <a href="{{qqLoginUrl}}" class="iconfont">&#xe726;</a> 42 <a href="{{qqLoginUrl}}" class="iconfont">&#xe726;</a>
43 </div> 43 </div>
44 - </div> 44 + </div> --}}
45 <div class="get-password-box hide"> 45 <div class="get-password-box hide">
46 <div class="bottom-button-box"> 46 <div class="bottom-button-box">
47 <a class="by-email" onclick="location.href='{{emailRetriveUrl}}'">邮箱找回</a> 47 <a class="by-email" onclick="location.href='{{emailRetriveUrl}}'">邮箱找回</a>
48 <a class="by-mobile" onclick="location.href='{{phoneRetriveUrl}}'">手机找回</a> 48 <a class="by-mobile" onclick="location.href='{{phoneRetriveUrl}}'">手机找回</a>
49 </div> 49 </div>
50 </div> 50 </div>
51 -</div>  
  51 +</div>
@@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
35 <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a> 35 <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a>
36 </div> 36 </div>
37 </div> 37 </div>
38 - <div class="third-party-login"> 38 + {{!-- <div class="third-party-login">
39 <div class="tip-box"> 39 <div class="tip-box">
40 <span class="left-line"></span> 40 <span class="left-line"></span>
41 <span class="tip">使用第三方登录</span> 41 <span class="tip">使用第三方登录</span>
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <a href="{{weiboLoginUrl}}" class="iconfont">&#xe729;</a> 49 <a href="{{weiboLoginUrl}}" class="iconfont">&#xe729;</a>
50 <a href="{{qqLoginUrl}}" class="iconfont">&#xe726;</a> 50 <a href="{{qqLoginUrl}}" class="iconfont">&#xe726;</a>
51 </div> 51 </div>
52 - </div> 52 + </div> --}}
53 <div class="get-password-box hide"> 53 <div class="get-password-box hide">
54 <div class="bottom-button-box"> 54 <div class="bottom-button-box">
55 <a class="by-email" onclick="location.href='{{emailRetriveUrl}}'">邮箱找回</a> 55 <a class="by-email" onclick="location.href='{{emailRetriveUrl}}'">邮箱找回</a>