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

data/model/room.model.php

@@ -103,8 +103,8 @@ 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) {
-        return $this->table('room_msg')->field($field)->where($condition)->order($order)->limit($limit)->master($master)->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 getLastRoomMsgs($cond,$order='msg_id desc')
     {

mobile/control/member_talk.php

@@ -950,6 +950,24 @@ class member_talkControl extends mbMemberControl
         }
     }
 
+    private function state_to_str($state){
+        switch ($state){
+            case 'pending': return "申请中";
+            case '1': return "已接受";
+            case '2': return "已拒绝";
+            default : return "申请中";
+        }
+    }
+
+    private function state_to_step($state){
+        switch ($state){
+            case 'pending': return 0;
+            case '1': return "已接受";
+            case '2': return "已拒绝";
+            default : return "申请中";
+        }
+    }
+
     public function steps_homeOp(){
         return self::outsuccess(null,'talk/room_steps');
     }
@@ -1374,6 +1392,40 @@ class member_talkControl extends mbMemberControl
 
         return self::outsuccess(["applys"=>$applys,"mobile_page"=>["hasmore"=>$hasmore,"curpage"=>$this->cur_page]]);
     }
+
+    public function new_applysOp(){
+        return self::outsuccess(null,'talk/new_applys');
+    }
+
+    public function ajax_get_applysOp(){
+        $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'];
+                $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']);
+            }
+            if(count($applys) >= $per_page) $hasmore = true;
+        }
+
+        return self::outsuccess(["applys"=>$applys,"mobile_page"=>["hasmore"=>$hasmore,"curpage"=>$this->cur_page]]);
+    }
     ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
     public function room_goodsOp()
     {

mobile/templates/default/talk/message_board.php

@@ -85,15 +85,17 @@
     <script src="https://cdn.bootcss.com/jquery/1.11.0/jquery.min.js?<?php echo bonus_version(); ?>"></script>
     <script src="https://cdn.bootcss.com/jquery-weui/1.2.0/js/jquery-weui.min.js?<?php echo bonus_version(); ?>"></script>
     <script type="text/javascript">
-        var _type  = <?php echo $output['ajax_param']['type'] ?>;
         $(function () {
+            var _type  = parseInt(<?php echo $output['ajax_param']['type'] ?>);
+            var letter_max = 0;
+
             var show_page = function (_type) {
                 $(".show-page").hide();
 
                 switch (_type) {
-                    case 1:$("#page1").show();break;
-                    case 2:$("#page2").show();break;
-                    case 3:$("#page3").show();break;
+                    case 1:$("#page1").show();letter_max=30;break;
+                    case 2:$("#page2").show();letter_max=30;break;
+                    case 3:$("#page3").show();letter_max=250;break;
                     default:
 
                 }
@@ -189,6 +191,17 @@
                     $.alert('群公告不得超过250个字符');
                 }
             });
+
+            $("textarea").on('input',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').css("color","red");
+                }
+            })
         })
     </script>
 </body>

mobile/templates/default/talk/new_applys.php

@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width,initial-scale=1,user-scalable=0">
+    <title>新的申请</title>
+    <link type="text/css" rel="stylesheet"
+          href="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/css/weui.css?<?php echo bonus_version(); ?>"/>
+    <link rel="stylesheet"
+          href="https://cdn.bootcss.com/jquery-weui/1.2.0/css/jquery-weui.min.css?<?php echo bonus_version(); ?>">
+    <link type="text/css" rel="stylesheet"
+          href="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/css/room_apply.css?<?php echo bonus_version(); ?>"/>
+    <script>
+        var api_op = "ajax_get_applys";
+    </script>
+</head>
+<body>
+
+<div class="weui-cells" id="apply_list"></div>
+<div id="load_state"></div>
+
+<script src="https://cdn.bootcss.com/jquery/1.11.0/jquery.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/fastclick.js?<?php echo bonus_version(); ?>"></script>
+<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/talk/js/room_apply.js?<?php echo bonus_version(); ?>"></script>
+</body>
+</html>