stanley-king 6 年之前
父节点
当前提交
5da9379ed3

+ 4 - 1
data/resource/mobile/talk/css/free_gifts.css

@@ -108,6 +108,9 @@ a:visited{
     color: #b87e59;
     color: #b87e59;
 }
 }
 .profit_unit {
 .profit_unit {
+    display: inline-block;
+    line-height: 50px;
+    margin-left: 6px;
     font-size: 20px;
     font-size: 20px;
     color: #b87e59;
     color: #b87e59;
     vertical-align: text-bottom;
     vertical-align: text-bottom;
@@ -198,7 +201,7 @@ a:visited{
 .tips_count {
 .tips_count {
     position: absolute;
     position: absolute;
     left: 0;
     left: 0;
-    top: 2px;
+    top: 1px;
     width: 17px;
     width: 17px;
     height: 17px;
     height: 17px;
     line-height: 18px;
     line-height: 18px;

二进制
data/resource/mobile/talk/images/gifts_cover.png


+ 14 - 5
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/util_helper.php');
 require_once (BASE_ROOT_PATH . '/helper/relation_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/session_helper.php');
+require_once (BASE_ROOT_PATH . '/helper/schema_helper.php');
+
 use relation\mem_relation;
 use relation\mem_relation;
 use Exception;
 use Exception;
 use url_helper;
 use url_helper;
 use author_url;
 use author_url;
 use util;
 use util;
 use session_helper;
 use session_helper;
+use schema_helper;
 
 
 class tpl_group_home
 class tpl_group_home
 {
 {
@@ -125,23 +128,29 @@ class tpl_group_home
         if(isset($this->participants[$this->cur_user])){
         if(isset($this->participants[$this->cur_user])){
             $isManager = $this->isManager($this->cur_user) ? 1 : 0;
             $isManager = $this->isManager($this->cur_user) ? 1 : 0;
             $notice = empty($this->room_info->notice()) ? 0 : 1;
             $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\">
             $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=\"\">
                             <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_bonus.png\" alt=\"\">
                         </a>
                         </a>
                     </div>
                     </div>
                     <div class=\"weui-flex__item group_notice\">
                     <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=\"\">
                         <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_notice.png\" alt=\"\">
                         </a>
                         </a>
                     </div>
                     </div>
                     <div class=\"weui-flex__item group_goods\">
                     <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=\"\">
                         <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_goods.png\" alt=\"\">
                         </a>
                         </a>
                     </div>
                     </div>
                     <div class=\"weui-flex__item group_sport\">
                     <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=\"\">
                             <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_sport.png\" alt=\"\">
                         </a>
                         </a>
                     </div>";
                     </div>";
@@ -580,7 +589,7 @@ class tpl_group_home
     private function room_share_btn(){
     private function room_share_btn(){
         $html = "<div class=\"weui-cell\" id='room_share_btn'>
         $html = "<div class=\"weui-cell\" id='room_share_btn'>
                                 <div class=\"weui-cell__bd\">
                                 <div class=\"weui-cell__bd\">
-                                    <p>邀请入群</p>
+                                    <p>邀请入群(微信、qq)</p>
                                 </div>
                                 </div>
                         </div>";
                         </div>";
         return $html;
         return $html;

+ 1 - 1
mobile/control/control.php

@@ -329,5 +329,5 @@ function bonus_version()
 }
 }
 function shop_version()
 function shop_version()
 {
 {
-    return "v=2018092002";
+    return "v=2018092003";
 }
 }

+ 2 - 2
mobile/index.php

@@ -9,5 +9,5 @@ define('APP_ID','mobile');
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 define('BASE_PATH',str_replace('\\','/',dirname(__FILE__)));
 
 
 ////框架扩展
 ////框架扩展
-require_once (BASE_PATH.'/framework/function/function.php');
-require_once (BASE_PATH.'/control/control.php');
+require_once (BASE_PATH . '/framework/function/function.php');
+require_once (BASE_PATH . '/control/control.php');

+ 2 - 1
mobile/templates/default/talk/homepage_room.php

@@ -756,7 +756,8 @@
                 var has_notice = parseInt($(this).attr('data-has-notice'));
                 var has_notice = parseInt($(this).attr('data-has-notice'));
                 var ismanager  = parseInt($(this).attr('data-ismanager'));
                 var ismanager  = parseInt($(this).attr('data-ismanager'));
                 if( has_notice || 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{
                 }else{
                     $.alert("只有群主可以编辑公告");
                     $.alert("只有群主可以编辑公告");
                     return false;
                     return false;

+ 1 - 1
mobile/templates/default/talk/school_certs.php

@@ -27,7 +27,7 @@
         <div class="weui-cells">
         <div class="weui-cells">
             <div class="weui-cell">
             <div class="weui-cell">
                 <div class="weui-cell__bd">
                 <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>
             </div>
         </div>
         </div>