Merge branch 'feature/third' into release/6.5.5

@@ -43,23 +43,23 @@ router.post('/passport/sms_login/password.json', smsLogin.password);
 // jsonp获取用户uid
 router.get('/passport/login/user', login.user);
 
-// 微信登录
-router.get('/passport/login/wechat', login.common.beforeLogin, login.common.isLoginUser, login.wechat.login);
-router.get('/passport/login/wechat/callback', login.wechat.callback);
-router.get('/passport/login/wechat/redirect', login.wechat.redirect);
+// // 微信登录
+// router.get('/passport/login/wechat', login.common.beforeLogin, login.common.isLoginUser, login.wechat.login);
+// router.get('/passport/login/wechat/callback', login.wechat.callback);
+// router.get('/passport/login/wechat/redirect', login.wechat.redirect);
 
-// sina登录
-router.get('/passport/login/sina', login.common.beforeLogin, login.sina.login);
-router.get('/passport/login/sina/callback', login.sina.callback);
-router.get('/passport/login/sina/redirect', login.sina.redirect);
+// // sina登录
+// router.get('/passport/login/sina', login.common.beforeLogin, login.sina.login);
+// router.get('/passport/login/sina/callback', login.sina.callback);
+// router.get('/passport/login/sina/redirect', login.sina.redirect);
 
-// qq登录
-router.get('/passport/login/qq', login.common.beforeLogin, login.qq.login);
-router.get('/passport/login/qq/callback', login.qq.callback);
+// // qq登录
+// router.get('/passport/login/qq', login.common.beforeLogin, login.qq.login);
+// router.get('/passport/login/qq/callback', login.qq.callback);
 
-// 支付宝登录
-router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);
-router.get('/passport/login/alipay/callback', login.alipay.callback);
+// // 支付宝登录
+// router.get('/passport/login/alipay', login.common.beforeLogin, login.alipay.login);
+// router.get('/passport/login/alipay/callback', login.alipay.callback);
 
 // 登录绑定
 // router.get('/passport/bind/index', validateCode.load, bind.indexPage);
@@ -171,7 +171,8 @@ router.post('/passport/sms_login/step1_check', validateCode.check, smsLogin.inde
 router.get('/signin.html',
     login.common.clearCookie,
     login.common.thirdLogin,
-    login.common.weixinCheck,
+
+    // login.common.weixinCheck,
     validateCode.load,
     login.common.beforeLogin,
     smsLogin.smsLoginPage); // 短信验证码登录

@@ -26,7 +26,7 @@
             <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a>
         </div>
     </div>
-    <div class="third-party-login">
+    {{!-- <div class="third-party-login">
         <div class="tip-box">
             <span class="left-line"></span>
             <span class="tip">使用第三方登录</span>
@@ -41,11 +41,11 @@
             <a href="{{weiboLoginUrl}}" class="iconfont">&#xe729;</a>
             <a href="{{qqLoginUrl}}" class="iconfont">&#xe726;</a>
         </div>
-    </div>
+    </div> --}}
     <div class="get-password-box hide">
         <div class="bottom-button-box">
             <a class="by-email" onclick="location.href='{{emailRetriveUrl}}'">邮箱找回</a>
             <a class="by-mobile" onclick="location.href='{{phoneRetriveUrl}}'">手机找回</a>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>

@@ -35,7 +35,7 @@
             <a id="getPswrdBtn" href="javascript:void(0);">忘记密码?</a>
         </div>
     </div>
-    <div class="third-party-login">
+    {{!-- <div class="third-party-login">
         <div class="tip-box">
             <span class="left-line"></span>
             <span class="tip">使用第三方登录</span>
@@ -49,7 +49,7 @@
             <a href="{{weiboLoginUrl}}" class="iconfont">&#xe729;</a>
             <a href="{{qqLoginUrl}}" class="iconfont">&#xe726;</a>
         </div>
-    </div>
+    </div> --}}
     <div class="get-password-box hide">
         <div class="bottom-button-box">
             <a class="by-email" onclick="location.href='{{emailRetriveUrl}}'">邮箱找回</a>