blackteay/ThinkAdmin
1
0
Fork 0
mirror of https://gitee.com/zoujingli/ThinkAdmin.git synced 2025-04-06 03:58:04 +08:00
Code Issues Projects Releases Wiki Activity

[更新]同步framework 代码

Browse Source
This commit is contained in:
Anyon 2019-04-30 17:59:08 +08:00
parent 4df030eb4b
commit 04e20af250
7 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/controller/User.php
View File

@ -45,8 +45,8 @@ class User extends Controller
public function index() public function index()
{ {
$this->title = '系统用户管理'; $this->title = '系统用户管理';
$where = ['is_deleted' => '0']; $query = $this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status');
$this->_query($this->table)->like('username,phone,mail')->dateBetween('login_at')->equal('status')->where($where)->page(); $query->where(['is_deleted' => '0'])->order('id desc')->page();
} }
/** /**

2
application/admin/view/auth/index_search.html
View File

@ -17,7 +17,7 @@
<label class="layui-form-label">使用状态</label> <label class="layui-form-label">使用状态</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select class="layui-select" name="status"> <select class="layui-select" name="status">
{foreach [''=>'-- 全部 --','0'=>'已禁用的权限','1'=>'使用中的权限'] as $k=>$v} {foreach [''=>'-- 全部状态 --','0'=>'已禁用的权限','1'=>'使用中的权限'] as $k=>$v}
{eq name='Think.get.status' value='$k.""'} {eq name='Think.get.status' value='$k.""'}
<option selected value="{$k}">{$v}</option> <option selected value="{$k}">{$v}</option>
{else} {else}

2
application/admin/view/message/index_search.html
View File

@ -22,7 +22,7 @@
<label class="layui-form-label">读取状态</label> <label class="layui-form-label">读取状态</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select class="layui-select" name="read_state"> <select class="layui-select" name="read_state">
{foreach [''=>'-- 全部 --','0'=>'未读取消息','1'=>'已读取消息'] as $k=>$v} {foreach [''=>'-- 全部状态 --','0'=>'未读取消息','1'=>'已读取消息'] as $k=>$v}
{eq name='Think.get.read_state' value='$k.""'} {eq name='Think.get.read_state' value='$k.""'}
<option selected value="{$k}">{$v}</option> <option selected value="{$k}">{$v}</option>
{else} {else}

2
application/admin/view/node/index.html
View File

@ -2,7 +2,7 @@
{block name='button'} {block name='button'}
{if auth("admin/node/clear")} {if auth("admin/node/clear")}
<button data-load='{:url("clear")}' class='layui-btn layui-btn-sm layui-btn-primary'>清理无效记录</button> <button data-load='{:url("clear")}' class='layui-btn layui-btn-sm layui-btn-primary'>清理记录</button>
{/if} {/if}
{/block} {/block}

4
application/admin/view/queue/index_search.html
View File

@ -22,7 +22,7 @@
<label class="layui-form-label">任务指令</label> <label class="layui-form-label">任务指令</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select class="layui-select" name="uri" lay-search> <select class="layui-select" name="uri" lay-search>
<option value="">-- 全部 --</option> <option value="">-- 全部指令 --</option>
{foreach $uris as $uri} {foreach $uris as $uri}
<!--{eq name='Think.get.uri' value='$uri'}--> <!--{eq name='Think.get.uri' value='$uri'}-->
<option selected value="{$uri}">{$uri}</option> <option selected value="{$uri}">{$uri}</option>
@ -37,7 +37,7 @@
<label class="layui-form-label">任务状态</label> <label class="layui-form-label">任务状态</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select name="status" class="layui-select"> <select name="status" class="layui-select">
{foreach [''=>'-- 全部 --','1'=>'待处理','2'=>'处理中','3'=>'处理完成','4'=>'处理失败'] as $k=>$v} {foreach [''=>'-- 全部状态 --','1'=>'待处理','2'=>'处理中','3'=>'处理完成','4'=>'处理失败'] as $k=>$v}
<!--{if $Think.get.status eq $k}--> <!--{if $Think.get.status eq $k}-->
<option selected value="{$k}">{$v}</option> <option selected value="{$k}">{$v}</option>
<!--{else}--> <!--{else}-->

2
application/admin/view/user/index_search.html
View File

@ -29,7 +29,7 @@
<label class="layui-form-label">使用状态</label> <label class="layui-form-label">使用状态</label>
<div class="layui-input-inline"> <div class="layui-input-inline">
<select class="layui-select" name="status"> <select class="layui-select" name="status">
{foreach [''=>'-- 全部 --','0'=>'已禁用的账号','1'=>'使用中的账号'] as $k=>$v} {foreach [''=>'-- 全部状态 --','0'=>'已禁用的账号','1'=>'使用中的账号'] as $k=>$v}
{eq name='Think.get.status' value='$k.""'} {eq name='Think.get.status' value='$k.""'}
<option selected value="{$k}">{$v}</option> <option selected value="{$k}">{$v}</option>
{else} {else}

1
public/static/admin.js
View File

@ -159,7 +159,6 @@ $(function () {
this.show = function (html) { this.show = function (html) {
$(this.selecter).html(html); $(this.selecter).html(html);
$([0, 500, 1000]).map(function (index, time) { $([0, 500, 1000]).map(function (index, time) {
console.log(arguments)
setTimeout(that.reInit, time) setTimeout(that.reInit, time)
}); });
}; };