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

ComposerUpdate

Browse Source
This commit is contained in:
邹景立 2021-03-27 15:03:10 +08:00
parent 2d3995ca19
commit cb3f8fc042
9 changed files with 29 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/data/view/news/item/index.html
View File

@ -9,8 +9,8 @@
<button class='layui-btn layui-btn-sm layui-btn-primary' data-action='{:url("remove")}' data-confirm="确定要删除这些文章吗？" data-rule="id#{key}">删除文章</button> <button class='layui-btn layui-btn-sm layui-btn-primary' data-action='{:url("remove")}' data-confirm="确定要删除这些文章吗？" data-rule="id#{key}">删除文章</button>
<!--{/if}--> <!--{/if}-->
<!--{if auth("news_mark/index")}--> <!--{if auth("news.mark/index")}-->
<button class='layui-btn layui-btn-sm layui-btn-primary' data-iframe='{:url("news_mark/index")}' data-title="标签管理" data-width="900px">标签管理</button> <button class='layui-btn layui-btn-sm layui-btn-primary' data-iframe='{:url("news.mark/index")}' data-title="标签管理" data-width="900px">标签管理</button>
<!--{/if}--> <!--{/if}-->
{/block} {/block}

19
app/data/view/news/mark/index.html
View File

@ -33,18 +33,21 @@
<td>{if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">已激活</span>{/if}</td> <td>{if $vo.status eq 0}<span class="color-red">已禁用</span>{elseif $vo.status eq 1}<span class="color-green">已激活</span>{/if}</td>
<td class="text-left nowrap">{$vo.create_at|format_datetime}</td> <td class="text-left nowrap">{$vo.create_at|format_datetime}</td>
<td class='text-left nowrap'> <td class='text-left nowrap'>
{if auth("edit")} <!--{if auth("edit")}-->
<a class="layui-btn layui-btn-sm" data-dbclick data-modal="{:url('edit')}?id={$vo.id}" data-title="编辑标签" data-width="500px">编 辑</a> <a class="layui-btn layui-btn-sm" data-dbclick data-modal="{:url('edit')}?id={$vo.id}" data-title="编辑标签" data-width="500px">编 辑</a>
{/if} <!--{/if}-->
{if auth("state") and $vo.status eq 1}
<!--{if auth("state") and $vo.status eq 1}-->
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a> <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#0">禁 用</a>
{/if} <!--{/if}-->
{if auth("state") and $vo.status eq 0}
<!--{if auth("state") and $vo.status eq 0}-->
<a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a> <a class="layui-btn layui-btn-sm layui-btn-warm" data-action="{:url('state')}" data-value="id#{$vo.id};status#1">激 活</a>
{/if} <!--{/if}-->
{if auth("remove")}
<!--{if auth("remove")}-->
<a class="layui-btn layui-btn-sm layui-btn-danger" data-action="{:url('remove')}" data-confirm="确定要删除该标签吗？" data-value="id#{$vo.id}">删 除</a> <a class="layui-btn layui-btn-sm layui-btn-danger" data-action="{:url('remove')}" data-confirm="确定要删除该标签吗？" data-value="id#{$vo.id}">删 除</a>
{/if} <!--{/if}-->
</td> </td>
</tr> </tr>
{/foreach} {/foreach}

2
app/data/view/shop/goods/form.html
View File

@ -1,7 +1,7 @@
{extend name="../../admin/view/main"} {extend name="../../admin/view/main"}
{block name="content"} {block name="content"}
{include file='shop_goods/formstyle'} {include file='shop/goods/formstyle'}
<form autocomplete="off" class='layui-form layui-card' data-auto="true" id="GoodsForm" method="post" onsubmit="return false;"> <form autocomplete="off" class='layui-form layui-card' data-auto="true" id="GoodsForm" method="post" onsubmit="return false;">
<div class="layui-card-body padding-40 padding-bottom-20"> <div class="layui-card-body padding-40 padding-bottom-20">

4
app/data/view/shop/goods/index.html
View File

@ -15,8 +15,8 @@
<!--{/if}--> <!--{/if}-->
{/if} {/if}
<!--{if auth("shop_goods_mark/index")}--> <!--{if auth("goods.mark/index")}-->
<button class='layui-btn layui-btn-sm layui-btn-primary' data-iframe='{:url("shop_goods_mark/index")}' data-title="标签管理" data-width="900px">标签管理</button> <button class='layui-btn layui-btn-sm layui-btn-primary' data-iframe='{:url("shop.mark/index")}' data-title="标签管理" data-width="900px">标签管理</button>
<!--{/if}--> <!--{/if}-->
{/block} {/block}

8
vendor/composer/installed.json vendored
View File

@ -834,12 +834,12 @@
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/zoujingli/ThinkLibrary.git", "url": "https://github.com/zoujingli/ThinkLibrary.git",
"reference": "385e86100c264130347432a65e765b67bcabbc10" "reference": "bf9ef59bb4f9a6e470c1792b229646148b9b7476"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/385e86100c264130347432a65e765b67bcabbc10", "url": "https://api.github.com/repos/zoujingli/ThinkLibrary/zipball/bf9ef59bb4f9a6e470c1792b229646148b9b7476",
"reference": "385e86100c264130347432a65e765b67bcabbc10", "reference": "bf9ef59bb4f9a6e470c1792b229646148b9b7476",
"shasum": "", "shasum": "",
"mirrors": [ "mirrors": [
{ {
@ -856,7 +856,7 @@
"ext-mbstring": "*", "ext-mbstring": "*",
"topthink/framework": "^6.0" "topthink/framework": "^6.0"
}, },
"time": "2021-03-24T02:12:51+00:00", "time": "2021-03-27T06:55:32+00:00",
"type": "library", "type": "library",
"extra": { "extra": {
"think": { "think": {

2
vendor/services.php vendored
View File

@ -1,5 +1,5 @@
<?php <?php
// This file is automatically generated at:2021-03-27 14:25:59 // This file is automatically generated at:2021-03-27 15:02:52
declare (strict_types = 1); declare (strict_types = 1);
return array ( return array (
0 => 'think\\admin\\Library', 0 => 'think\\admin\\Library',

10
vendor/zoujingli/think-library/src/multiple/BuildUrl.php vendored
View File

@ -16,7 +16,7 @@ declare (strict_types=1);
namespace think\admin\multiple; namespace think\admin\multiple;
use think\helper\Str; use think\admin\service\NodeService;
use think\route\Url; use think\route\Url;
/** /**
@ -48,7 +48,7 @@ class BuildUrl extends Url
$action = empty($path) ? $request->action() : array_pop($path); $action = empty($path) ? $request->action() : array_pop($path);
$controller = empty($path) ? $request->controller() : array_pop($path); $controller = empty($path) ? $request->controller() : array_pop($path);
$app = empty($path) ? $this->app->http->getName() : array_pop($path); $app = empty($path) ? $this->app->http->getName() : array_pop($path);
$url = Str::snake($controller) . '/' . $action; $url = NodeService::nameTolower($controller) . '/' . $action;
$bind = $this->app->config->get('app.domain_bind', []); $bind = $this->app->config->get('app.domain_bind', []);
if ($key = array_search($app, $bind)) { if ($key = array_search($app, $bind)) {
isset($bind[$_SERVER['SERVER_NAME']]) && $domain = $_SERVER['SERVER_NAME']; isset($bind[$_SERVER['SERVER_NAME']]) && $domain = $_SERVER['SERVER_NAME'];
@ -62,7 +62,11 @@ class BuildUrl extends Url
return $url; return $url;
} }
public function build() /**
* Build URL
* @return string
*/
public function build(): string
{ {
$url = $this->url; $url = $this->url;
$vars = $this->vars; $vars = $this->vars;

2
vendor/zoujingli/think-library/src/service/NodeService.php vendored
View File

@ -31,7 +31,7 @@ class NodeService extends Service
* @param string $name * @param string $name
* @return string * @return string
*/ */
public function nameTolower(string $name): string public static function nameTolower(string $name): string
{ {
$dots = []; $dots = [];
foreach (explode('.', strtr($name, '/', '.')) as $dot) { foreach (explode('.', strtr($name, '/', '.')) as $dot) {

1
vendor/zoujingli/think-library/src/service/SystemService.php vendored
View File

@ -18,7 +18,6 @@ declare (strict_types=1);
namespace think\admin\service; namespace think\admin\service;
use think\admin\Service; use think\admin\Service;
use think\App;
use think\db\Query; use think\db\Query;
use think\helper\Str; use think\helper\Str;