1

application/admin/controller/Messages.php

@@ -43,7 +43,7 @@ class Messages extends Base
                 if(!empty($images)){
                     $img = '';
                     for($i=0;$i<count($images);$i++){
-                        $img = $img.'<img src="'.$images[$i].'" width="40px" height="40px" style="margin-left:5px;">';
+                        $img = $img.'<img src="'.$images[$i].'" width="40px" height="40px" style="margin-left:5px;margin-top:5px;">';
                     }
                     $result[$key]['image'] = $img;
                 }
@@ -63,6 +63,12 @@ class Messages extends Base
                     $result[$key]['status'] = '<span class="label label-danger">未处理</span>';
                 }
 
+                // 是否公开
+                if(1 == $vo['if_public']){
+                    $result[$key]['if_public'] = '公开';
+                }else{
+                    $result[$key]['if_public'] = '不公开';
+                }
                 // 生成操作按钮
                 $result[$key]['operate'] = $this->makeBtn($vo['message_id']);
             }

application/admin/model/Accountsmessage.php

@@ -23,6 +23,8 @@ class Accountsmessage extends Model
     public function selectJoin($leftjoin, $where=[],$start,$end, $offset='', $limit='', $order=['a.message_id'=>'desc'])
     {
         $result = $this;
+        $result = $result->alias('a');
+        $result = $result->field('a.message_id,a.name,a.email,a.content,a.add_time,a.message_status,a.user_id,a.dealWith_time,a.image,a.phone,a.qq,a.wechat,a.if_public,c.user_name');
 //        if (empty($join) === false) {
 //            $result = $result->alias('a');
 //            foreach ($join as $k => $v) {
@@ -31,7 +33,6 @@ class Accountsmessage extends Model
 //        }
 
         if (empty($leftjoin) === false) {
-            $result = $result->alias('a');
             foreach ($leftjoin as $k => $v) {
                 $result = $result->join('users c', 'a.user_id = c.id','LEFT');
             }

application/admin/view/messages/index.html

@@ -48,10 +48,11 @@
                         <th data-field="content">内容</th>
                         <th data-field="image">附件</th>
                         <th data-field="phone">手机</th>
-                        <th data-field="account_email">邮箱</th>
+                        <th data-field="email">邮箱</th>
                         <th data-field="status">当前状态</th>
                         <th data-field="user_name">处理人</th>
                         <th data-field="dealWith_time">处理时间</th>
+                        <th data-field="if_public">公开状态</th>
                         <th data-field="operate">操作</th>
                         </thead>
                     </table>

application/service/controller/Login.php

@@ -39,7 +39,9 @@ class Login extends Controller
             'expire_time' => time()
         ];
         db('users')->where('id', $user['id'])->update($param);
-        $user = db('users')->field('id,user_name,user_avatar,phone,token')->where('id', $user['id'])->select();
+        $user = db('users')->field('id,user_name,user_avatar,phone,group_id,token')->where('id', $user['id'])->select();
+        $group = db('groups')->where('id', $user[0]['group_id'])->find();
+        $user[0]['group'] = $group['name'];
 
 
         $this->assign([