Jonlin %!s(int64=6) %!d(string=hai) anos
pai
achega
631987f042

+ 3 - 3
application/admin/controller/Accounts.php

@@ -226,9 +226,9 @@ class Accounts extends Base
             $limit  = $param['pageSize'];
             $offset = (($param['pageNumber'] - 1) * $limit);
             $where = [];
-            if (strlen($param['searchText'])) {
-                $where['name'] = ['like', '%' . $param['searchText'] . '%'];
-            }
+//            if (strlen($param['searchText'])) {
+//                $where['name'] = ['like', '%' . $param['searchText'] . '%'];
+//            }
             $result = db('accountslabel')->where($where)->limit($offset, $limit)->order('add_time', 'desc')->select();
 
             foreach($result as $key=>$vo){

+ 7 - 7
application/admin/controller/Messages.php

@@ -115,7 +115,7 @@ class Messages extends Base
         }
 
         //留言类型
-        $type = db('messagetype')->select();
+        $type = db('messagetype')->where('status',1)->select();
         $optiontype = '';
         if(!empty($users)){
             $option = '<option value="0">留言类型</option>';
@@ -264,10 +264,10 @@ class Messages extends Base
             $limit  = $param['pageSize'];
             $offset = ($param['pageNumber'] - 1) * $limit;
 
-            $where  = [];
-            if (strlen($param['searchText'])) {
-                $where['account_name'] = $param['searchText'];
-            }
+//            $where  = [];
+//            if (strlen($param['searchText'])) {
+//                $where['account_name'] = $param['searchText'];
+//            }
 
             $result = db('messagetype')->limit($offset, $limit)->select();
             foreach($result as $key=>$vo){
@@ -312,7 +312,7 @@ class Messages extends Base
             } catch (\Exception $e) {
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
-            return json(['code' => 1, 'data' => '', 'msg' => '添加留言类型成功']);
+            return json(['code' => 1, 'data' => url('messages/type'), 'msg' => '添加留言类型成功']);
         }
         $this->assign([
             'status' => config('kf_status')
@@ -340,7 +340,7 @@ class Messages extends Base
             } catch (\Exception $e) {
                 return json(['code' => -2, 'data' => '', 'msg' => $e->getMessage()]);
             }
-            return json(['code' => 1, 'data' => '', 'msg' => '编辑留言类型成功']);
+            return json(['code' => 1, 'data' => url('messages/type'), 'msg' => '编辑留言类型成功']);
         }
         $type = db('messagetype')->where('id',$id)->find();
 

+ 1 - 1
application/admin/view/messages/add.html

@@ -37,7 +37,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <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>
+                                <!--<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">提交</button>
                             </div>
                         </div>

+ 1 - 1
application/admin/view/messages/edit.html

@@ -37,7 +37,7 @@
                         </div>
                         <div class="form-group">
                             <div class="col-sm-4 col-sm-offset-6">
-                                <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>
+                                <!--<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">提交</button>
                             </div>
                         </div>

+ 1 - 1
application/admin/view/messages/type.html

@@ -20,7 +20,7 @@
         </div>
         <div class="ibox-content">
             <a href="/admin/messages/add.html">
-                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新 增</strong>
+                <button class="btn btn-primary" type="button" style="margin-top:5px"><strong>新增留言类型</strong>
                 </button>
             </a>
             <!--搜索框开始-->