huangdong 6 years ago
parent
commit
167b206cce
2 changed files with 20 additions and 15 deletions
  1. 3 3
      mobile/control/index.php
  2. 17 12
      mobile/templates/default/talk/homepage_room.php

+ 3 - 3
mobile/control/index.php

@@ -121,7 +121,7 @@ class indexControl extends specialControl
         $is_app = session_helper::isapp();
         $is_app = session_helper::isapp();
         $from_wechat = util::from_wechat();
         $from_wechat = util::from_wechat();
         $user = session_helper::memberid();
         $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)];
+        $param = ["talk_type" => $talk_type, "talk_id"   => $talk_id , "member_id" => $user,"room_name"=>"","room_avatar"=>"","relay_id"=>$relay_id,"is_app"=>intval($is_app)];
 
 
         //app内打开请求授权登录
         //app内打开请求授权登录
         if(($is_app || !$from_wechat) && $user<= 0)
         if(($is_app || !$from_wechat) && $user<= 0)
@@ -150,8 +150,8 @@ class indexControl extends specialControl
             $room_id = $talk_id;
             $room_id = $talk_id;
             try {
             try {
                 $tpl = new room\tpl_group_home($user,$talk_id,$relay_id);
                 $tpl = new room\tpl_group_home($user,$talk_id,$relay_id);
-                $room_name = $tpl->get_room_info()->name();
-                $param["room_name"] = $room_name;
+                $param["room_name"] = $tpl->get_room_info()->name();
+                $param["room_avatar"] = $tpl->get_room_info()->avatar();
                 return self::outsuccess(['tpl' => $tpl,"param" => $param],'talk/homepage_room');
                 return self::outsuccess(['tpl' => $tpl,"param" => $param],'talk/homepage_room');
             } catch (Exception $ex) {
             } catch (Exception $ex) {
                 Log::record("member_talk.room_detail error: room_id={$room_id} user={$user}",Log::ERR);
                 Log::record("member_talk.room_detail error: room_id={$room_id} user={$user}",Log::ERR);

+ 17 - 12
mobile/templates/default/talk/homepage_room.php

@@ -107,10 +107,13 @@
             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 room_name = '<?php echo $output['param']['room_name'];  ?>';
+            var room_avatar = '<?php echo $output['param']['room_avatar'];  ?>';
+
             var jsBridge = new Bridge();
             var jsBridge = new Bridge();
 
 
             var checkLogin = function (){
             var checkLogin = function (){
-                if(cur_mid <= 0) {
+                if(is_app && cur_mid <= 0) {
                     jsBridge.call_native_handler('on_native_click', '{"action":"login"}', function (data) {
                     jsBridge.call_native_handler('on_native_click', '{"action":"login"}', function (data) {
                         var jsdata = JSON.parse(data);
                         var jsdata = JSON.parse(data);
                         if (!jsdata.login) {
                         if (!jsdata.login) {
@@ -136,17 +139,19 @@
             });
             });
 
 
            function share_btn(){
            function share_btn(){
-                var jsonobject = {
-                    action:"view_init",
-                    params: {
-                        can_share:true,
-                        title:title,
-                        sub_title:sub_title,
-                        img_url:img_url,
-                        url:url
-                    }
-                };
-                call_native_handler('on_native_click',JSON.stringify(jsonobject));
+               if(is_app && talk_type =='room') {
+                   var jsonobject = {
+                       action:"view_init",
+                       params: {
+                           can_share:true,
+                           title:room_name,
+                           sub_title:"加入美妆群,下载熊猫美妆APP,分享故事分享红包",
+                           img_url:room_avatar,
+                           url:'<?php echo  BASE_SITE_URL . "/mobile/index.php?act=index&op=room_invite&client_type=ajax&room_id={$output['param']['talk_id']}"; ?>'
+                       }
+                   };
+                   call_native_handler('on_native_click',JSON.stringify(jsonobject));
+               }
             }
             }
 
 
             if($('#add_group_pwd').length > 0 || $('#add_group_apply').length > 0 || $('#add_group').length > 0) {
             if($('#add_group_pwd').length > 0 || $('#add_group_apply').length > 0 || $('#add_group').length > 0) {