go to login

mobile/control/index.php

@@ -119,12 +119,14 @@ class indexControl extends specialControl
         }
 
         $is_app = session_helper::isapp();
+        $from_wechat = util::from_wechat();
         $user = session_helper::memberid();
         $param = ["talk_type" => $talk_type, "talk_id"   => $talk_id , "member_id" => $user,"room_name"=>"","relay_id"=>$relay_id,"is_app"=>intval($is_app)];
 
         //app内打开请求授权登录
-        if($is_app && $user<= 0)
+        if(($is_app || !$from_wechat) && $user<= 0)
         {
+            $param['is_app'] = 1;
             if($talk_type == "room") {
                 return self::outsuccess(['tpl' => null,"param" => $param],'talk/homepage_room');
             }elseif($talk_type == 'chatwo') {

mobile/templates/default/talk/homepage_chatwo.php

@@ -36,16 +36,30 @@
     var cur_mid = <?php echo $output['param']['member_id'];  ?>;
 
     var checkLogin = function (){
-        if(is_app > 0 && cur_mid <= 0){
+        if(is_app >0 && cur_mid <= 0) {
             jsBridge.call_native_handler('on_native_click', '{"action":"login"}', function (data) {
-                window.location.reload();
+                var jsdata = JSON.parse(data);
+                if (!jsdata.login) {
+                    return;
+                }
+                else {
+                    sessionStorage.setItem('is_reload','true');
+                    window.location.reload();
+                }
             });
         }
-        return true;
+
+        var is_reload = sessionStorage.getItem('is_reload');
+        if(is_reload) {
+            sessionStorage.removeItem('is_reload');
+            window.location.reload();
+        }
     };
 
-    checkLogin();
 
+    $(window).on('pageshow',function(){
+        checkLogin();
+    });
 
     var getTalkInfo = function () {
         var jsonobject = {

mobile/templates/default/talk/homepage_room.php

@@ -77,25 +77,31 @@
             var jsBridge = new Bridge();
 
             var checkLogin = function (){
-                if(is_app > 0 && cur_mid <= 0){
+                if(is_app >0 && cur_mid <= 0) {
                     jsBridge.call_native_handler('on_native_click', '{"action":"login"}', function (data) {
-                        window.location.reload();
+                        var jsdata = JSON.parse(data);
+                        if (!jsdata.login) {
+                            return;
+                        }
+                        else {
+                            sessionStorage.setItem('is_reload','true');
+                            window.location.reload();
+                        }
                     });
                 }
-                return true;
-            };
-
-            checkLogin();
 
-            $(window).on('pageshow',function(){
                 var is_reload = sessionStorage.getItem('is_reload');
                 if(is_reload) {
                     sessionStorage.removeItem('is_reload');
                     window.location.reload();
                 }
-            });
+            };
 
 
+            $(window).on('pageshow',function(){
+                checkLogin();
+            });
+
             if($('#add_group_pwd').length > 0 || $('#add_group_apply').length > 0 || $('#add_group').length > 0) {
                 $('html').css({"min-height":"100%",background:"#ffffff"})
             }