Merge branch 'talksec' of 121.43.114.153:/home/git/repositories/shopnc into talksec

mobile/templates/default/talk/homepage_room.php

@@ -142,12 +142,13 @@
            {
                if(is_app > 0 && talk_type == 'room')
                {
+                   if(room_name == '') room_name = "熊猫美妆";
                    var jsonobject = {
                        action:"view_init",
                        params: {
                            can_share:true,
-                           title:room_name,
-                           sub_title:"加入美妆群，下载熊猫美妆APP，分享故事分享红包",
+                           title:"我在"+room_name+"群里等你",
+                           sub_title:"这10000元基金必须有你的一份 加群聊 共享天猫美妆员工价",
                            img_url:room_avatar,
                            url:'<?php echo  BASE_SITE_URL . "/mobile/index.php?act=index&op=room_index&client_type=wap&talk_type=room&talk_id={$output['param']['talk_id']}"; ?>'
                        }