huangdong 6 years ago
parent
commit
519d71b848

+ 9 - 7
data/resource/mobile/talk/js/room_steps.js

@@ -57,8 +57,8 @@ $(function () {
                     "                    <p class=\"abstract\">第"+this.listDatas.user.ranking+"名"+this.listDatas.user.steps+"步</p>" +
                     "                </div>" +
                     "                <div class=\"weui-cell__ft\">" +
-                    "                    <a href=\"Javascript:void(0);\" id='donate' class=\"weui-btn weui-btn_mini weui-btn_primary\">捐赠步数</a>" +
-                    "                    <p style='font-size: 12px;padding-top: 5px;∂∂'>本次可捐献" + app_steps + "步</p>" +
+                    "                    <a href=\"Javascript:void(0);\" id='donate' class=\"hide weui-btn weui-btn_mini weui-btn_primary\">捐赠步数</a>" +
+                    "                    <p id='donate-steps' style='font-size: 12px;padding-top: 5px;'></p>" +
                     "                </div>" +
                     "            </div>";
                 $('#mine_ranking').append(mine_sport);
@@ -89,17 +89,19 @@ $(function () {
     var jsInit = {
         action:"read_steps"
     };
+
+    var roomSportList = new RoomSportList({act:"member_talk",op:"room_steps"},"#room_steps_list","#load_state",true);
+    roomSportList.init();
+
     bridge.call_native_handler('on_native_click', JSON.stringify(jsInit),function(res){
         var datas = JSON.parse(res);
         app_steps = datas.now;
+        $('#donate').removeClass('hide');
+        $("#donate-steps").text("本次可捐献" + app_steps + "步");
     });
 
-
-    var roomSportList = new RoomSportList({act:"member_talk",op:"ajax_room_steps"},"#room_steps_list","#load_state",true);
-    roomSportList.init();
-
-
     $("#mine_ranking").on('click', "#donate",function () {
+        if($(this).hasClass('hide')) return;
         var todaySport = app_steps;
         var room_id = getHrefArguments('talk_id');
         $.confirm({

+ 3 - 1
helper/room/tpl_group_home.php

@@ -111,10 +111,12 @@ class tpl_group_home
                         </a>
                     </div>
                     <div class=\"weui-flex__item group_goods\">
+                         <a href=\"/mobile/index.php?act=member_talk&op=steps_detail&talk_id={$this->room_id}\">
                         <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=room_steps&talk_id={$this->room_id}\">
+                        <a href=\"/mobile/index.php?act=member_talk&op=steps_home&talk_id={$this->room_id}\">
                             <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/group_sport.png\" alt=\"\">
                         </a>
                     </div>";

+ 2 - 2
mobile/control/control.php

@@ -311,9 +311,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018083005";
+    return "v=2018083006";
 }
 function shop_version()
 {
-    return "v=2018083005";
+    return "v=2018083006";
 }

+ 2 - 15
mobile/control/member_talk.php

@@ -943,11 +943,11 @@ class member_talkControl extends mbMemberControl
     }
 
     ///////////////////////////////////////////////
-    public function room_stepsOp(){
+    public function steps_homeOp(){
         return self::outsuccess(null,'talk/room_steps');
     }
 
-    public function ajax_room_stepsOp()
+    public function room_stepsOp()
     {
         try
         {
@@ -1263,19 +1263,6 @@ class member_talkControl extends mbMemberControl
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-    public function friend_detailOp()
-    {
-        $userid = intval($_GET['userid']);
-        if(!isset($userid) || empty($userid)){
-            return self::outerr("参数有误");
-        }
-
-        $member = new member_info($userid);
-        $info   = $member->filter();
-
-        return self::outsuccess($info);
-    }
-
     public function add_friendsOp()
     {
         $userid = intval($_GET['userid']);

+ 4 - 1
mobile/templates/default/talk/room_steps.php

@@ -93,6 +93,9 @@
             color: #000000;
             background-color: #ffffff;
         }
+        .hide {
+            opacity: 0.4;
+        }
     </style>
 </head>
 <body>
@@ -108,8 +111,8 @@
 <script src="https://cdn.bootcss.com/jquery-weui/1.2.0/js/jquery-weui.min.js?<?php echo bonus_version(); ?>"></script>
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/utility.js?<?php echo bonus_version(); ?>"></script>
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/js/talk_room.js?<?php echo bonus_version(); ?>"></script>
+<script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/new_bridge.js?<?php echo bonus_version(); ?>"></script>
 <script src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/js/room_steps.js?<?php echo bonus_version(); ?>"></script>
-<script type="text/javascript" src="<?php echo RESOURCE_SITE_URL; ?>/mobile/comm/new_bridge.js?<?php echo bonus_version(); ?>"></script>
 </body>
 </html>