浏览代码

优化会员列表显示
优化个人资料列表显示
优化基类模型

Karson 5 年之前
父节点
当前提交
e550b327dd

+ 2 - 2
application/admin/controller/general/Profile.php

@@ -24,10 +24,10 @@ class Profile extends Backend
         //设置过滤方法
         $this->request->filter(['strip_tags', 'trim']);
         if ($this->request->isAjax()) {
-            $model = model('AdminLog');
+            $this->model = model('AdminLog');
             list($where, $sort, $order, $offset, $limit) = $this->buildparams();
 
-            $list = $model
+            $list = $this->model
                 ->where($where)
                 ->where('admin_id', $this->auth->id)
                 ->order($sort, $order)

+ 3 - 3
application/admin/view/user/user/index.html

@@ -15,9 +15,9 @@
                             </ul>
                         </div>
                     </div>
-                    <table id="table" class="table table-striped table-bordered table-hover" 
-                           data-operate-edit="{:$auth->check('user/user/edit')}" 
-                           data-operate-del="{:$auth->check('user/user/del')}" 
+                    <table id="table" class="table table-striped table-bordered table-hover table-nowrap"
+                           data-operate-edit="{:$auth->check('user/user/edit')}"
+                           data-operate-del="{:$auth->check('user/user/del')}"
                            width="100%">
                     </table>
                 </div>

+ 8 - 5
application/common/controller/Backend.php

@@ -388,7 +388,7 @@ class Backend extends Controller
                         $arr = $arr[0];
                     }
                     $tableArr = explode('.', $k);
-                    if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias)) {
+                    if (count($tableArr) > 1 && $tableArr[0] != $name && !in_array($tableArr[0], $alias) && !empty($this->model)) {
                         //修复关联模型下时间无法搜索的BUG
                         $relation = Loader::parseName($tableArr[0], 1, false);
                         $alias[$this->model->$relation()->getTable()] = $tableArr[0];
@@ -406,12 +406,15 @@ class Backend extends Controller
             }
             $index++;
         }
-
-        $this->model->alias($alias);
+        if (!empty($this->model)) {
+            $this->model->alias($alias);
+        }
         $model = $this->model;
         $where = function ($query) use ($where, $alias, $bind, &$model) {
-            $model->alias($alias);
-            $model->bind($bind);
+            if (!empty($model)) {
+                $model->alias($alias);
+                $model->bind($bind);
+            }
             foreach ($where as $k => $v) {
                 if (is_array($v)) {
                     call_user_func_array([$query, 'where'], $v);