Compare commits

..

No commits in common. "8f7a55928c9fb14aa34da9671b8f2a2ffd1af12f" and "26a5ca4a2cff596b96a8de859820c83b3e725464" have entirely different histories.

2 changed files with 2 additions and 2 deletions

View File

@ -24,7 +24,7 @@ class User extends Backend
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\User;
$this->model = model('User');
}
/**

View File

@ -992,7 +992,7 @@ define(['jquery', 'bootstrap', 'moment', 'moment/locale/zh-cn', 'bootstrap-table
$.each(dropdowns, function (i, j) {
dropdownHtml.push('<div class="btn-group"><button type="button" class="btn btn-primary dropdown-toggle btn-xs" data-toggle="dropdown">' + i + '</button><button type="button" class="btn btn-primary dropdown-toggle btn-xs" data-toggle="dropdown"><span class="caret"></span></button><ul class="dropdown-menu dropdown-menu-right"><li>' + j.join('</li><li>') + '</li></ul></div>');
});
html.unshift(dropdownHtml.join(' '));
html.unshift(dropdownHtml);
}
return html.join(' ');
},