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

helper/room/util.php

@@ -400,12 +400,14 @@ class talks_helper
         if($room_id <= 0) return false;
 
         $room = $this->mod_room->getRoom($room_id);
-//        if(empty($room) || $room['type'] !=proto_type::room_chat) return false;
+        //todo use code unline
+        //if(empty($room) || $room['type'] !=proto_type::room_chat) return false;
 
         $info = new room_info($room);
         $room_base = $info->format('all');
         $room_base['name'] =  $room_base['name']?$room_base['name']:$this->room_tmp_name($room_base);
         $owner = $room_base['owner'];
+        $isManager = $owner == $user?true:false;
 
 
         $uids = [];
@@ -429,6 +431,6 @@ class talks_helper
             }
         }
 
-        return ["room" => $room_base , "members" => $members];
+        return ["room" => $room_base ,"user"=>$user,"isManager" => $isManager,"members" => $members];
     }
 }

mobile/control/member_talk.php

@@ -397,22 +397,27 @@ class member_talkControl extends mbMemberControl
 
     public function room_detailOp()
     {
+        if (!session_helper::logined()) {
+            throw new UnloginException();
+        }
 
         $room_id = intval($_GET['room_id']);
         $user    = session_helper::memberid();
+        $tpl = new tpl_group_home($user,$room_id);
 
-        $talk_helper = new \room\talks_helper();
-        $ret = $talk_helper->room_detail($user,$room_id);
 
-        if($ret == false){
-            Log::record("room_detail failed room_id={$room_id} user={$user}",Log::ERR);
+        //todo delete file before online
+        if($_GET['dev']){
+            return self::outsuccess(['tpl' => $tpl],'/talk/homepage_tmp');
         }
 
-
-        Tpl::output("user_id",$user);
-        Tpl::output("members",$ret['members']);
-        Tpl::output("room",$ret['room']);
-        return self::outsuccess($ret,'/talk/homepage');
+        if($tpl->validate() == false) {
+            Log::record("member_talk.room_detail error: room_id={$room_id} user={$user}",Log::ERR);
+            return self::outerr(errcode::ErrParamter);
+        }
+        else {
+            return self::outsuccess(['tpl' => $tpl],'/talk/homepage');
+        }
     }
 
     public function edit_roomOp()
@@ -439,18 +444,79 @@ class member_talkControl extends mbMemberControl
 }
 
 
-class Tpl_group_home {
+class tpl_group_home {
+
+//    private $mRoomid;
+
+    private $isManager = false;
+
+    private $bValidate = true;
+
+    private $mSummary;
+
+    public function __construct($user,$room_id){
+
+//        $this->mRoomid = $room_id;
+        $talk_helper = new room\talks_helper();
+        $this->mSummary = $talk_helper->room_detail($user,$room_id);
+
+        if($this->mSummary == false){
+            $this->bValidate = false;
+        }else{
+            $this->isManager = $this->mSummary["isManager"];
+        }
+    }
 
-    public function __construct(){
-        
+    public function validate(){
+        return $this->bValidate;
     }
 
-    public function show_group_info(){
+
+    public function show_group_header()
+    {
+        $html = '';
+        if(!empty($this->mSummary['room'])){
+
+
+        }
 
     }
 
-    public function show_members(){
+    public function show_members()
+    {
+        $html = '';
+
+        if(!empty($this->mSummary['members']))
+        {
+            foreach ($this->mSummary['members'] as $member)
+            {
+                $html .= "        
+                    <div class=\"weui-flex__item\">
+                        <img src=\"{$member['avatar']}\" alt=\"\">
+                        <p>{$member['nickname']}</p>
+                    </div>";
+            }
+        }
+
+        if($this->isManager){
+            $html .= "
+                <div class=\"weui-flex__item\">
+                    <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/add_member.png\" alt=\"\">
+                </div>
+                <div class=\"weui-flex__item\">
+                    <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/del_member.png\" alt=\"\">
+                </div>";
+        }else{
+            $html .= "
+                <div class=\"weui-flex__item\">
+                    <img src=\"".RESOURCE_SITE_URL."/mobile/talk/images/add_member.png\" alt=\"\">
+                </div>
+            ";
+        }
 
+        echo $html;
     }
 
+
+
 }

mobile/templates/default/talk/homepage.php

@@ -33,38 +33,7 @@
         </div>
     </div>
     <div class="group_members weui-flex">
-
-
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
-            <p>dolly</p>
-        </div>
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
-            <p>dolly</p>
-        </div>
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
-            <p>dolly</p>
-        </div>
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
-            <p>dolly</p>
-        </div>
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
-            <p>dolly</p>
-        </div>
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
-            <p>dolly</p>
-        </div>
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/add_member.png" alt="">
-        </div>
-        <div class="weui-flex__item">
-            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/del_member.png" alt="">
-        </div>
+            <?php $output['tpl']->show_members();?>
     </div>
 </div>
 <div class="weui-cells">

mobile/templates/default/talk/homepage_tmp.php

@@ -0,0 +1,154 @@
+<!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"/>
+    <link type="text/css" rel="stylesheet" href="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/css/homepage.css"/>
+</head>
+<body>
+<div class="cover">
+    <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/cover.png" alt="cover">
+</div>
+<div class="group_top">
+    <div class="group_info">
+        <div class="group_avatar">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="group_avatar">
+        </div>
+        <div class="group_name">
+            <h3>丽人丽妆</h3>
+            <p>上海丽人丽妆化妆品股份有限公司</p>
+        </div>
+    </div>
+    <div class="group_handle weui-flex">
+        <div class="weui-flex__item group_sport">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/group_sport.png" alt="">
+        </div>
+        <div class="weui-flex__item group_goods">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/group_goods.png" alt="">
+        </div>
+        <div class="weui-flex__item search">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/search.png" alt="">
+        </div>
+    </div>
+    <div class="group_members weui-flex">
+
+
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
+            <p>dolly</p>
+        </div>
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
+            <p>dolly</p>
+        </div>
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
+            <p>dolly</p>
+        </div>
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
+            <p>dolly</p>
+        </div>
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
+            <p>dolly</p>
+        </div>
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/avatars.png" alt="">
+            <p>dolly</p>
+        </div>
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/add_member.png" alt="">
+        </div>
+        <div class="weui-flex__item">
+            <img src="<?php echo RESOURCE_SITE_URL; ?>/mobile/talk/images/del_member.png" alt="">
+        </div>
+    </div>
+</div>
+<div class="weui-cells">
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>群聊名称</p>
+        </div>
+        <div class="weui-cell__ft">丽人丽妆</div>
+    </a>
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>公告</p>
+        </div>
+        <div class="weui-cell__ft">未设置</div>
+    </a>
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>共享资金池</p>
+        </div>
+        <div class="weui-cell__ft">￥20000.00</div>
+    </a>
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>企业认证</p>
+        </div>
+        <div class="weui-cell__ft">已认证</div>
+    </a>
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>进群申请</p>
+        </div>
+        <div class="weui-cell__ft"><span class="letter_warn">待处理17</span></div>
+    </a>
+</div>
+
+<div class="weui-cells">
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>我的昵称</p>
+        </div>
+        <div class="weui-cell__ft"> sunny</div>
+    </a>
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>转让管理员</p>
+        </div>
+    </a>
+</div>
+
+<div class="weui-cells">
+    <div class="weui-cell weui-cell_switch" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>置顶聊天</p>
+        </div>
+        <div class="weui-cell__ft">
+            <label for="talk_top" class="weui-switch-cp">
+                <input id="talk_top" class="weui-switch-cp__input" type="checkbox" checked="checked">
+                <div class="weui-switch-cp__box"></div>
+            </label>
+        </div>
+    </div>
+    <div class="weui-cell weui-cell_switch" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>消息免打扰</p>
+        </div>
+        <div class="weui-cell__ft">
+            <label for="no_disturb" class="weui-switch-cp">
+                <input id="no_disturb" class="weui-switch-cp__input" type="checkbox" checked="checked">
+                <div class="weui-switch-cp__box"></div>
+            </label>
+        </div>
+    </div>
+</div>
+
+<div class="weui-cells">
+    <a class="weui-cell weui-cell_access" href="javascript:;">
+        <div class="weui-cell__bd">
+            <p>清空聊天记录</p>
+        </div>
+    </a>
+</div>
+
+<div class="quit">
+    <a href="javascript:;" class="weui-btn weui-btn_primary">删除并退出</a>
+</div>
+</body>
+</html>