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

application/admin/view/index.html

@@ -28,7 +28,7 @@
             <ul class="nav" id="side-menu">
                 <li class="nav-header">
                     <div class="dropdown profile-element">
-                        <span><img alt="image" height="48px" class="" src="{$settings['logo']}"/></span>
+                        <span><img alt="image" height="48px" width="48px" class="" src="{$settings['logo']}"/></span>
                         <span style="font-size:25px;position:absolute;margin:8px 5px;">{$settings['enterprise_name']}</span>
                         <a data-toggle="dropdown" class="dropdown-toggle" href="#">
                             <span class="clear">

application/admin/view/kfnotice/index.html

@@ -35,8 +35,9 @@
                     </div>
 
                     <div class="form-group">
-                        <div class="layui-input-inline">
-                            <select name="sendtype" id="sendtype" class="form-control">
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="sendtype" value="0"/>
+                            <select lay-verify="required" lay-filter="sendtype">
                                 <option value="0" selected>全部状态</option>
                                 <option value="1">已发送</option>
                                 <option value="2">延迟发送</option>
@@ -44,9 +45,20 @@
                         </div>
                     </div>
 
+                    <!--<div class="form-group">-->
+                        <!--<div class="layui-input-inline">-->
+                            <!--<select name="sendtype" id="sendtype" class="form-control">-->
+                                <!--<option value="0" selected>全部状态</option>-->
+                                <!--<option value="1">已发送</option>-->
+                                <!--<option value="2">延迟发送</option>-->
+                            <!--</select>-->
+                        <!--</div>-->
+                    <!--</div>-->
+
                     <div class="form-group">
-                        <div class="layui-input-inline">
-                            <select name="groupid" id="groupid" class="form-control">
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="groupid" value="0"/>
+                            <select lay-verify="required" lay-filter="groupid">
                                 <option value="0" selected>所有分组</option>
                                 {volist name="groups" id="vo"}
                                 <option value="{$vo.id}">{$vo.name}</option>
@@ -55,15 +67,36 @@
                         </div>
                     </div>
 
+                    <!--<div class="form-group">-->
+                        <!--<div class="layui-input-inline">-->
+                            <!--<select name="groupid" id="groupid" class="form-control">-->
+                                <!--<option value="0" selected>所有分组</option>-->
+                                <!--{volist name="groups" id="vo"}-->
+                                <!--<option value="{$vo.id}">{$vo.name}</option>-->
+                                <!--{/volist}-->
+                            <!--</select>-->
+                        <!--</div>-->
+                    <!--</div>-->
+
                     <div class="form-group">
-                        <div class="layui-input-inline">
-                            <select name="txttype" id="txttype" class="form-control">
+                        <div class="input-group col-sm-4 layui-form" style="width: 100px;">
+                            <input type="hidden" id="txttype" value="1"/>
+                            <select lay-verify="required" lay-filter="txttype">
                                 <option value="1">标题</option>
                                 <option value="2">内容</option>
                             </select>
                         </div>
                     </div>
 
+                    <!--<div class="form-group">-->
+                        <!--<div class="layui-input-inline">-->
+                            <!--<select name="txttype" id="txttype" class="form-control">-->
+                                <!--<option value="1">标题</option>-->
+                                <!--<option value="2">内容</option>-->
+                            <!--</select>-->
+                        <!--</div>-->
+                    <!--</div>-->
+
                     <div class="form-group">
                         <input type="text" class="form-control" id="txttext" name="txttext" placeholder="文本">
                     </div>
@@ -103,7 +136,29 @@
 <script src="__JS__/plugins/bootstrap-table/bootstrap-table.min.js"></script>
 <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.all.js"></script>
+<script type="text/javascript">
+
+    layui.use(['form', 'upload'], function(){
+        var form = layui.form;
+
+        form.on('select(sendtype)', function(value){
+            $("#sendtype").val(value.value);
+            onSearch()
+        });
+
+        form.on('select(groupid)', function(value){
+            $("#groupid").val(value.value);
+            onSearch()
+        });
+        form.on('select(txttype)', function(value){
+            $("#txttype").val(value.value);
+            onSearch()
+        });
+    });
+
+</script>
 <script type="text/javascript">
     var ReturnRes;
 
@@ -140,7 +195,10 @@
                 var param = {
                     pageNumber: params.pageNumber,
                     pageSize: params.pageSize,
-                    searchText: getSearch()
+                    searchText: getSearch(),
+                    sendtype:$('#sendtype').val(),
+                    groupid:$('#groupid').val(),
+                    txttype:$('#txttype').val()
                 };
                 return param;
             },

application/service/controller/Index.php

@@ -265,7 +265,7 @@ class Index extends Common
 
         $data = db('servicenotice')->where('id',$servicenotice_id)->find();
         if(empty($data)){
-            return json(['code' => 1, 'data' => '', 'msg' => '公告不存在']);
+            return json(['code' => -1, 'data' => '', 'msg' => '公告不存在']);
         }
 
         try{