Jonlin 6 anos atrás
pai
commit
2f6e970fef

+ 55 - 7
application/admin/controller/Accounts.php

@@ -47,6 +47,58 @@ class Accounts extends Base
         }
     }
 
+    // 编辑用户
+    public function edit()
+    {
+        if(request()->isAjax()){
+
+            $param = input('post.');
+
+            $addar = array();
+            $where = array();
+            $where['id'] = $param['id'];
+            $rules = '/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/';
+
+            if(!preg_match($rules,$param['account_email'])){
+                return json(['code' => -9, 'data' => '', 'msg' => '请输入正确的邮箱']);
+            }
+
+            if(!preg_match("/^1[34578]\d{9}$/", $param['phone'])){
+                return json(['code' => -10, 'data' => '', 'msg' => '请输入正确的手机号码']);
+            }
+
+            $addar['user_email'] = $param['account_email'];
+            $addar['phone'] = $param['phone'];
+            $addar['signature'] = $param['signature'];
+            $addar['group_id'] = $param['group_id'];
+            $addar['status'] = $param['status'];
+
+            try{
+                db('account')->where('id', $param['id'])->update($addar);
+            }catch(\Exception $e){
+                return json(['code' => -6, 'data' => '', 'msg' => $e->getMessage()]);
+            }
+
+            return json(['code' => 1, 'data' => '', 'msg' => '编辑用户成功']);
+        }
+
+        $id = input('param.id/d');
+        $info = db('accounts')->where('id', $id)->find();
+
+        //转为日期时间格式
+        $info['add_time'] = date('Y-m-d H:i:s',$info['add_time']);
+
+        //所有客服
+        $users = db('users')->select();
+
+        $this->assign([
+            'info' => $info,
+            'users' => $users,
+            'status' => config('kf_status')
+        ]);
+        return $this->fetch();
+    }
+
     // 删除用户
     public function delAccount()
     {
@@ -64,16 +116,12 @@ class Accounts extends Base
     // 生成按钮
     private function makeBtn($id)
     {
-//        $operate = '<a href="' . url('Accounts/resetpwd', ['id' => $id]) . '">';
-//        $operate .= '<button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 重置密码</button></a> ';
-
         $operate = '<a href="javascript:resetPwd(' . $id . ')"><button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 重置密码</button></a>';
 
-        $operate .= '<a style="margin-left:5px;" href="javascript:accountDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
-        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
+        $operate .= '<a style="margin-left:5px;" href="' . url('Accounts/edit', ['id' => $id]) . '"><button type="button" class="btn btn-primary btn-sm"><i class="fa fa-paste"></i> 编辑</button></a> ';
 
-        //$operate .= '<a href="javascript:;">';
-        //$operate .= '<button type="button" class="btn btn-info btn-sm"><i class="fa fa-institution"></i> 详情</button></a>';
+        $operate .= '<a href="javascript:accountDel(' . $id . ')"><button type="button" class="btn btn-danger btn-sm">';
+        $operate .= '<i class="fa fa-trash-o"></i> 删除</button></a> ';
 
         return $operate;
     }

+ 195 - 0
application/admin/view/accounts/edit.html

@@ -0,0 +1,195 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>编辑用户</title>
+    <link rel="shortcut icon" href="favicon.ico">
+    <link href="__CSS__/bootstrap.min.css?v=3.3.6" rel="stylesheet">
+    <link href="__CSS__/font-awesome.min.css?v=4.4.0" rel="stylesheet">
+    <link href="__CSS__/animate.min.css" rel="stylesheet">
+    <link href="__JS__/layui/css/layui.css" rel="stylesheet">
+    <link href="__CSS__/style.min.css?v=4.1.0" rel="stylesheet">
+</head>
+<body class="gray-bg">
+<div class="wrapper wrapper-content animated fadeInRight">
+    <div class="row">
+        <div class="col-sm-8">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5>编辑用户</h5>
+                </div>
+                <div class="ibox-content">
+                    <form class="form-horizontal m-t layui-form" id="commentForm" method="post" action="{:url('accounts/edit')}">
+                        <input type="hidden" value="{$info['id']}" name="id"/>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">用户名称:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="account_name" type="text" class="form-control" name="account_name" required="" aria-required="true" value="{$info['account_name']}" disabled="disabled">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">用户邮箱:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="account_email" type="text" class="form-control" name="account_email" required="" aria-required="true" value="{$info['account_email']}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">注册时间:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="add_time" type="text" class="form-control" name="add_time" required="" aria-required="true" value="{$info['add_time']}" disabled="disabled">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">电话:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="account_phone" type="text" class="form-control" name="account_phone" required="" aria-required="true" value="{$info['account_phone']}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">地址:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="address" type="text" class="form-control" name="address" required="" aria-required="true" value="{$info['address']}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">标签:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="label" type="text" class="form-control" name="label" required="" aria-required="true" value="{$info['label']}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">备注:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="remark" type="text" class="form-control" name="remark" required="" aria-required="true" value="{$info['remark']}">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">状态:</label>
+                            <div class="input-group col-sm-4">
+                                <input id="no_public" type="radio" class="form-control" name="status" value="1" {$info['status']==1?'checked':''} title="正常">
+                                <input id="public" type="radio" class="form-control" name="status" value="0" {$info['status']==0?'checked':''} title="停用">
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <label class="col-sm-3 control-label">选择负责人:</label>
+                            <input type="hidden" id="user_id" name="user_id" value="{$info['user_id']}"/>
+                            <div class="input-group col-sm-4 layui-form">
+                                <select lay-verify="required" lay-filter="user">
+                                    <option value="0">请选择负责人</option>
+                                    {if !empty($users)}
+                                    {foreach name="users" item="vo"}
+                                    <option value="{$vo['id']}" {if $vo['id'] eq $info['user_id']}selected{/if}>{$vo['user_name']}</option>
+                                    {/foreach}
+                                    {/if}
+                                </select>
+                            </div>
+                        </div>
+
+                        
+
+                        <div class="form-group">
+                            <div class="col-sm-4 col-sm-offset-6" style="margin-left: 20%;">
+                                <a class="layui-btn layui-btn-sm lay-btn-diy" href="javascript:history.go(-1)" style="background-color:#1E9FFF;margin-bottom: 5px;height: 35px;line-height: 35px;">返回</a>
+                                <button class="btn btn-primary" type="submit" style="margin-left: 10%;">提交</button>
+                            </div>
+                        </div>
+                    </form>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+<script src="__JS__/jquery.min.js?v=2.1.4"></script>
+<script src="__JS__/bootstrap.min.js?v=3.3.6"></script>
+<script src="__JS__/content.min.js?v=1.0.0"></script>
+<script src="__JS__/plugins/validate/jquery.validate.min.js"></script>
+<script src="__JS__/plugins/validate/messages_zh.min.js"></script>
+<script src="__JS__/plugins/layer/layer.min.js"></script>
+<script src="__JS__/layui/layui.js"></script>
+<script src="__JS__/jquery.form.js"></script>
+<script type="text/javascript">
+
+    layui.use(['form', 'upload'], function(){
+        var form = layui.form;
+        var upload = layui.upload;
+        
+        //执行实例
+        var uploadInst = upload.render({
+            elem: '#up-avatar' //绑定元素
+            ,url: "{:url('users/upAvatar')}" //上传接口
+            ,exts: 'png|jpg|jpeg|gif'
+            ,done: function(res){
+                //上传完毕回调
+                if(0 == res.code){
+                    $("#avatar").html('<img src="' + res.data.src + '" width="50px" height="50px">');
+                    $("#user_avatar").val(res.data.src);
+                }else{
+                    layer.msg(res.msg);
+                }
+            }
+            ,error: function(){
+                //请求异常回调
+            }
+        });
+
+        form.on('select(user)', function(value){
+            $("#user_id").val(value.value);
+        });
+    });
+
+    var index = '';
+    function showStart(){
+        index = layer.load(0, {shade: false});
+        return true;
+    }
+
+    function showSuccess(res){
+
+        layer.ready(function(){
+            layer.close(index);
+            if(1 == res.code){
+               layer.alert(res.msg, {title: '友情提示', icon: 1, closeBtn: 0}, function(){
+                   window.location.href = res.data;
+               });
+            }else if(111 == res.code){
+                window.location.reload();
+            }else{
+                layer.msg(res.msg, {anim: 6});
+            }
+        });
+    }
+
+    $(document).ready(function(){
+        // 添加管理员
+        var options = {
+            beforeSubmit:showStart,
+            success:showSuccess
+        };
+
+        $('#commentForm').submit(function(){
+            $(this).ajaxSubmit(options);
+            return false;
+        });
+    });
+
+    // 表单验证
+    $.validator.setDefaults({
+        highlight: function(e) {
+            $(e).closest(".form-group").removeClass("has-success").addClass("has-error")
+        },
+        success: function(e) {
+            e.closest(".form-group").removeClass("has-error").addClass("has-success")
+        },
+        errorElement: "span",
+        errorPlacement: function(e, r) {
+            e.appendTo(r.is(":radio") || r.is(":checkbox") ? r.parent().parent().parent() : r.parent())
+        },
+        errorClass: "help-block m-b-none",
+        validClass: "help-block m-b-none"
+    });
+
+</script>
+</body>
+</html>

+ 11 - 1
application/service/controller/Message.php

@@ -19,6 +19,13 @@ class Message extends Base
             }
         }
         $message = db('accountsmessage')->whereBetween('add_time', [$start, $end])->select();
+//        foreach($message as $key=>$vo){
+//            //转为日期时间格式
+//            $message[$key]['add_time'] = date('Y-m-d H:i:s',$vo['add_time']);
+//            if(!empty($vo['dealWith_time'])){
+//                $message[$key]['dealWith_time'] = date('Y-m-d H:i:s',$vo['dealWith_time']);
+//            }
+//        }
 
         $data = [
             'status'=>1,
@@ -40,6 +47,8 @@ class Message extends Base
             //留言id
             //$message_id = 14;
             $message_id = input("param.message_id/s");
+            //回复内容
+            $reply_content = input("param.reply_content/s");
 
             $user = db('users')->where('id', $user_id)->find();
             if(empty($user)){
@@ -54,6 +63,7 @@ class Message extends Base
             $param = [
                 'user_id' => $user_id,
                 'message_status' => 1,
+                'reply_content' => $reply_content,
                 'dealWith_time' => time()
             ];
 
@@ -63,7 +73,7 @@ class Message extends Base
                 return json(['code' => -1, 'data' => '', 'msg' => $e->getMessage()]);
             }
 
-            return json(['code' => 1, 'data' => url('message/index'), 'msg' => '留言处理成功']);
+            return json(['code' => 1, 'data' => '', 'msg' => '留言处理成功']);
         }
     }
 

+ 1 - 1
application/service/controller/Services.php

@@ -150,7 +150,7 @@ class Services extends Base
             ];
             db('users')->where('id', $user_id)->update($param);
 
-            return json(['code' => 1, 'data' => url(''), 'msg' => '密码修改成功']);
+            return json(['code' => 1, 'data' => '', 'msg' => '密码修改成功']);
         }
     }