huangdong 6 سال پیش
والد
کامیت
1a15832a70

+ 6 - 1
data/resource/mobile/talk/js/room_apply.js

@@ -71,7 +71,7 @@ $(function () {
                     }
                 }
                 else {
-                    html += "<div class=\"weui-cell\">\n" +
+                    html += "<div class=\"weui-cell applys-item\" data-applys-id=\""+this.useObj[i].msg_id+"\">\n" +
                         "        <div class=\"weui-cell__hd\">\n" +
                         "            <img src=\"" + this.useObj[i].avatar + "\">\n" +
                         "        </div>\n" +
@@ -141,4 +141,9 @@ $(function () {
             $.toast('操作成功',1000);
         })
     });
+
+    $(document).on('click','.applys-item',function(){
+        var msg_id = $(this).attr('data-applys-id');
+        window.location.href = "/mobile/index.php?act=user_index&op=friend_apply&msg_id="+msg_id;
+    });
 });

+ 1 - 1
helper/relation/mem_relation.php

@@ -322,7 +322,7 @@ class mem_relation
     public function is_friends($other_id)
     {
         if($this->member_id == $other_id) {
-            return false;
+            return true;
         }
         return (algorithm::binary_search($this->follower,$other_id)) || (algorithm::binary_search($this->subscriber,$other_id));
     }

+ 2 - 2
mobile/control/control.php

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

+ 31 - 25
mobile/control/member_talk.php

@@ -233,6 +233,10 @@ class member_talkControl extends mbMemberControl
         return ['uids' => [$left,$right],'msgs' => $msgs];
     }
 
+    private function applysmsg($msgid,$user){
+
+    }
+
     public function create_roomOp()
     {
         $creator = session_helper::memberid();
@@ -361,14 +365,6 @@ class member_talkControl extends mbMemberControl
         $face->leave(session_helper::memberid());
         return self::outsuccess(['result' => "true"]);
     }
-    ///////////群内成员管理//////////////////////////////////////////////////////////////////////////////////////////////
-    private function room_creator($room_id)
-    {
-        $mod_room = Model('room');
-        $params = $mod_room->getRoom($room_id);
-        $rinfo = new room\room_info($params);
-        return $rinfo->creator();
-    }
 
     private function parase_location($location)
     {
@@ -382,6 +378,33 @@ class member_talkControl extends mbMemberControl
         }
     }
 
+    ///////////群内成员管理//////////////////////////////////////////////////////////////////////////////////////////////
+    private function room_creator($room_id)
+    {
+        $mod_room = Model('room');
+        $params = $mod_room->getRoom($room_id);
+        $rinfo = new room\room_info($params);
+        return $rinfo->creator();
+    }
+
+    public function room_usersOp()
+    {
+        $room_id = intval($_GET['room_id']);
+        if($room_id <= 0) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        $parts = new room\room_parts($room_id);
+        $uids = $parts->allparts([session_helper::memberid()]);
+        $members = member_info::get_members($uids);
+
+        return self::outsuccess([
+            'friends' => $uids,
+            'count' => count($uids),
+            "mem_desc" => $members,
+            'mobile_page' => mobile_page(1)]);
+    }
+
     public function inviteOp()
     {
         $room_id = intval($_GET['room_id']);
@@ -450,23 +473,6 @@ class member_talkControl extends mbMemberControl
         }
     }
 
-    public function room_usersOp()
-    {
-        $room_id = intval($_GET['room_id']);
-        if($room_id <= 0) {
-            return self::outerr(errcode::ErrParamter);
-        }
-
-        $parts = new room\room_parts($room_id);
-        $uids = $parts->allparts([session_helper::memberid()]);
-        $members = member_info::get_members($uids);
-
-        return self::outsuccess([
-            'friends' => $uids,
-            'count' => count($uids),
-            "mem_desc" => $members,
-            'mobile_page' => mobile_page(1)]);
-    }
     ///////////群详情设置/////////////////////////////////////////////////////////////////////////////////////////////////
 
     /**

+ 13 - 0
mobile/templates/default/talk/message_board.php

@@ -199,6 +199,19 @@
                 if(_length >= letter_max){
                     var input = input.substr(0,letter_max-1);
                     $(this).val(input);
+                    $(this).siblings("div").find('span').text(letter_max);
+                    $(this).siblings("div").find('span').css("color","red");
+                }
+            })
+
+            $("textarea").on('change',function () {
+                var input = $(this).val();
+                var _length = input.trim().length;
+                $(this).siblings("div").find('span').text(_length);
+                if(_length >= letter_max){
+                    var input = input.substr(0,letter_max-1);
+                    $(this).val(input);
+                    $(this).siblings("div").find('span').text(letter_max);
                     $(this).siblings("div").find('span').css("color","red");
                 }
             })