debug

helper/room/tpl_chatwo_home.php

@@ -35,22 +35,51 @@ class tpl_chatwo_home
         $html = '';
         if(!empty($member))
         {
-            $html .= "<div class=\"weui-flex__item member-detail\" data-member-id={$member['member_id']} data-last='true'> ";
-
-            $html .= "
-                    <img src=\"{$member['avatar']}\" alt=\"\">
-                    <p>{$member['nickname']}</p>
-                </div>";
-
-
             $html .= "
-            <div class=\"weui-flex__item\">
-                <img src=\"" . RESOURCE_SITE_URL . "/mobile/talk/images/add_member.png\" id=\"add_member\" alt=\"\">
-            </div>
-            ";
+            <div class=\"group_top\">
+                <div class=\"group_members weui-flex\">
+                    <div class=\"weui-flex__item member-detail\" data-member-id={$member['member_id']} data-last='true'>
+                        <img src=\"{$member['avatar']}\" alt=\"\">
+                        <p>{$member['nickname']}</p>
+                    </div>
+                
+                    <div class=\"weui-flex__item\">
+                        <img src=\"" . RESOURCE_SITE_URL . "/mobile/talk/images/add_member.png\" id=\"add_member\" alt=\"\">
+                    </div>
+                </div>
+            </div>";
         }
 
         echo $html;
     }
 
+    public function show_chatwo_footer()
+    {
+        $html = "<div class=\"weui-cells\">
+                    <div class=\"weui-cell weui-cell_switch\" href=\"javascript:;\">
+                        <div class=\"weui-cell__bd\">
+                            <p>置顶聊天</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">
+                            <label for=\"talk_top\" class=\"weui-switch-cp\">
+                                <input id=\"talk_top\" class=\"weui-switch-cp__input\" type=\"checkbox\">
+                                <div class=\"weui-switch-cp__box\"></div>
+                            </label>
+                        </div>
+                    </div>
+                    <div class=\"weui-cell weui-cell_switch\" href=\"javascript:;\">
+                        <div class=\"weui-cell__bd\">
+                            <p>消息免打扰</p>
+                        </div>
+                        <div class=\"weui-cell__ft\">
+                            <label for=\"no_disturb\" class=\"weui-switch-cp\">
+                                <input id=\"no_disturb\" class=\"weui-switch-cp__input\" type=\"checkbox\">
+                                <div class=\"weui-switch-cp__box\"></div>
+                            </label>
+                        </div>
+                    </div>
+                </div>";
+        echo $html;
+    }
+
 }

helper/room/tpl_group_home.php

@@ -637,7 +637,9 @@ class tpl_group_home
 //            util::qrcode_path($url, $save_path);
 //        }
 
-        $html = "<div class=\"qrcode\">
+        $html = "
+            <div class=\"pop\">
+                <div class=\"qrcode\">
                         <div class=\"qrcode_info\">
                             <img src=\"$avatar\" class=\"qrcode_avatar_img\" alt=\"\">
                             <div class=\"group_name\">
@@ -651,7 +653,8 @@ class tpl_group_home
                         </p>
                         <span class=\"close_btn\"></span>
                     </div>
-                 </div>";
+                 </div>
+            </div>";
 
         echo $html;
     }

mobile/control/index.php

@@ -118,7 +118,23 @@ class indexControl extends specialControl
             return self::outerr(errcode::ErrParamter);
         }
 
-        //微信使用授权判断
+        $is_app = session_helper::isapp();
+        $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($talk_type == "room") {
+                return self::outsuccess(['tpl' => null,"param" => $param],'talk/homepage_room');
+            }elseif($talk_type == 'chatwo') {
+                return self::outsuccess(['tpl' => null,"param" => $param],'talk/homepage_chatwo');
+            }else {
+
+            }
+        }
+
+        //微信内打开使用授权判断
         if(session_helper::need_wechat_author()) {
             $author = new thrid_author\wxauthor();
             $url = url_helper::room_detail_url($talk_type,$talk_id,$relay_id);
@@ -126,10 +142,6 @@ class indexControl extends specialControl
             return self::outsuccess(['direct_uri' => $url],"redirect");
         }
 
-        $user = session_helper::memberid();
-        if($user <= 0) return self::outerr(errcode::ErrUnLogin,"用户未登录");
-
-        $param = ["talk_type" => $talk_type, "talk_id"   => $talk_id , "member_id" => $user,"room_name"=>"","relay_id"=>$relay_id];
 
         if($talk_type == "room")
         {

mobile/templates/default/talk/homepage_chatwo.php

@@ -9,36 +9,13 @@
 </head>
 <body>
 
-<div class="group_top">
-    <div class="group_members weui-flex">
-        <?php $output['tpl']->show_members(); ?>
-    </div>
-</div>
-
-<div class="weui-cells">
-    <div class="weui-cell weui-cell_switch" href="javascript:;">
-        <div class="weui-cell__bd">
-            <p>置顶聊天</p>
-        </div>
-        <div class="weui-cell__ft">
-            <label for="talk_top" class="weui-switch-cp">
-                <input id="talk_top" class="weui-switch-cp__input" type="checkbox">
-                <div class="weui-switch-cp__box"></div>
-            </label>
-        </div>
-    </div>
-    <div class="weui-cell weui-cell_switch" href="javascript:;">
-        <div class="weui-cell__bd">
-            <p>消息免打扰</p>
-        </div>
-        <div class="weui-cell__ft">
-            <label for="no_disturb" class="weui-switch-cp">
-                <input id="no_disturb" class="weui-switch-cp__input" type="checkbox">
-                <div class="weui-switch-cp__box"></div>
-            </label>
-        </div>
-    </div>
-</div>
+<?php
+    if(isset($output['tpl']))
+    {
+        $output['tpl']->show_members();
+        $output['tpl']->show_chatwo_footer();
+    }
+?>
 </body>
 </html>
 
@@ -50,9 +27,23 @@
 <script>
     var jsBridge = new Bridge();
 
+    var is_app   = <?php echo $output['param']['is_app']; ?>;
+
     var talk_type = "<?php echo $output['param']['talk_type']; ?>";
 
-    var talk_id = "<?php echo $output['param']['talk_id'];   ?>";
+    var talk_id = <?php echo $output['param']['talk_id'];   ?>;
+
+    var cur_mid = <?php echo $output['param']['member_id'];  ?>;
+
+    var checkLogin = function (){
+        if(is_app > 0 && cur_mid <= 0){
+            //唤起登录页面
+        }
+        return true;
+    };
+
+    checkLogin();
+
 
     var getTalkInfo = function () {
         var jsonobject = {

mobile/templates/default/talk/homepage_room.php

@@ -13,37 +13,45 @@
 </head>
 <body>
 
-<?php $output['tpl']->show_cover(); ?>
+<?php
 
-<div class="group_top">
-    <div class="group_info">
-        <?php $output['tpl']->show_group_header(); ?>
-        <?php $output['tpl']->show_qrcode_btn(); ?>
-    </div>
+    if(isset($output['tpl']))
+    {
+        $output['tpl']->show_cover();
+        /*群头部信息*/
+        echo "<div class=\"group_top\">";
 
-    <?php //$output['tpl']->show_group_notice();  //删除群公告展示 ?>
+        echo    "<div class=\"group_info\">";
+                    $output['tpl']->show_group_header();
+                    $output['tpl']->show_qrcode_btn();
+        echo    "</div>";
 
-    <?php $output['tpl']->show_group_activity(); ?>
+                //$output['tpl']->show_group_notice();  //删除群公告展示
 
-    <?php $output['tpl']->show_members(); ?>
+                $output['tpl']->show_group_activity();
 
-    <div id="callback"></div>
+                $output['tpl']->show_members();
 
-    <?php $output['tpl']->show_footer_apply_btn(); ?>
-</div>
+        echo    "<div id=\"callback\"></div>";
 
-<?php $output['tpl']->show_group_body(); ?>
+                $output['tpl']->show_footer_apply_btn();
 
-<?php //$output['tpl']->change_manager_btn();  //转让管理员暂时关闭?>
+        echo "</div>";
 
-<?php $output['tpl']->show_group_footer(); ?>
+        /*群设置信息*/
+        $output['tpl']->show_group_body();
 
-<?php $output['tpl']->show_footer_leave_btn(); ?>
+        //$output['tpl']->change_manager_btn();  //转让管理员暂时关闭
 
-<div class="pop">
-    <?php $output['tpl']->show_qrcode()?>
-</div>
+        /*群下部按钮*/
+        $output['tpl']->show_group_footer();
 
+        $output['tpl']->show_footer_leave_btn();
+
+        /*群二维码*/
+        $output['tpl']->show_qrcode();
+    }
+?>
 
 <script src="https://cdn.bootcss.com/jquery/1.11.0/jquery.min.js?<?php echo bonus_version(); ?>"></script>
 <script src="https://cdn.bootcss.com/jquery-weui/1.2.0/js/jquery-weui.min.js?<?php echo bonus_version(); ?>"></script>
@@ -56,16 +64,26 @@
 <script type="text/javascript">
     $(function () {
 
+            var is_app   = <?php echo $output['param']['is_app']; ?>;
+
             var talk_type = "<?php echo $output['param']['talk_type']; ?>";
 
-            var talk_id = "<?php echo $output['param']['talk_id'];   ?>";
+            var talk_id = <?php echo $output['param']['talk_id'];   ?>;
 
-            var cur_mid = "<?php echo $output['param']['member_id'];  ?>";
+            var cur_mid = <?php echo $output['param']['member_id'];  ?>;
 
-            var relay_id = "<?php echo $output['param']['relay_id'];  ?>";
+            var relay_id = <?php echo $output['param']['relay_id'];  ?>;
 
             var jsBridge = new Bridge();
 
+            var checkLogin = function (){
+                if(is_app > 0 && cur_mid <= 0){
+                    //唤起登录页面
+                }
+                return true;
+            };
+
+            checkLogin();
 
             $(window).on('pageshow',function(){
                 var is_reload = sessionStorage.getItem('is_reload');