|
|
@@ -27,13 +27,13 @@ class Messages extends Base
|
|
|
$start = strtotime($param['start']);
|
|
|
$end = strtotime($param['end'] . ' 23:59:59');
|
|
|
}
|
|
|
-// $join = [
|
|
|
-// 'accounts b' => 'a.account_id = b.id',
|
|
|
-// ];
|
|
|
+ $join = [
|
|
|
+ 'messagetype b' => 'a.type_id = b.id',
|
|
|
+ ];
|
|
|
$leftjoin = [
|
|
|
'users c' => 'a.user_id = c.id',
|
|
|
];
|
|
|
- $result = model('Accountsmessage')->selectJoin($leftjoin,$where, $start,$end,$offset, $limit);
|
|
|
+ $result = model('Accountsmessage')->selectJoin($join,$leftjoin,$where, $start,$end,$offset, $limit);
|
|
|
foreach($result as $key=>$vo){
|
|
|
|
|
|
// 优化显示附件
|
|
|
@@ -91,8 +91,9 @@ class Messages extends Base
|
|
|
$param = input('post.');
|
|
|
$id = $param['id'];
|
|
|
$if_public = $param['if_public'];
|
|
|
+ $type_id = $param['type_id'];
|
|
|
try{
|
|
|
- db('accountsmessage')->where('message_id', $id)->update(['if_public' => $if_public]);
|
|
|
+ db('accountsmessage')->where('message_id', $id)->update(['if_public' => $if_public,'type_id' => $type_id]);
|
|
|
}catch(\Exception $e){
|
|
|
return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
|
|
|
}
|
|
|
@@ -106,6 +107,8 @@ class Messages extends Base
|
|
|
//$info['account_email'] = $account['account_email'];
|
|
|
$info['user_name'] = $user['user_name'];
|
|
|
|
|
|
+ $messagetype = db('messagetype')->select();
|
|
|
+
|
|
|
// 优化显示附件
|
|
|
$images = $info['image'];
|
|
|
//转换成数组格式
|
|
|
@@ -135,12 +138,28 @@ class Messages extends Base
|
|
|
|
|
|
$this->assign([
|
|
|
'info' => $info,
|
|
|
+ 'messagetype' => $messagetype,
|
|
|
'status' => config('kf_status'),
|
|
|
// 'groups' => db('groups')->select()
|
|
|
]);
|
|
|
return $this->fetch();
|
|
|
}
|
|
|
|
|
|
+ //删除留言
|
|
|
+ public function delMessage(){
|
|
|
+ if (request()->isAjax()) {
|
|
|
+ //留言类型id
|
|
|
+ $id = input('param.id/d');
|
|
|
+
|
|
|
+ try {
|
|
|
+ db('accountsmessage')->where('message_id', $id)->delete();
|
|
|
+ } catch (\Exception $e) {
|
|
|
+ return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
|
|
|
+ }
|
|
|
+ return json(['code' => 1, 'data' => '', 'msg' => '删除留言成功']);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
// 上传客服头像
|
|
|
public function upAvatar()
|
|
|
{
|
|
|
@@ -161,13 +180,16 @@ class Messages extends Base
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- // 生成按钮
|
|
|
+ // 生成留言操作按钮
|
|
|
private function makeBtn($id)
|
|
|
{
|
|
|
$operate = '<a href="' . url('Messages/detail', ['id' => $id]) . '">';
|
|
|
|
|
|
$operate .= '<button type="button" class="btn btn-info btn-sm"><i class="fa fa-institution"></i> 详情</button></a>';
|
|
|
|
|
|
+ $operate .= '<a href="javascript:messageDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
|
|
|
+ $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
|
|
|
+
|
|
|
return $operate;
|
|
|
}
|
|
|
|