更新搜索错误

更新域名部署下后台刷新错误
更新layer关闭按钮的样式错误

README.md

@@ -37,23 +37,16 @@ http://demo.fastadmin.net
 
 ## **界面截图**
 ![控制台](//git.oschina.net/uploads/images/2017/0411/113717_e99ff3e7_10933.png "控制台")
-![权限分组](//git.oschina.net/uploads/images/2017/0411/115838_2a541809_10933.png "权限分组")
-![规则节点](//git.oschina.net/uploads/images/2017/0411/113821_ab9040f4_10933.png "规则节点")
-![微信管理](//git.oschina.net/uploads/images/2017/0411/113842_bf52d293_10933.png "微信菜单管理")
-![单页添加](//git.oschina.net/uploads/images/2017/0411/113908_23144e89_10933.png "单页添加")
-![添加分组](//git.oschina.net/uploads/images/2017/0411/113932_7891b543_10933.png "添加分组")
-![一键生成CRUD](//box.kancloud.cn/b56b9655aef1e6c64b98eb1b264bd3bf_1061x775.gif "一键生成CRUD")
-![一键生成权限节点](//box.kancloud.cn/4d4e92f0b56e93990406124a35a342b0_1065x770.gif "一键生成权限节点")
 
 ## **问题反馈**
 
 在使用中有任何问题，欢迎反馈给我，可以用以下联系方式跟我交流
 
-QQ群: 636393962
+QQ群: [636393962](https://jq.qq.com/?_wv=1027&k=487PNBb)
 
 Email: (karsonzhang#163.com, 把#换成@)
 
-weibo: @karsonzhang
+weibo: [@karsonzhang](https://weibo.com/karsonzhang)
 
 Github: https://github.com/karsonzhang/fastadmin
 

application/common/controller/Backend.php

@@ -88,6 +88,11 @@ class Backend extends Controller
             $start = stripos($url, 'index.php');
             $start = $start !== false ? $start : 0;
             $url = substr($url, 0, $start + 9) . str_replace('.', '/', substr($url, $start + 9));
+            // 如果是域名部署则加上前缀
+            if (Config::get('url_domain_deploy'))
+            {
+                $url = rtrim(url('/'), '/') . $url;
+            }
             header("location:" . url('index/index#!' . urlencode($url), '', false));
             exit;
         }
@@ -202,12 +207,26 @@ class Backend extends Controller
                     break;
                 case 'IS NULL':
                 case 'IS NOT NULL':
-                    $where[] = [$k, str_replace(' NULL', '', $sym), NULL];
+                    $where[] = [$k, strtolower(str_replace('IS ', '', $sym))];
                     break;
                 default:
                     break;
             }
         }
+        $where = function($query) use ($where)
+        {
+            foreach ($where as $k => $v)
+            {
+                if (is_array($v))
+                {
+                    call_user_func_array([$query, 'where'], $v);
+                }
+                else
+                {
+                    $query->where($v);
+                }
+            }
+        };
         return [$where, $sort, $order, $offset, $limit];
     }
 

public/assets/css/backend-func.css

@@ -460,6 +460,14 @@ body {
 .layui-layer-setwin .layui-layer-close1:after {
   content: "\e626";
 }
+.layui-layer-setwin .layui-layer-close2,
+.layui-layer-setwin .layui-layer-close2:hover {
+  background: url('../libs/layer/build/skin/default/icon.png') no-repeat -149px -31px !important;
+}
+.layui-layer-setwin .layui-layer-close2:after,
+.layui-layer-setwin .layui-layer-close2:hover:after {
+  display: none;
+}
 /*手机版样式*/
 @media (max-width: 480px) {
   .nav-addtabs {

public/assets/js/require-table.js

@@ -253,6 +253,8 @@ define(['jquery', 'bootstrap', 'backend', 'config', 'toastr', 'moment', 'bootstr
             // 单元格数据格式化
             formatter: {
                 icon: function (value, row, index) {
+                    if (!value)
+                        return '';
                     value = value.indexOf(" ") > -1 ? value : "fa fa-" + value;
                     //渲染fontawesome图标
                     return '<i class="' + value + '"></i> ' + value;

public/assets/less/backend-func.less

@@ -496,6 +496,12 @@ body {
             content: "\e626";
         }
     }
+    .layui-layer-close2,.layui-layer-close2:hover{
+        background:url('../libs/layer/build/skin/default/icon.png') no-repeat -149px -31px !important;
+        &:after {
+            display:none;
+        }
+    }
 }
 
 /*手机版样式*/