debubg

data/resource/mobile/talk/js/room_apply.js

@@ -48,7 +48,8 @@ $(function () {
                     var _title = '<h3 class="title">入群申请</h3>';
                 }
 
-                if(this.useObj[i].type == 'cert_notice') {
+                if(this.useObj[i].type == 'cert_notice')
+                {
                     if(this.useObj[i].state == 1){
                         html += "<div class=\"weui-cell_state\">\n" + _title +
                             "       <div class=\"weui-cell\">\n" +
@@ -76,7 +77,55 @@ $(function () {
                     }else{
 
                     }
-                } else {
+                }
+                else if(this.useObj[i].type == 'apply_friend')
+                {
+                    if(this.useObj[i].state == 1)
+                    {
+                        html += "<div class=\"weui-cell_state\">\n" + _title +
+                            "       <div class=\"weui-cell\">\n" +
+                            "           <div class=\"weui-cell__hd\">\n" +
+                            "               <img src=\""+this.useObj[i].avatar+"\">\n" +
+                            "           </div>\n" +
+                            "           <div class=\"weui-cell__bd\">\n" +
+                            "               <p class=\"apply_name\"><span>"+this.useObj[i].nickname+"</span><span class=\"state\">已通过</span></p>\n" +
+                            "               <p class=\"abstract\">留言："+ this.useObj[i].content+"</p>\n" +
+                            "           </div>\n" +
+                            "       </div>\n" +
+                            "   </div>";
+                    }else if(this.useObj[i].state == 2)
+                    {
+                        html += "<div class=\"weui-cell_state\">\n"  + _title +
+                            "       <div class=\"weui-cell\">\n" +
+                            "           <div class=\"weui-cell__hd\">\n" +
+                            "               <img src=\""+this.useObj[i].avatar+"\">\n" +
+                            "           </div>\n" +
+                            "           <div class=\"weui-cell__bd\">\n" +
+                            "               <p class=\"apply_name\"><span>"+this.useObj[i].nickname+"</span><span class=\"state\">已忽略</span></p>\n" +
+                            "               <p class=\"abstract\">留言："+ this.useObj[i].content+"</p>\n" +
+                            "           </div>\n" +
+                            "       </div>\n" +
+                            "   </div>";
+                    } else {
+                        html += "  <div class=\"weui-cell_box applys-item\" data-applys-id=\""+this.useObj[i].msg_id+"\">\n"  + _title +
+                            "        <div class=\"weui-cell\">\n" +
+                            "            <div class=\"weui-cell__hd\">\n" +
+                            "                <img src=\""+this.useObj[i].avatar+"\">\n" +
+                            "            </div>\n" +
+                            "            <div class=\"weui-cell__bd\">\n" +
+                            "                <p class=\"apply_name\">"+this.useObj[i].nickname+"</p>\n" +
+                            "                <p class=\"abstract\">留言："+this.useObj[i].content+"</p>\n" +
+                            "            </div>\n" +
+                            "        </div>\n" +
+                            "        <div class=\"handle\">\n" +
+                            "            <span class=\"agree_btn\" data-msg-id=\"" + this.useObj[i].msg_id + "\">通过</span>\n" +
+                            "            <span class=\"refusal_btn\" data-msg-id=\"" + this.useObj[i].msg_id + "\">忽略</span>\n" +
+                            "        </div>\n" +
+                            "    </div>"
+                    }
+                }
+                else
+                {
                     if(this.useObj[i].state == 1)
                     {
                         html += "<div class=\"weui-cell_state\">\n" + _title +
@@ -143,10 +192,12 @@ $(function () {
                 return;
             }
             $.toast('操作成功',1000);
-        })
+            window.location.reload();
+        });
+        return false;
     });
 
-    $(document).on('click','.agree_btn',function()
+    $(document).on('click','.agree_btn',function(e)
     {
         var msg_id = $(this).attr('data-msg-id');
         $.showLoading();
@@ -164,7 +215,10 @@ $(function () {
                 return;
             }
             $.toast('操作成功',1000);
+
+            window.location.reload();
         });
+        return false;
     });
 
     $(document).on('click','.applys-item',function(){

mobile/control/control.php

@@ -325,9 +325,9 @@ class mbMemberControl extends mobileControl
 
 function bonus_version()
 {
-    return "v=2018091203";
+    return "v=2018091204";
 }
 function shop_version()
 {
-    return "v=2018091203";
+    return "v=2018091204";
 }

mobile/control/user_index.php

@@ -93,15 +93,11 @@ class user_indexControl extends mobileHomeControl
             $relation = new relation\mem_relation($member_id);
             $isfriend = $relation->is_friends($idolid);
 
-            if($output['scene'] != 'applyer')
+            if(strpos($output['scene'],'applyer') === false)
             {
                 $output['scene'] = $isfriend ? 'friends' : 'stranger';
             }
 
-//            $output['is_self'] = false;
-//            $isfriend = true;
-//            $output['scene'] = 'friends';
-
             $minfo = new member_info($idolid);
             $output['member_info'] = $minfo->filter();
             $output['is_friend'] = $isfriend;
@@ -177,7 +173,14 @@ class user_indexControl extends mobileHomeControl
             return self::outerr(errcode::ErrParamter);
         }
 
-        return $this->open_page($idolid,['from_type' => '来自于好友申请','scene' => 'applyer','note' => $msg['note'],"msg_id"=>$msg_id]);
+        if($msg['type'] == 'apply_friend') {
+            return $this->open_page($idolid,['from_type' => "来自于好友申请",'scene' => 'friend_applyer','note' => $msg['note'],"msg_id"=>$msg_id]);
+        } elseif($msg['type'] == 'apply_room') {
+            $room = room_helper::room($msg['room_id']);
+            return $this->open_page($idolid,['from_type' => "来自于入群申请",'scene' => 'room_applyer','note' => $msg['note'],"msg_id"=>$msg_id,"room_name"=>util::ellipsis($room->name())]);
+        } else {
+            return self::outerr(errcode::ErrParamter);
+        }
     }
 
 

mobile/templates/default/member/index.php

@@ -95,7 +95,7 @@
                id="add" data-member-id="<?php echo $output['member_info']['member_id'];  ?>">添加为好友</a>
         </div>
     </div>
-<?php }elseif($output['scene'] == 'applyer'){ ?>
+<?php }elseif($output['scene'] == 'friend_applyer'){ ?>
 <!-- 好友申请 -->
     <div>
         <div class="weui-cells">
@@ -130,6 +130,41 @@
             <a class="weui-btn weui-btn_default submit" href="javascript:" data-msg-id="<?php echo $output['msg_id']; ?>" id="refuse_btn">忽略申请</a>
         </div>
     </div>
+<?php }elseif($output['scene'] == 'room_applyer'){ ?>
+<!-- 入群申请 -->
+    <div>
+        <div class="weui-cells">
+            <div class="live_message">
+                <p>
+                    留言:
+                    <span class="live_msg"><?php echo $output['note']; ?></span>
+                </p>
+            </div>
+        </div>
+        <div class="weui-cells apply_info">
+            <div class="weui-cell">
+                <div class="weui-cell__bd">
+                    <p>请求加入群聊</p>
+                </div>
+                <div class="weui-cell__ft cell_ft">
+                    <p><?php echo $output['room_name']; ?></p>
+                </div>
+            </div>
+            <div class="weui-cell">
+                <div class="weui-cell__bd">
+                    <p>来源</p>
+                </div>
+                <div class="weui-cell__ft cell_ft">
+                    <p><?php echo $output['from_type']; ?></p>
+                </div>
+            </div>
+        </div>
+
+        <div class="weui-btn-area">
+            <a class="weui-btn weui-btn_primary submit" href="javascript:" data-msg-id="<?php echo $output['msg_id']; ?>" id="pass_verify_btn">通过验证</a>
+            <a class="weui-btn weui-btn_default submit" href="javascript:" data-msg-id="<?php echo $output['msg_id']; ?>" id="refuse_btn">忽略申请</a>
+        </div>
+    </div>
 <?php }elseif($output['scene'] == 'friends'){ ?>
 <!-- 好友详情  -->
     <div>

mobile/templates/default/talk/steps_detail.php

@@ -216,6 +216,11 @@
 
         $('.donate').on('click',function(){
             var room_id = $(this).attr('data-roomId');
+
+            if(app_steps <= 0) {
+                $.alert("目前没有可捐赠的步数 赶紧动一动吧");
+                return;
+            }
             $.confirm({
                 title: '步数捐赠',
                 text: '确定将您的步数捐赠到该群？',