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

data/model/room.model.php

@@ -103,8 +103,13 @@ class roomModel extends Model
         return $this->table('room_msg')->field('*')->where(['room_id' => $room_id, 'type' => $msg_type])->order('add_time desc')->select();
     }
 
-    public function getRoomsgList($condition, $limit = false, $field = '*', $order = 'msg_id desc',$master = false,$page = false) {
-        return $this->table('room_msg')->field($field)->where($condition)->page($page)->order($order)->limit($limit)->master($master)->select();
+    public function getRoomsgList($condition, $limit = false, $field = '*', $order = 'msg_id desc',$master = false) {
+        return $this->table('room_msg')->field($field)->where($condition)->order($order)->limit($limit)->master($master)->select();
+    }
+    public function getMssage($cond)
+    {
+        return $this->table('room_msg')->field('*')->where($cond)->select();
+
     }
     public function getLastRoomMsgs($cond,$order='msg_id desc')
     {

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

@@ -1,15 +1,19 @@
 $(function () {
     FastClick.attach(document.body);
 
-    var ApplyList = function () {
+    var ApplyList = function ()
+    {
         RoomList.apply(this,arguments);
-        this.droploadCallback = function(res){
+        this.droploadCallback = function(res)
+        {
             var applyList = JSON.parse(res);
             console.log(applyList);
+
             if (applyList.code != 200) {
                 $.alert(applyList.message);
                 return;
             }
+
             var applyHTML = new ApplyHTML(applyList.datas.applys);
             applyHTML.appendHTML(this.append_el);
             if (applyList.datas.mobile_page.hasmore) {

helper/room_helper.php

@@ -88,6 +88,18 @@ class room_helper
 
         return false;
     }
+    public static function message($msgid)
+    {
+        if($msgid <= 0) return false;
+
+        $mod_room = Model('room');
+        $items = $mod_room->getMssage(['msg_id' => $msgid]);
+        foreach ($items as $item) {
+            return $item;
+        }
+
+        return false;
+    }
 
     public static function avatarts($uids)
     {

mobile/control/bonusex.php

@@ -109,6 +109,7 @@ class bonusexControl extends mobileControl
                         'binded_info' => $binded_info,
                         'avatars' => $avatars,
                         'summarys' => $summarys,
+                        'mineid' => session_helper::memberid(),
                         'pricecalc_obj' => $this->price_calcer()];
 
             if($bonus->isBinded() || $isMineType)
@@ -153,6 +154,7 @@ class bonusexControl extends mobileControl
                         'binded_info' => $binded_info,
                         'avatars' => $avatars,
                         'summarys' => $summarys,
+                        'mineid' => session_helper::memberid(),
                         'pricecalc_obj' => $this->price_calcer(),
                         'bonus_state' => 'detail'],
                         'bonus/detail');
@@ -194,6 +196,7 @@ class bonusexControl extends mobileControl
             'avatars' => $avatars,
             'summarys' => $summarys,
             'pricecalc_obj' => $this->price_calcer(),
+            'mineid' => session_helper::memberid(),
             'bonus_state' => 'detail'],
             'bonus/detail');
     }
@@ -230,6 +233,7 @@ class bonusexControl extends mobileControl
                     'binded_info' => $binded_info,
                     'avatars' => $avatars,
                     'summarys' => $summarys,
+                    'mineid' => session_helper::memberid(),
                     'pricecalc_obj' => $this->price_calcer(),'bonus_state' => 'detail'],
                     "bonus/detail");
             }
@@ -253,6 +257,7 @@ class bonusexControl extends mobileControl
                             'binded_info' => $binded_info,
                             'avatars' => $avatars,
                             'summarys' => $summarys,
+                            'mineid' => session_helper::memberid(),
                             'pricecalc_obj' => $this->price_calcer(),'bonus_state' => 'detail'],
                             "bonus/detail");
                     }
@@ -308,6 +313,7 @@ class bonusexControl extends mobileControl
                             'binded_info' => $binded_info,
                             'avatars' => $avatars,
                             'summarys' => $summarys,
+                            'mineid' => session_helper::memberid(),
                             'pricecalc_obj' => $this->price_calcer(),'bonus_state' => 'detail'];
                         return self::outsuccess($data,"bonus/detail");
                     } else {

mobile/control/member_talk.php

@@ -1308,8 +1308,7 @@ class member_talkControl extends mbMemberControl
         $relay_id = intval($_GET['relay_id']);
         $isManager = intval($_GET['isManager']);
 
-        if(empty($type))
-        {
+        if(empty($type)) {
             return self::outerr(errcode::ErrParamter,"打开页面失败");
         }
 
@@ -1331,33 +1330,27 @@ class member_talkControl extends mbMemberControl
             default:
                 $ajax_param = [];
         }
-        return self::outsuccess(["ajax_param"=>$ajax_param],'/talk/message_board');
+
+        return self::outsuccess(["ajax_param"=>$ajax_param],'talk/message_board');
     }
 
     public function add_friendsOp()
     {
-        $member = session_helper::memberid();
-        $viewer = intval($_GET['user']);
+        $user = intval($_GET['user']);
         $msg    = trim($_GET['msg']);
 
-        if($viewer <= 0 ){
+        if($user <= 0 ){
             return self::outerr(errcode::ErrRelation,"发送失败");
         }
 
-        $talks_helper = new room\talks_helper();
-        $mine_friends = $talks_helper->friends($member);
-        if(in_array($viewer ,$mine_friends)) {
-            return self::outerr(errcode::ErrRelation,"你们已经是好友拉");
-        }
+        $relateion = new relation\mem_relation(session_helper::memberid());
+        $isfriend =  $relateion->is_friends($user);
 
-        $mod_room = Model('room');
-        $res = $mod_room->addApply(0,$member,$msg,$viewer);
-
-        if($res){
-            return self::outsuccess(null);
-        } else {
-            return self::outerr(errcode::ErrDB,"发送失败");
+        if($isfriend == false) {
+            room\pusher::instance()->apply_friend(session_helper::memberid(),$user,$msg);
         }
+
+        return self::outsuccess(null);
     }
 
     public function friends_applyOp()
@@ -1398,30 +1391,26 @@ class member_talkControl extends mbMemberControl
         $mod_room = Model('room');
         $member = session_helper::memberid();
 
-        $hasmore = false;
-        $per_page = 20;
-        $applys = $mod_room->getRoomsgList(['member_id'=>$member,"type"=>52],$per_page, '*','msg_id desc',$master = false,$per_page);
-        if(!empty($applys)){
-            foreach ($applys as $k => $apply)
-            {
-//                $info = new member_info($apply['member_id']);
-//                $member = $info->filter();
-//                $applys[$k]['avatar'] = $member['avatar'];
-//                $applys[$k]['is_man'] = $member['is_man'];
-//                $applys[$k]['nickname'] = $member['nickname'];
+        $items = $mod_room->getRoomsgList(['member_id'=>$member,"type" => proto_type::msg_type_apply],$this->page_size());
+        if(!empty($items))
+        {
+            foreach ($items as $k => $apply) {
                 $orgmsg = json_decode($apply['orgmsg'],true);
-                $applys[$k]['type'] = $orgmsg['type'];
-                $applys[$k]['userid']  = $orgmsg['from']['userid'];
-                $applys[$k]['nickname'] = $orgmsg['from']['nickname'];
-                $applys[$k]['avatar']   = $orgmsg['from']['avatar'];
-                $applys[$k]['content']  = $orgmsg['note'];
-                $applys[$k]['state']    = $this->state_to_str($orgmsg['state']);
-                $applys[$k]['step']     = $this->state_to_step($orgmsg['state']);
+                $items[$k]['type'] = $orgmsg['type'];
+                $items[$k]['userid']  = $orgmsg['from']['userid'];
+                $items[$k]['nickname'] = $orgmsg['from']['nickname'];
+                $items[$k]['avatar']   = $orgmsg['from']['avatar'];
+                $items[$k]['content']  = $orgmsg['note'];
+                $items[$k]['state']    = $this->state_to_str($orgmsg['state']);
+                $items[$k]['step']     = $this->state_to_step($orgmsg['state']);
             }
-            if(count($applys) >= $per_page) $hasmore = true;
+            $hasmore = count($items) < $this->page_size() ? false : true;
+        }
+        else {
+            $hasmore = false;
         }
 
-        return self::outsuccess(["applys"=>$applys,"mobile_page"=>["hasmore"=>$hasmore,"curpage"=>$this->cur_page]]);
+        return self::outsuccess(["applys"=>$items,"mobile_page" => ["hasmore" => $hasmore,"curpage" => $this->page_no()]]);
     }
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function room_goodsOp()

mobile/control/user_index.php

@@ -79,26 +79,26 @@ class user_indexControl extends mobileHomeControl
         }
         else
         {
-            return $this->open_page($idolid,'来自二维码');
+            return $this->open_page($idolid,['from_type' => '来自二维码']);
         }
     }
 
-
-    private function open_page($idolid,$from,$scene="")
+    private function open_page($idolid,$output = [])
     {
         $minfo = new member_info($idolid);
         $relateion = new relation\mem_relation(session_helper::memberid());
         $isfriend =  $relateion->is_friends($idolid);
-        if($scene != 'applyer') {
+        if($output['scene'] != 'applyer') {
             if(!$isfriend) {
-                $scene = 'stranger';
+                $output['scene'] = 'stranger';
             } else {
-                $scene = 'friends';
+                $output['scene'] = 'friends';
             }
         }
+        $output['member_info'] = $minfo->filter();
+        $output['is_friend'] = $isfriend;
 
-        return self::outsuccess(['scene' => $scene,'member_info' => $minfo->filter(),'is_friend' => $isfriend,'from_type' => $from],
-            "member/index",'wap');
+        return self::outsuccess($output,"member/index",'wap');
     }
 
     /**
@@ -115,8 +115,13 @@ class user_indexControl extends mobileHomeControl
         if($idolid <= 0) {
             return self::outerr(errcode::ErrParamter);
         }
+        $from = $this->room_name($_GET['room_id']);
+
+        return $this->open_page($idolid,['from_type' => $from]);
+    }
 
-        $room_id = $_GET['room_id'];
+    private function room_name($room_id)
+    {
         if($room_id > 0)
         {
             $room = room_helper::room($room_id);
@@ -132,7 +137,7 @@ class user_indexControl extends mobileHomeControl
             $from = '来自于聊天';
         }
 
-        return $this->open_page($idolid,$from);
+        return $from;
     }
 
     /**
@@ -145,12 +150,18 @@ class user_indexControl extends mobileHomeControl
             return self::outerr(errcode::ErrUnLogin);
         }
         $msg_id = $_GET['msg_id'];
-        $idolid = "";$from = "";
+        $item = room_helper::message($msg_id);
+        if($item == false) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        $msg = json_decode($item['orgmsg'],true);
+        $idolid = $msg['from']['userid'];
         if($idolid <= 0) {
             return self::outerr(errcode::ErrParamter);
         }
 
-        return $this->open_page($idolid,$from,"applyer");
+        return $this->open_page($idolid,['from_type' => '来自于好友申请','scene' => 'applyer','note' => $msg['note']]);
     }
 
 
@@ -172,12 +183,19 @@ class user_indexControl extends mobileHomeControl
         if(!session_helper::logined()) {
             return self::outerr(errcode::ErrUnLogin);
         }
-        $idolid = $_GET['member_id'];
+        $msg_id = $_GET['msg_id'];
+        $item = room_helper::message($msg_id);
+        if($item == false) {
+            return self::outerr(errcode::ErrParamter);
+        }
+
+        $msg = json_decode($item['orgmsg'],true);
+        $idolid = $msg['from']['userid'];
         if($idolid <= 0) {
             return self::outerr(errcode::ErrParamter);
         }
 
-        return $this->open_page($idolid,"");
+        return $this->open_page($idolid,['from_type' => '来自于好友申请','scene' => 'applyer','note' => $msg['note']]);
     }
 }
 

mobile/templates/default/member/index.php

@@ -85,8 +85,8 @@
         <div class="weui-cells">
             <div class="live_message">
                 <p>
-                    <?php echo $output['member_info']['nickname']; ?>:
-                    <span class="live_msg">你好,你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好你好</span>
+                    留言:
+                    <span class="live_msg"><?php echo $output['note']; ?></span>
                 </p>
             </div>
         </div>