Browse Source

游戏大厅登录兼容坦克盒子登录

tangxijun 5 years ago
parent
commit
3dea0b1e84

+ 4 - 4
公共资源/src/dwUDBProxy/tpl/wan_login.tmpl

@@ -20,7 +20,7 @@
                     <p>微信<%= typeText %></p>
                 </li>
             </ul>
-            <% if(!wap){ %>
+            <% if(!wap&&!dropSinaLogin){ %>
                 <p class="dw-account-other-login">
                     <% if(type =='login'){ %>
                     <button type="button" class="login-btn-old" title="旧版第三方登录">旧版第三方登录</button>
@@ -30,16 +30,16 @@
             <% } %>
         </div>
     </div>
-    <% if(wap){ %>
+    <% if(wap&&!dropSinaLogin){ %>
         <p class="dw-account-other-login">
             <button type="button" class="login-btn-weibo">新浪微博</button>
         </p>
     <% } %>
 
-    <% if(dropYYLogin){ %>
+    <!-- <% if(dropYYLogin){ %>
         <p class="dw-account-other-login">
             <button type="button" class="login-btn-yy">YY登录</button>
         </p>
-    <% } %>
+    <% } %> -->
     <a class="close" title="关闭">退出</a>
 </div>

+ 6 - 2
公共资源/src/dwUDBProxy/tpl/wan_tip.tmpl

@@ -10,8 +10,12 @@
     <div class="dw-account-tip-tools">
         <button class="dw-account-tip-cancel">跳过</button>
          <!-- <a href="http://grzx.duowan.com.webdev.ouj.com/index.php?r=default/bind"  target="_blank"    class="dw-account-tip-confirm" title="去绑定第三方账号">去绑定</a> -->
-        <a href="http://account.duowan.com/site" target="_blank"  class="dw-account-tip-confirm" title="去绑定第三方账号">去绑定</a>
-    </div>
+        <% if(!isHezi){  %>
+            <a href="http://account.duowan.com/site" target="_blank"  class="dw-account-tip-confirm" title="去绑定第三方账号">去绑定</a>
+         <% } else{ %>
+         <a href="http://account.duowan.com/index.php?r=default/wotbind" target="_blank"  class="dw-account-tip-confirm" title="去绑定第三方账号">去绑定</a>
+        <% }%>
+        </div>
     <a class="close" title="关闭">退出</a>
 </div>
 

+ 10 - 3
公共资源/src/js/dwudbproxy-wan.js

@@ -390,7 +390,8 @@
         },
         isWap: /Android|webOS|iPhone|Windows Phone|iPod|BlackBerry|SymbianOS/i.test(window.navigator.userAgent),
         isBBS: /bbs./.test(location.host),
-        isWx: window.navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == "micromessenger"
+        isWx: window.navigator.userAgent.toLowerCase().match(/MicroMessenger/i) == "micromessenger",
+        isHezi:window.location.href.indexOf('hezi') > -1  
     }
 
     function UDBLogin(appid, baseURL) {
@@ -704,7 +705,8 @@
             $("body").append('<style>' + cssStyle + '</style>')
             $("body").append(loginTipTpl({
                 isWap: Util.isWap,
-                isBBS: Util.isBBS
+                isBBS: Util.isBBS,
+                isHezi: Util.isHezi
             }))
             var that = this
             this.loginMaskObj = $(".account-login-mask")
@@ -794,7 +796,8 @@
             var loginConfig = {
                 wap: Util.isWap,
                 type: type,
-                dropYYLogin: false
+                dropYYLogin: false,
+                dropSinaLogin:true, //删除新浪微博登录
             }
 
             if (wxCustomization && Util.isWap) {
@@ -963,6 +966,10 @@
                 if (ret.bindList.length == 0) {
                     self.yyLoginTip.show()
                     self.loginMaskObj.show()
+                }else{
+                    if(Util.isHezi){
+                        window.open('login://close')
+                    }
                 }
             })
         },