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

helper/room/tpl_group_home.php

@@ -13,12 +13,15 @@ require_once(BASE_ROOT_PATH . '/helper/url_helper.php');
 require_once(BASE_ROOT_PATH . '/helper/util_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/relation_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/session_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/schema_helper.php');
+
 use relation\mem_relation;
 use Exception;
 use url_helper;
 use author_url;
 use util;
 use session_helper;
+use schema_helper;
 
 class tpl_group_home
 {
@@ -125,23 +128,29 @@ class tpl_group_home
         if(isset($this->participants[$this->cur_user])){
             $isManager = $this->isManager($this->cur_user) ? 1 : 0;
             $notice = empty($this->room_info->notice()) ? 0 : 1;
+
+            $share_bonus_schema  = schema_helper::openurl("共享基金",BASE_SITE_URL."/mobile/index.php?act=member_talk&op=share_bonus&room_id={$this->room_id}");
+            $group_notice_schema = schema_helper::openurl("群公告" ,BASE_SITE_URL."/mobile/index.php?act=member_talk&op=message_board&type=3&isManager={$isManager}&talk_id={$this->room_id}");
+            $group_goods_schema  = schema_helper::openurl("群商品" ,BASE_SITE_URL."/mobile/index.php?act=member_talk&op=room_goods&talk_id={$this->room_id}");
+            $group_sport_schema  = schema_helper::openurl("群运动" ,BASE_SITE_URL."/mobile/index.php?act=member_talk&op=steps_home&talk_id={$this->room_id}");
+
             $html.="<div class=\"weui-flex__item group_bonus\">
-                        <a href=\"/mobile/index.php?act=member_talk&op=share_bonus&room_id={$this->room_id}\">
+                        <a href=\"{$share_bonus_schema}\">
                             <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_bonus.png\" alt=\"\">
                         </a>
                     </div>
                     <div class=\"weui-flex__item group_notice\">
-                         <a id=\"view-group-notice\" data-has-notice={$notice} data-isManager={$isManager} href=\"javascript:void(0);\">
+                         <a id=\"view-group-notice\" data-has-notice={$notice} data-isManager={$isManager} data-schema=\"{$group_notice_schema}\" href=\"javascript:void(0);\">
                         <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_notice.png\" alt=\"\">
                         </a>
                     </div>
                     <div class=\"weui-flex__item group_goods\">
-                         <a href=\"/mobile/index.php?act=member_talk&op=room_goods&talk_id={$this->room_id}\">
+                         <a href=\"{$group_goods_schema}\">
                         <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_goods.png\" alt=\"\">
                         </a>
                     </div>
                     <div class=\"weui-flex__item group_sport\">
-                        <a href=\"/mobile/index.php?act=member_talk&op=steps_home&talk_id={$this->room_id}\">
+                        <a href=\"$group_sport_schema\">
                             <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_sport.png\" alt=\"\">
                         </a>
                     </div>";
@@ -580,7 +589,7 @@ class tpl_group_home
     private function room_share_btn(){
         $html = "<div class=\"weui-cell\" id='room_share_btn'>
                                 <div class=\"weui-cell__bd\">
-                                    <p>邀请入群</p>
+                                    <p>邀请入群（微信、qq）</p>
                                 </div>
                         </div>";
         return $html;

mobile/templates/default/talk/homepage_room.php

@@ -149,7 +149,7 @@
                            title:room_name,
                            sub_title:"加入美妆群，下载熊猫美妆APP，分享故事分享红包",
                            img_url:room_avatar,
-                           url:'<?php echo  BASE_SITE_URL . "/mobile/index.php?act=index&op=room_index&client_type=wap&room_id={$output['param']['talk_id']}"; ?>'
+                           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']}"; ?>'
                        }
                    };
                    jsBridge.call_native_handler('on_native_click',JSON.stringify(jsonobject));
@@ -166,7 +166,7 @@
                             title:room_name,
                             sub_title:"加入美妆群，下载熊猫美妆APP，分享故事分享红包",
                             img_url:room_avatar,
-                            url:'<?php echo  BASE_SITE_URL . "/mobile/index.php?act=index&op=room_index&client_type=wap&room_id={$output['param']['talk_id']}"; ?>'
+                            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']}"; ?>'
                         }
                     };
                     jsBridge.call_native_handler('on_native_click',JSON.stringify(jsonobject));
@@ -756,7 +756,8 @@
                 var has_notice = parseInt($(this).attr('data-has-notice'));
                 var ismanager  = parseInt($(this).attr('data-ismanager'));
                 if( has_notice || ismanager){
-                    window.location.href = "/mobile/index.php?act=member_talk&op=message_board&type=3&isManager="+ismanager+"&talk_id="+talk_id;
+                    var schema = $(this).attr("data-schema");
+                    window.location.href = schema;
                 }else{
                     $.alert("只有群主可以编辑公告");
                     return false;

mobile/templates/default/talk/school_certs.php

@@ -27,7 +27,7 @@
         <div class="weui-cells">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
-                    <input class="weui-input" data-label="机构全称" name="full_name" type="text" placeholder="学校全称+机构全称，如：上海交通大学经管系学生会" value="<?php echo $output['cert']['full_name'];?>">
+                    <input class="weui-input" data-label="机构全称" name="full_name" type="text" placeholder="学校/机构全称，如：上海交通大学经管系学生会" value="<?php echo $output['cert']['full_name'];?>">
                 </div>
             </div>
         </div>