Merge branch 'master' of http://git.bocai108.com:10180/Ethan/Customer-Service

application/admin/controller/Accounts.php

@@ -11,7 +11,7 @@ use app\admin\model\Office;
 
 class Accounts extends Base
 {
-    // 用户列表
+    // 会员列表
     public function index()
     {
         $toExcel = input('param.toExcel', 0);
@@ -22,7 +22,12 @@ class Accounts extends Base
             $offset = (($param['pageNumber'] - 1) * $limit);
             $where = [];
             if (strlen($param['searchText'])) {
-                $where['account_name'] = ['like', '%' . $param['searchText'] . '%'];
+                if($param['account'] == 'account_name'){
+                    $where['account_name'] = ['like', '%' . $param['searchText'] . '%'];
+                }
+                if($param['account'] == 'nick_name'){
+                    $where['nick_name'] = ['like', '%' . $param['searchText'] . '%'];
+                }
             }
             //标签
             if ($param['label_id'] != '' && $param['label_id'] != 0) {
@@ -62,7 +67,7 @@ class Accounts extends Base
         //所有标签
         $label = db('accountslabel')->select();
         if(!empty($label)){
-            $option = '<option value="0">全部</option>';
+            $option = '<option value="0">会员标签</option>';
             for($i=0;$i<count($label);$i++){
                 $option = $option.'<option value="'.$label[$i]['id'].'">'.$label[$i]['name'].'</option>';
             }

application/admin/controller/Users.php

@@ -17,7 +17,13 @@ class Users extends Base
             $offset = (($param['pageNumber'] - 1) * $limit);
             $where = [];
             if (empty($param['searchText']) === false || intval($param['searchText']) == 0) {
-                $where['user_account|user_name|user_job_number|fullname'] = ['like', '%' . $param['searchText'] . '%'];
+                if($param['user'] == 'user_account'){
+                    $where['user_account'] = ['like', '%' . $param['searchText'] . '%'];
+                }
+                if($param['user'] == 'user_name'){
+                    $where['user_name'] = ['like', '%' . $param['searchText'] . '%'];
+                }
+               // $where['user_account|user_name|user_job_number|fullname'] = ['like', '%' . $param['searchText'] . '%'];
             }else{
                 return 1;
             }

application/admin/view/accounts/index.html

@@ -35,14 +35,23 @@
                         </div>
                     </div>
                     <div class="form-group">
-                        <label>昵称：</label>
+                        <div class="input-group col-sm-4 layui-form" style="width: 70px;">
+                            <input type="hidden" id="account" value="account_name"/>
+                            <select lay-verify="required" lay-filter="account">
+                                <option value="account_name">账号</option>
+                                <option value="nick_name">昵称</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <!--<label>账号：</label>-->
                         <input type="text" class="form-control" id="username" name="user_name">
                     </div>
                     <div class="form-group">
                         <button class="btn btn-primary" type="button" style="margin-top:5px" id="search"><strong>搜 索</strong>
                         </button>
                     </div>
-                    <div class="form-group" style="margin-left:50px;">
+                    <div class="form-group" style="margin-left:50px;margin-top: 5px;">
                         <button class="btn btn-primary" type="button" id="toExcel" name="toExcel" value="0"><strong>导出Excel</strong>
                         </button>
                     </div>
@@ -90,6 +99,10 @@
             $("#label_id").val(value.value);
             onSearch()
         });
+        form.on('select(account)', function(value){
+            $("#account").val(value.value);
+            onSearch()
+        });
     });
 
 </script>
@@ -119,7 +132,8 @@
                     searchText:$('#username').val(),
                     start:$('#start').val(),
                     end:$('#end').val(),
-                    label_id:$('#label_id').val()
+                    label_id:$('#label_id').val(),
+                    account:$('#account').val()
                 };
                 return param;
             },

application/admin/view/system/basics.html

@@ -52,9 +52,11 @@
                                 <button type="button" class="layui-btn layui-btn-small" id="up-avatar">
                                     <i class="layui-icon"></i>上传图片</button>
                             </div>
+                            <span>建议上传420px*700px</span>
                             <div class="input-group col-sm-3" id="avatar">
                                 <img src="{$advertisement['advertisement_img']}" width="40px" height="40px"/>
                             </div>
+
                         </div>
                         <div class="form-group layui-form-item">
                             <label class="col-sm-3 control-label">是否启用：</label>

application/admin/view/users/adduser.html

@@ -95,6 +95,7 @@
                                 <button type="button" class="layui-btn layui-btn-small" id="up-avatar">
                                     <i class="layui-icon"></i>上传图片</button>
                             </div>
+                            <span>建议上传180px*180px</span>
                             <div class="input-group col-sm-3" id="avatar">
 
                             </div>

application/admin/view/users/edituser.html

@@ -29,6 +29,7 @@
                                 <button type="button" class="layui-btn layui-btn-small" id="up-avatar">
                                     <i class="layui-icon"></i>上传图片</button>
                             </div>
+                            <span>建议上传180px*180px</span>
                             <div class="input-group col-sm-3" id="avatar">
                                 <img src="{$info['user_avatar']}" width="40px" height="40px"/>
                             </div>

application/admin/view/users/index.html

@@ -34,7 +34,16 @@
                         </div>
                     </div>&nbsp&nbsp&nbsp&nbsp&nbsp
                     <div class="form-group">
-                        <label>客服名：</label>
+                        <div class="input-group col-sm-4 layui-form" style="width: 70px;">
+                            <input type="hidden" id="user" value="user_account"/>
+                            <select lay-verify="required" lay-filter="user">
+                                <option value="user_account">账号</option>
+                                <option value="user_name">名称</option>
+                            </select>
+                        </div>
+                    </div>
+                    <div class="form-group">
+                        <!--<label>客服名：</label>-->
                         <input type="text" class="form-control" id="username" name="user_name">
                     </div>
                     <div class="form-group">
@@ -85,6 +94,10 @@
             $("#group_id").val(value.value);
             onSearch()
         });
+        form.on('select(user)', function(value){
+            $("#user").val(value.value);
+            onSearch()
+        });
 
     });
 
@@ -113,7 +126,8 @@
                     pageNumber: params.pageNumber,
                     pageSize: params.pageSize,
                     group_id:$('#group_id').val(),
-                    searchText:$('#username').val()
+                    searchText:$('#username').val(),
+                    user:$('#user').val()
                 };
                 return param;
             },