Jonlin 6 жил өмнө
parent
commit
d055f1aa4d

+ 20 - 0
application/admin/controller/Accounts.php

@@ -19,6 +19,10 @@ class Accounts extends Base
             if (empty($param['searchText']) === false) {
                 $where['account_name'] = ['like', '%' . $param['searchText'] . '%'];
             }
+            //标签
+            if ($param['label_id'] != '' && $param['label_id'] != 0) {
+                $where['label_id'] = $param['label_id'];
+            }
             if (empty($param['start']) === false && empty($param['end']) === false && $param['start'] <= $param['end']) {
                 $start = strtotime($param['start']);
                 $end = strtotime($param['end'] . ' 23:59:59');
@@ -49,6 +53,22 @@ class Accounts extends Base
             $return['rows'] = $result;
             return json($return);
         }
+        //所有标签
+        $label = db('accountslabel')->select();
+        if(!empty($label)){
+            $option = '<option value="0">全部</option>';
+            for($i=0;$i<count($label);$i++){
+                $option = $option.'<option value="'.$label[$i]['id'].'">'.$label[$i]['name'].'</option>';
+            }
+            $labeloption = '<select lay-verify="required" lay-filter="label">'.$option.'</select>';
+        }
+
+        $this->assign([
+            'label' => $label,
+            'labeloption' => $labeloption,
+            'status' => config('kf_status')
+        ]);
+
         return $this->fetch();
     }
 

+ 3 - 3
application/admin/view/accounts/edit.html

@@ -35,19 +35,19 @@
                     <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>
+                            <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>
+                            <label class="col-sm-3 control-label">昵称:</label>
                             <div class="input-group col-sm-4">
                                 <input id="nick_name" type="text" class="form-control" name="nick_name" aria-required="true" value="{$info['nick_name']}">
                             </div>
                         </div>
                         <div class="form-group">
-                            <label class="col-sm-3 control-label">用户邮箱:</label>
+                            <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" aria-required="true" value="{$info['account_email']}">
                             </div>

+ 28 - 7
application/admin/view/accounts/index.html

@@ -10,6 +10,7 @@
     <link href="__CSS__/plugins/bootstrap-table/bootstrap-table.min.css" rel="stylesheet">
     <link href="__CSS__/animate.min.css" rel="stylesheet">
     <link href="__CSS__/style.min.css?v=4.1.0" rel="stylesheet">
+    <link href="__JS__/layui/css/myLayui.css" rel="stylesheet">
 </head>
 <body class="gray-bg">
 <div class="wrapper wrapper-content animated fadeInRight">
@@ -28,7 +29,13 @@
                         <input type="text" class="form-control" id="end" value="<?php echo date('Y-m-d',time());?>" style="width: 100px;">
                     </div>
                     <div class="form-group">
-                        <label>用户名称:</label>
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="label_id"/>
+                            {$labeloption}
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <label>昵称:</label>
                         <input type="text" class="form-control" id="username" name="user_name">
                     </div>
                     <div class="form-group">
@@ -42,13 +49,13 @@
                 <div class="example">
                     <table id="cusTable">
                         <thead>
-                        <th data-field="account_name">用户名称</th>
-                        <th data-field="nick_name">用户昵称</th>
-                        <th data-field="account_email">用户邮箱</th>
-                        <th data-field="account_phone">用户电话</th>
+                        <th data-field="account_name">账号</th>
+                        <th data-field="nick_name">昵称</th>
+                        <th data-field="account_email">邮箱</th>
+                        <th data-field="account_phone">电话</th>
                         <th data-field="add_time">注册时间</th>
                         <th data-field="last_login_time">最近一次访问时间</th>
-                        <th data-field="address">地址</th>
+                        <!--<th data-field="address">地址</th>-->
                         <th data-field="label">标签</th>
                         <th data-field="remark">备注</th>
                         <th data-field="user_name">负责人</th>
@@ -69,6 +76,19 @@
 <script src="__JS__/plugins/bootstrap-table/bootstrap-table-mobile.min.js"></script>
 <script src="__JS__/plugins/bootstrap-table/locale/bootstrap-table-zh-CN.min.js"></script>
 <script src="__JS__/plugins/layer/layer.min.js"></script>
+<script src="__JS__/layui/layui.js"></script>
+<script type="text/javascript">
+
+    layui.use(['form', 'upload'], function(){
+        var form = layui.form;
+
+        form.on('select(label)', function(value){
+            $("#label_id").val(value.value);
+            onSearch()
+        });
+    });
+
+</script>
 <script type="text/javascript">
     function initTable() {
         //先销毁表格
@@ -94,7 +114,8 @@
                     pageSize: params.pageSize,
                     searchText:$('#username').val(),
                     start:$('#start').val(),
-                    end:$('#end').val()
+                    end:$('#end').val(),
+                    label_id:$('#label_id').val()
                 };
                 return param;
             },