|
@@ -565,9 +565,8 @@
|
|
this.multiLoginPopupObj.show()
|
|
this.multiLoginPopupObj.show()
|
|
this.loginMaskObj.show();
|
|
this.loginMaskObj.show();
|
|
},
|
|
},
|
|
- h5MultiLogin: function (successURL) {
|
|
|
|
- this.initMutilH5LoginPopup(successURL)
|
|
|
|
- this.multiLoginPopupObj.show()
|
|
|
|
|
|
+ wxLogin: function (successURL) {
|
|
|
|
+ this.loginOauth('weixin2', successURL, 1)
|
|
},
|
|
},
|
|
login: function (successURL) {
|
|
login: function (successURL) {
|
|
this.initDuowanLoginPopup(successURL)
|
|
this.initDuowanLoginPopup(successURL)
|
|
@@ -798,109 +797,6 @@
|
|
|
|
|
|
return this
|
|
return this
|
|
},
|
|
},
|
|
- initMutilH5LoginPopup: function (successURL, type) {
|
|
|
|
- type = type || 'login'
|
|
|
|
-
|
|
|
|
- this.initLoginTip()
|
|
|
|
-
|
|
|
|
- if (this.type == type && this.multiLoginPopupObj) return this;
|
|
|
|
-
|
|
|
|
- this.type = type;
|
|
|
|
-
|
|
|
|
- //弹窗定制化 主要针对pc.duowan.cn
|
|
|
|
- var wxCustomization = typeof successURL == 'object'
|
|
|
|
-
|
|
|
|
- var loginConfig = {
|
|
|
|
- wap: Util.isWap,
|
|
|
|
- type: type,
|
|
|
|
- dropYYLogin: true,
|
|
|
|
- dropSinaLogin:true, //删除新浪微博登录
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (wxCustomization && Util.isWap) {
|
|
|
|
- loginConfig.dropYYLogin = true
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- var loginPopupTpl = __inline("../dwUDBProxy/tpl/wan_h5_login.tmpl")(loginConfig);
|
|
|
|
-
|
|
|
|
- if (this.multiLoginPopupObj) {
|
|
|
|
- this.multiLoginPopupObj.html($(loginPopupTpl).html())
|
|
|
|
-
|
|
|
|
- return this;
|
|
|
|
- } else {
|
|
|
|
- $("body").append(loginPopupTpl)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- var that = this;
|
|
|
|
-
|
|
|
|
- this.multiLoginPopupObj = $(".dw-account-h5-login")
|
|
|
|
-
|
|
|
|
- //微信登录定制
|
|
|
|
- if (wxCustomization) {
|
|
|
|
- var wechatClickCallback = successURL.wechatClickCallback
|
|
|
|
- successURL = successURL.defaultCallbck
|
|
|
|
- if (Util.isWx) {
|
|
|
|
- that.multiLoginPopupObj.on("click", ".login-btn-wechat", function (e) {
|
|
|
|
- e.preventDefault()
|
|
|
|
- that.loginOauth('mp', successURL, 1)
|
|
|
|
- that.loginExtention('wechat')
|
|
|
|
- })
|
|
|
|
- } else {
|
|
|
|
- that.multiLoginPopupObj.on("click", ".login-btn-wechat", function () {
|
|
|
|
- wechatClickCallback(that)
|
|
|
|
- that.loginExtention('wechat')
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- that.multiLoginPopupObj.on("click", ".login-btn-wechat", function (e) {
|
|
|
|
- e.preventDefault()
|
|
|
|
- that.loginOauth(Util.isWx ? 'mp' : "weixin", successURL, 1)
|
|
|
|
- that.loginExtention('wechat')
|
|
|
|
- })
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- this.multiLoginPopupObj.on('click', '.login-btn-yy', function (e) {
|
|
|
|
- $('.udbsdk_login').on('click','.udbsdk_close',function(e){
|
|
|
|
- e.preventDefault()
|
|
|
|
- if(Util.isHezi){
|
|
|
|
- window.open('login://close')
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
- if (that.type == 'login') {
|
|
|
|
- if (Util.isWap) {
|
|
|
|
- __ThirdLogin.mobileLogin(successURL)
|
|
|
|
- } else {
|
|
|
|
- e.preventDefault()
|
|
|
|
- that.closeLoginPopup()
|
|
|
|
- __UDBLogin.login(successURL)
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- window.open(Util.toDecorateURL('//aq.yy.com/p/reg/mobile.do?fromadv=navigator'));
|
|
|
|
- }
|
|
|
|
- that.loginExtention('yy')
|
|
|
|
- }).on("click", ".login-btn-qq", function (e) {
|
|
|
|
- e.preventDefault()
|
|
|
|
- that.loginOauth("qq", successURL, 1)
|
|
|
|
- that.loginExtention('qq')
|
|
|
|
- }).on("click", ".login-btn-weibo", function (e) {
|
|
|
|
- e.preventDefault()
|
|
|
|
- that.loginOauth("weibo", successURL, 1)
|
|
|
|
- that.loginExtention('weibo')
|
|
|
|
- }).on("click", ".login-btn-old", function (e) {
|
|
|
|
- e.preventDefault()
|
|
|
|
- that.closeLoginPopup()
|
|
|
|
- that.login(successURL)
|
|
|
|
- }).on("click", ".close", function (e) {
|
|
|
|
- e.preventDefault()
|
|
|
|
- that.closeLoginPopup()
|
|
|
|
- if(Util.isHezi){
|
|
|
|
- window.open('login://close')
|
|
|
|
- }
|
|
|
|
- })
|
|
|
|
-
|
|
|
|
- return this
|
|
|
|
- },
|
|
|
|
initMutilLoginPopup: function (successURL, type) {
|
|
initMutilLoginPopup: function (successURL, type) {
|
|
type = type || 'login'
|
|
type = type || 'login'
|
|
|
|
|
|
@@ -1160,7 +1056,7 @@
|
|
}
|
|
}
|
|
} catch (e) { }
|
|
} catch (e) { }
|
|
},
|
|
},
|
|
- h5Login: function (successURL, appid) {
|
|
|
|
|
|
+ wxLogin: function (successURL, appid) {
|
|
try {
|
|
try {
|
|
if (appid) {
|
|
if (appid) {
|
|
__UDBLogin.setAppid(appid)
|
|
__UDBLogin.setAppid(appid)
|
|
@@ -1168,7 +1064,7 @@
|
|
}
|
|
}
|
|
|
|
|
|
if (Util.useMultiLogin()) {
|
|
if (Util.useMultiLogin()) {
|
|
- return __ThirdLogin.h5MultiLogin(successURL);
|
|
|
|
|
|
+ return __ThirdLogin.wxLogin(successURL);
|
|
} else {
|
|
} else {
|
|
return __UDBLogin.login(successURL);
|
|
return __UDBLogin.login(successURL);
|
|
}
|
|
}
|