景龙 / feifangu · 提交

转到一个项目

作者 jinglong
提交 35327b3220620c31149a657d21e9991d65be0b53 1 个父辈 77d5734d
1 个管道 的构建 通过 耗费 7 秒

修改用户提出的问题

内嵌 并排对比
正在显示 12 个修改的文件 包含 417 行增加 和 456 行删除
... ... @@ -63,7 +63,7 @@ class Banner extends Backend
->select();
foreach ($list as $row) {
$row->visible(['id','image','createtime','url']);
$row->visible(['id','image','createtime','url','status']);
}
$list = collection($list)->toArray();
... ...
... ... @@ -4,6 +4,7 @@ namespace app\admin\controller;
use app\common\controller\Backend;
use think\Config;
use think\Db;
/**
* 控制台
... ... @@ -33,10 +34,13 @@ class Dashboard extends Backend
Config::parse($addonComposerCfg, "json", "composer");
$config = Config::get("composer");
$addonVersion = isset($config['version']) ? $config['version'] : __('Unknown');
//查询订单数量
$order_total = Db::name('order')->useSoftDelete('deletetime')->count();
$this->view->assign([
'totaluser' => 35200,
'totalviews' => 219390,
'totalorder' => 32143,
'totalorder' => $order_total,
'totalorderamount' => 174800,
'todayuserlogin' => 321,
'todayusersignup' => 430,
... ...
... ... @@ -24,7 +24,7 @@ class Ulist extends Backend
$this->model = new \app\admin\model\Ulist;
//品类分类名称
$res = Db::name('goods')->field('id,type_name,name')->select();
$arr = [];
$arr[0] = '请选择商品';
foreach($res as $value){
$arr[$value['id']] = $value['name'].'------'.$value['type_name'];
}
... ... @@ -69,7 +69,7 @@ class Ulist extends Backend
->select();
foreach ($list as $row) {
$row->visible(['id','title','nickname','image','address','createtime']);
$row->visible(['id','title','nickname','image','address','createtime','status']);
$row->visible(['goods']);
$row->getRelation('goods')->visible(['name','type_name']);
}
... ...
... ... @@ -12,13 +12,13 @@
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('banner/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
<!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('banner/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
<!--<div class="dropdown btn-group {:$auth->check('banner/multi')?'':'hide'}">-->
<!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
<!--<ul class="dropdown-menu text-left" role="menu">-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
<!--</ul>-->
<!--</div>-->
<div class="dropdown btn-group {:$auth->check('banner/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
<ul class="dropdown-menu text-left" role="menu">
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i>启用</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i>禁用</a></li>
</ul>
</div>
</div>
... ...
<!-- Logo -->
<a href="javascript:;" class="logo">
<!-- 迷你模式下Logo的大小为50X50 -->
<span class="logo-mini">{$site.name|mb_substr=0,4,'utf-8'|mb_strtoupper='utf-8'|htmlentities}</span>
<!--<span class="logo-mini">{$site.name|mb_substr=0,4,'utf-8'|mb_strtoupper='utf-8'|htmlentities}</span>-->
<span class="logo-mini">非凡谷VIVAKOOL</span>
<!-- 普通模式下Logo -->
<span class="logo-lg"><b>{$site.name|mb_substr=0,4,'utf-8'|htmlentities}</b>{$site.name|mb_substr=4,null,'utf-8'|htmlentities}</span>
<!--<span class="logo-lg"><b>{$site.name|mb_substr=0,4,'utf-8'|htmlentities}</b>{$site.name|mb_substr=4,null,'utf-8'|htmlentities}</span>-->
<span class="logo-lg">非凡谷VIVAKOOL</span>
</a>
<!-- 顶部通栏样式 -->
... ... @@ -24,30 +26,30 @@
<div class="navbar-custom-menu">
<ul class="nav navbar-nav">
<li>
<a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i></a>
</li>
<!--<li>-->
<!--<a href="__PUBLIC__" target="_blank"><i class="fa fa-home" style="font-size:14px;"></i></a>-->
<!--</li>-->
<!-- 账号信息下拉框 -->
<li class="hidden-xs">
<a href="javascript:;" data-toggle="checkupdate" title="{:__('Check for updates')}">
<i class="fa fa-refresh"></i>
</a>
</li>
<!--&lt;!&ndash; 账号信息下拉框 &ndash;&gt;-->
<!--<li class="hidden-xs">-->
<!--<a href="javascript:;" data-toggle="checkupdate" title="{:__('Check for updates')}">-->
<!--<i class="fa fa-refresh"></i>-->
<!--</a>-->
<!--</li>-->
<!-- 清除缓存 -->
<li>
<a href="javascript:;" data-toggle="dropdown" title="{:__('Wipe cache')}">
<i class="fa fa-trash"></i>
</a>
<ul class="dropdown-menu wipecache">
<li><a href="javascript:;" data-type="all"><i class="fa fa-trash"></i> {:__('Wipe all cache')}</a></li>
<li class="divider"></li>
<li><a href="javascript:;" data-type="content"><i class="fa fa-file-text"></i> {:__('Wipe content cache')}</a></li>
<li><a href="javascript:;" data-type="template"><i class="fa fa-file-image-o"></i> {:__('Wipe template cache')}</a></li>
<li><a href="javascript:;" data-type="addons"><i class="fa fa-rocket"></i> {:__('Wipe addons cache')}</a></li>
</ul>
</li>
<!--&lt;!&ndash; 清除缓存 &ndash;&gt;-->
<!--<li>-->
<!--<a href="javascript:;" data-toggle="dropdown" title="{:__('Wipe cache')}">-->
<!--<i class="fa fa-trash"></i>-->
<!--</a>-->
<!--<ul class="dropdown-menu wipecache">-->
<!--<li><a href="javascript:;" data-type="all"><i class="fa fa-trash"></i> {:__('Wipe all cache')}</a></li>-->
<!--<li class="divider"></li>-->
<!--<li><a href="javascript:;" data-type="content"><i class="fa fa-file-text"></i> {:__('Wipe content cache')}</a></li>-->
<!--<li><a href="javascript:;" data-type="template"><i class="fa fa-file-image-o"></i> {:__('Wipe template cache')}</a></li>-->
<!--<li><a href="javascript:;" data-type="addons"><i class="fa fa-rocket"></i> {:__('Wipe addons cache')}</a></li>-->
<!--</ul>-->
<!--</li>-->
<!-- 多语言列表 -->
{if $Think.config.lang_switch_on}
... ...
<style type="text/css">
.sm-st {
background: #fff;
padding: 20px;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
margin-bottom: 20px;
-webkit-box-shadow: 0 1px 0px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 0px rgba(0, 0, 0, 0.05);
background:#fff;
padding:20px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
border-radius:3px;
margin-bottom:20px;
-webkit-box-shadow: 0 1px 0px rgba(0,0,0,0.05);
box-shadow: 0 1px 0px rgba(0,0,0,0.05);
}
.sm-st-icon {
width: 60px;
height: 60px;
display: inline-block;
line-height: 60px;
text-align: center;
font-size: 30px;
background: #eee;
-webkit-border-radius: 5px;
-moz-border-radius: 5px;
border-radius: 5px;
float: left;
margin-right: 10px;
color: #fff;
width:60px;
height:60px;
display:inline-block;
line-height:60px;
text-align:center;
font-size:30px;
background:#eee;
-webkit-border-radius:5px;
-moz-border-radius:5px;
border-radius:5px;
float:left;
margin-right:10px;
color:#fff;
}
.sm-st-info {
font-size: 12px;
padding-top: 2px;
font-size:12px;
padding-top:2px;
}
.sm-st-info span {
display: block;
font-size: 24px;
font-weight: 600;
display:block;
font-size:24px;
font-weight:600;
}
.orange {
background: #fa8564 !important;
background:#fa8564 !important;
}
.tar {
background: #45cf95 !important;
background:#45cf95 !important;
}
.sm-st .green {
background: #86ba41 !important;
background:#86ba41 !important;
}
.pink {
background: #AC75F0 !important;
background:#AC75F0 !important;
}
.yellow-b {
background: #fdd752 !important;
}
.stat-elem {
background-color: #fff;
... ... @@ -67,12 +58,12 @@
.stat-info {
text-align: center;
background-color: #fff;
background-color:#fff;
border-radius: 5px;
margin-top: -5px;
padding: 8px;
-webkit-box-shadow: 0 1px 0px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 0px rgba(0, 0, 0, 0.05);
-webkit-box-shadow: 0 1px 0px rgba(0,0,0,0.05);
box-shadow: 0 1px 0px rgba(0,0,0,0.05);
font-style: italic;
}
... ... @@ -84,15 +75,12 @@
.st-red {
background-color: #F05050;
}
.st-green {
background-color: #27C24C;
}
.st-violet {
background-color: #7266ba;
}
.st-blue {
background-color: #23b7e5;
}
... ... @@ -104,7 +92,7 @@
text-align: center;
vertical-align: middle;
width: 50px;
float: left;
float:left;
}
.stat {
... ... @@ -112,42 +100,26 @@
overflow: hidden;
text-overflow: ellipsis;
display: inline-block;
margin-right: 10px;
}
margin-right: 10px; }
.stat .value {
font-size: 20px;
line-height: 24px;
overflow: hidden;
text-overflow: ellipsis;
font-weight: 500;
}
font-weight: 500; }
.stat .name {
overflow: hidden;
text-overflow: ellipsis;
}
text-overflow: ellipsis; }
.stat.lg .value {
font-size: 26px;
line-height: 28px;
}
line-height: 28px; }
.stat.lg .name {
font-size: 16px;
}
.stat-col .progress {
height: 2px;
}
.stat-col .progress-bar {
line-height: 2px;
height: 2px;
}
font-size: 16px; }
.stat-col .progress {height:2px;}
.stat-col .progress-bar {line-height:2px;height:2px;}
.item {
padding: 30px 0;
padding:30px 0;
}
</style>
{if preg_match('/\/admin\/|admin\.php|admin_d75KABNWt\.php/i', url())}
... ... @@ -163,346 +135,328 @@
<!--<li><a href="#two" data-toggle="tab">{:__('Custom')}</a></li>-->
</ul>
</div>
<div class="panel-body home-info">
<ul class="list-inline">
<li>银河百荣科技</li>
</ul>
<div class="panel-body">
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade active in" id="one">
<div class="row">
<!--<div class="col-sm-3 col-xs-6">-->
<!--<div class="sm-st clearfix">-->
<!--<span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>-->
<!--<div class="sm-st-info">-->
<!--<span>{$totaluser}</span>-->
<!--{:__('Total user')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-sm-3 col-xs-6">-->
<!--<div class="sm-st clearfix">-->
<!--<span class="sm-st-icon st-violet"><i class="fa fa-book"></i></span>-->
<!--<div class="sm-st-info">-->
<!--<span>{$totalviews}</span>-->
<!--{:__('Total view')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<div class="col-sm-3 col-xs-6">
<div class="sm-st clearfix">
<span class="sm-st-icon st-blue"><i class="fa fa-shopping-bag"></i></span>
<div class="sm-st-info">
<span>{$totalorder}</span>
{:__('Total order')}
</div>
</div>
</div>
<!--<div class="col-sm-3 col-xs-6">-->
<!--<div class="sm-st clearfix">-->
<!--<span class="sm-st-icon st-green"><i class="fa fa-cny"></i></span>-->
<!--<div class="sm-st-info">-->
<!--<span>{$totalorderamount}</span>-->
<!--{:__('Total order amount')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
<!--<div class="row">-->
<!--<div class="col-lg-8">-->
<!--<div id="echart" style="height:200px;width:100%;"></div>-->
<!--</div>-->
<!--<div class="col-lg-4">-->
<!--<div class="card sameheight-item stats">-->
<!--<div class="card-block">-->
<!--<div class="row row-sm stats-container">-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"> <i class="fa fa-rocket"></i> </div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$todayusersignup} </div>-->
<!--<div class="name"> {:__('Today user signup')} </div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 30%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"> <i class="fa fa-shopping-cart"></i> </div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$todayuserlogin} </div>-->
<!--<div class="name"> {:__('Today user login')} </div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"> <i class="fa fa-line-chart"></i> </div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$todayorder} </div>-->
<!--<div class="name"> {:__('Today order')} </div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"> <i class="fa fa-users"></i> </div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$unsettleorder} </div>-->
<!--<div class="name"> {:__('Unsettle order')} </div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"> <i class="fa fa-list-alt"></i> </div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$sevendnu} </div>-->
<!--<div class="name"> {:__('Seven dnu')} </div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"> <i class="fa fa-dollar"></i> </div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$sevendau} </div>-->
<!--<div class="name"> {:__('Seven dau')} </div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="row" style="margin-top:15px;">-->
<!--<div class="col-lg-12">-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-blue">-->
<!--<div class="panel-body">-->
<!--<div class="panel-title">-->
<!--<span class="label label-success pull-right">{:__('Real time')}</span>-->
<!--<h5>{:__('Category count')}</h5>-->
<!--</div>-->
<!--<div class="panel-content">-->
<!--<h1 class="no-margins">1234</h1>-->
<!--<div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>-->
<!--<small>{:__('Category count tips')}</small>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-aqua-gradient">-->
<!--<div class="panel-body">-->
<!--<div class="ibox-title">-->
<!--<span class="label label-info pull-right">{:__('Real time')}</span>-->
<!--<h5>{:__('Attachment count')}</h5>-->
<!--</div>-->
<!--<div class="ibox-content">-->
<!--<h1 class="no-margins">1043</h1>-->
<!--<div class="stat-percent font-bold text-gray"><i class="fa fa-modx"></i> 2592</div>-->
<!--<small>{:__('Attachment count tips')}</small>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-purple-gradient">-->
<!--<div class="panel-body">-->
<!--<div class="ibox-title">-->
<!--<span class="label label-primary pull-right">{:__('Real time')}</span>-->
<!--<h5>{:__('Article count')}</h5>-->
<!--</div>-->
<!--<div class="ibox-content">-->
<!--<div class="row">-->
<!--<div class="col-md-6">-->
<!--<h1 class="no-margins">1234</h1>-->
<!--<div class="font-bold"><i class="fa fa-commenting"></i> <small>{:__('Comment count')}</small></div>-->
<!--</div>-->
<!--<div class="col-md-6">-->
<!--<h1 class="no-margins">6754</h1>-->
<!--<div class="font-bold"><i class="fa fa-heart"></i> <small>{:__('Like count')}</small></div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-green-gradient">-->
<!--<div class="panel-body">-->
<!--<div class="ibox-title">-->
<!--<span class="label label-primary pull-right">{:__('Real time')}</span>-->
<!--<h5>{:__('News count')}</h5>-->
<!--</div>-->
<!--<div class="ibox-content">-->
<!--<div class="row">-->
<!--<div class="col-md-6">-->
<!--<h1 class="no-margins">5302</h1>-->
<!--<div class="font-bold"><i class="fa fa-commenting"></i> <small>{:__('Comment count')}</small></div>-->
<!--</div>-->
<!--<div class="col-md-6">-->
<!--<h1 class="no-margins">8205</h1>-->
<!--<div class="font-bold"><i class="fa fa-user"></i> <small>{:__('Like count')}</small></div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--如果需要删除最新新闻和最新发贴，删除HTML后还需要删除dashboard.js中的代码-->
<!--<div class="row">-->
<!--<div class="col-lg-4">-->
<!--<div class="box box-danger">-->
<!--<div class="box-header">-->
<!--<h3 class="box-title">{:__('Recent news')}</h3>-->
<!--<div class="box-tools pull-right">-->
<!--<a href="https://www.fastadmin.net" target="_blank" class="btn btn-box-tool">{:__('More')}</a>-->
<!--</div>-->
<!--</div>-->
<!--<div class="box-body" id="news-list">-->
<!---->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-lg-4">-->
<!--<div class="box box-success">-->
<!--<div class="box-header">-->
<!--<h3 class="box-title">{:__('Recent discussion')}</h3>-->
<!--<div class="box-tools pull-right">-->
<!--<a href="https://forum.fastadmin.net" class="btn btn-box-tool">{:__('More')}</a>-->
<!--</div>-->
<!--</div>-->
<!--<div class="box-body" id="discussion-list">-->
<!---->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-lg-4">-->
<!--<div class="box box-info">-->
<!--<div class="box-header"><h3 class="box-title">{:__('Server info')}</h3></div>-->
<!--<div class="box-body">-->
<!--<table class="table table-striped">-->
<!--<tbody>-->
<!--<tr>-->
<!--<td width="140">{:__('FastAdmin version')}</td>-->
<!--<td>{$Think.config.fastadmin.version} <a href="javascript:;" class="btn btn-xs btn-checkversion">检查最新版</a></td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('FastAdmin addon version')}</td>-->
<!--<td>{$addonversion}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Sapi name')}</td>-->
<!--<td>{:php_sapi_name()}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Debug mode')}</td>-->
<!--<td>{$Think.config.app_debug?__('Yes'):__('No')}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Software')}</td>-->
<!--<td>{$Think.server.SERVER_SOFTWARE}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Upload mode')}</td>-->
<!--<td>{$uploadmode}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Upload url')}</td>-->
<!--<td>{$config.upload.uploadurl}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Upload Cdn url')}</td>-->
<!--<td>{$config.upload.cdnurl}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Timezone')}</td>-->
<!--<td>{:date_default_timezone_get()}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Cdn url')}</td>-->
<!--<td>__CDN__</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Language')}</td>-->
<!--<td>{$config.language}</td>-->
<!--</tr>-->
<!--</tbody></table>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
<!--<div class="tab-pane fade" id="two">-->
<!--<div class="row">-->
<!--<div class="col-xs-12">-->
<!--{:__('Custom zone')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
</div>
<!--<div class="panel-body">-->
<!--<div id="myTabContent" class="tab-content">-->
<!--<div class="tab-pane fade active in" id="one">-->
<!--<div class="row">-->
<!--<div class="col-sm-3 col-xs-6">-->
<!--<div class="sm-st clearfix">-->
<!--<span class="sm-st-icon st-red"><i class="fa fa-users"></i></span>-->
<!--<div class="sm-st-info">-->
<!--<span>{$totaluser}</span>-->
<!--{:__('Total user')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-sm-3 col-xs-6">-->
<!--<div class="sm-st clearfix">-->
<!--<span class="sm-st-icon st-violet"><i class="fa fa-book"></i></span>-->
<!--<div class="sm-st-info">-->
<!--<span>{$totalviews}</span>-->
<!--{:__('Total view')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-sm-3 col-xs-6">-->
<!--<div class="sm-st clearfix">-->
<!--<span class="sm-st-icon st-blue"><i class="fa fa-shopping-bag"></i></span>-->
<!--<div class="sm-st-info">-->
<!--<span>{$totalorder}</span>-->
<!--{:__('Total order')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-sm-3 col-xs-6">-->
<!--<div class="sm-st clearfix">-->
<!--<span class="sm-st-icon st-green"><i class="fa fa-cny"></i></span>-->
<!--<div class="sm-st-info">-->
<!--<span>{$totalorderamount}</span>-->
<!--{:__('Total order amount')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="row">-->
<!--<div class="col-lg-8">-->
<!--<div id="echart" style="height:200px;width:100%;"></div>-->
<!--</div>-->
<!--<div class="col-lg-4">-->
<!--<div class="card sameheight-item stats">-->
<!--<div class="card-block">-->
<!--<div class="row row-sm stats-container">-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"><i class="fa fa-rocket"></i></div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$todayusersignup}</div>-->
<!--<div class="name"> {:__('Today user signup')}</div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 30%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"><i class="fa fa-shopping-cart"></i></div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$todayuserlogin}</div>-->
<!--<div class="name"> {:__('Today user login')}</div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"><i class="fa fa-line-chart"></i></div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$todayorder}</div>-->
<!--<div class="name"> {:__('Today order')}</div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"><i class="fa fa-users"></i></div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$unsettleorder}</div>-->
<!--<div class="name"> {:__('Unsettle order')}</div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"><i class="fa fa-list-alt"></i></div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$sevendnu}</div>-->
<!--<div class="name"> {:__('Seven dnu')}</div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 stat-col">-->
<!--<div class="stat-icon"><i class="fa fa-dollar"></i></div>-->
<!--<div class="stat">-->
<!--<div class="value"> {$sevendau}</div>-->
<!--<div class="name"> {:__('Seven dau')}</div>-->
<!--</div>-->
<!--<div class="progress">-->
<!--<div class="progress-bar progress-bar-success" style="width: 25%"></div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="row" style="margin-top:15px;">-->
<!--<div class="col-lg-12">-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-blue">-->
<!--<div class="panel-body">-->
<!--<div class="panel-title">-->
<!--<span class="label label-success pull-right">{:__('Real time')}</span>-->
<!--<h5>{:__('Category count')}</h5>-->
<!--</div>-->
<!--<div class="panel-content">-->
<!--<h1 class="no-margins">1234</h1>-->
<!--<div class="stat-percent font-bold text-gray"><i class="fa fa-commenting"></i> 1234</div>-->
<!--<small>{:__('Category count tips')}</small>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-aqua-gradient">-->
<!--<div class="panel-body">-->
<!--<div class="ibox-title">-->
<!--<span class="label label-info pull-right">{:__('Real time')}</span>-->
<!--<h5>{:__('Attachment count')}</h5>-->
<!--</div>-->
<!--<div class="ibox-content">-->
<!--<h1 class="no-margins">1043</h1>-->
<!--<div class="stat-percent font-bold text-gray"><i class="fa fa-modx"></i> 2592</div>-->
<!--<small>{:__('Attachment count tips')}</small>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-purple-gradient">-->
<!--<div class="panel-body">-->
<!--<div class="ibox-title">-->
<!--<span class="label label-primary pull-right">{:__('Real time')}</span>-->
<!--<h5>{:__('Article count')}</h5>-->
<!--</div>-->
<!--<div class="ibox-content">-->
<!--<div class="row">-->
<!--<div class="col-md-6">-->
<!--<h1 class="no-margins">1234</h1>-->
<!--<div class="font-bold"><i class="fa fa-commenting"></i>-->
<!--<small>{:__('Comment count')}</small>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-md-6">-->
<!--<h1 class="no-margins">6754</h1>-->
<!--<div class="font-bold"><i class="fa fa-heart"></i>-->
<!--<small>{:__('Like count')}</small>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-xs-6 col-md-3">-->
<!--<div class="panel bg-green-gradient">-->
<!--&lt;!&ndash;<div class="panel-body">&ndash;&gt;-->
<!--&lt;!&ndash;<div class="ibox-title">&ndash;&gt;-->
<!--&lt;!&ndash;<span class="label label-primary pull-right">{:__('Real time')}</span>&ndash;&gt;-->
<!--&lt;!&ndash;<h5>{:__('News count')}</h5>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;<div class="ibox-content">&ndash;&gt;-->
<!--&lt;!&ndash;<div class="row">&ndash;&gt;-->
<!--&lt;!&ndash;<div class="col-md-6">&ndash;&gt;-->
<!--&lt;!&ndash;<h1 class="no-margins">5302</h1>&ndash;&gt;-->
<!--&lt;!&ndash;<div class="font-bold"><i class="fa fa-commenting"></i>&ndash;&gt;-->
<!--&lt;!&ndash;<small>{:__('Comment count')}</small>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;<div class="col-md-6">&ndash;&gt;-->
<!--&lt;!&ndash;<h1 class="no-margins">8205</h1>&ndash;&gt;-->
<!--&lt;!&ndash;<div class="font-bold"><i class="fa fa-user"></i>&ndash;&gt;-->
<!--&lt;!&ndash;<small>{:__('Like count')}</small>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--&lt;!&ndash;</div>&ndash;&gt;-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="row">-->
<!--<div class="col-lg-4">-->
<!--<div class="box box-danger">-->
<!--<div class="box-header with-border">-->
<!--<h3 class="box-title">{:__('Recent news')}</h3>-->
<!--<div class="box-tools pull-right">-->
<!--</div>-->
<!--</div>-->
<!--<div class="box-body">-->
<!--<ul class="products-list product-list-in-box">-->
<!--{for start="1" end="8"}-->
<!--<li class="item">-->
<!--<div class="product-img">-->
<!--<img src="__CDN__/assets/img/avatar.png" style="height:40px;width:40px;">-->
<!--</div>-->
<!--<div class="product-info">-->
<!--<a href="https://www.fastadmin.net" target="_blank" class="product-title">-->
<!--FastAdmin-->
<!--<span class="label label-{:$i%3===0?'warning':($i%2===0?'success':'info')} pull-right">开源免费</span>-->
<!--</a>-->
<!--<span class="product-description">-->
<!--一款基于ThinkPHP5+Bootstrap的极速后台开发框架-->
<!--</span>-->
<!--</div>-->
<!--</li>-->
<!--{/for}-->
<!--</ul>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-lg-4">-->
<!--<div class="box box-success">-->
<!--<div class="box-header with-border">-->
<!--<h3 class="box-title">{:__('Recent discussion')}</h3>-->
<!--<div class="box-tools pull-right">-->
<!--</div>-->
<!--</div>-->
<!--<div class="box-body">-->
<!--<ul class="nav nav-pills nav-stacked">-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">一款基于ThinkPHP5+Bootstrap的极速后台开发框架<span class="pull-right text-red"><i class="fa fa-angle-down"></i> 12%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">一键生成CRUD控制器模型和视图 <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 4%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">一键压缩打包JS和CSS文件 <span class="pull-right text-red"><i class="fa fa-angle-down"></i> 3%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">一键生成控制器菜单和规则 <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 8%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">一键生成API接口文档 <span class="pull-right text-yellow"><i class="fa fa-angle-left"></i> 0%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">强大的插件扩展功能，在线安装卸载升级插件 <span class="pull-right text-red"><i class="fa fa-angle-down"></i> 10%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">通用的会员模块和API模块 <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 2%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">共用同一账号体系的Web端会员中心权限验证和API接口会员权限验证 <span class="pull-right text-red"><i class="fa fa-angle-down"></i> 6%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">二级域名部署支持，同时域名支持绑定到插件 <span class="pull-right text-yellow"><i class="fa fa-angle-left"></i> 0%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">多语言支持，服务端及客户端支持 <span class="pull-right text-yellow"><i class="fa fa-angle-left"></i> 0%</span></a></li>-->
<!--<li><a href="https://www.fastadmin.net" target="_blank">基于Bootstrap开发，自适应手机、平板、PC <span class="pull-right text-green"><i class="fa fa-angle-up"></i> 4%</span></a></li>-->
<!--</ul>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="col-lg-4">-->
<!--<div class="box box-info">-->
<!--<div class="box-header"><h3 class="box-title">{:__('Server info')}</h3></div>-->
<!--<div class="box-body" style="padding-top:0;">-->
<!--<table class="table table-striped">-->
<!--<tbody>-->
<!--<tr>-->
<!--<td width="140">{:__('FastAdmin version')}</td>-->
<!--<td>{$Think.config.fastadmin.version} <a href="javascript:;" class="btn btn-xs btn-checkversion">检查最新版</a></td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('FastAdmin addon version')}</td>-->
<!--<td>{$addonversion}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Thinkphp version')}</td>-->
<!--<td>{:THINK_VERSION}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Sapi name')}</td>-->
<!--<td>{:php_sapi_name()}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Debug mode')}</td>-->
<!--<td>{$Think.config.app_debug?__('Yes'):__('No')}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Software')}</td>-->
<!--<td>{$Think.server.SERVER_SOFTWARE}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Upload mode')}</td>-->
<!--<td>{$uploadmode}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Upload url')}</td>-->
<!--<td>{$config.upload.uploadurl}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Upload Cdn url')}</td>-->
<!--<td>{$config.upload.cdnurl}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Timezone')}</td>-->
<!--<td>{:date_default_timezone_get()}</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Cdn url')}</td>-->
<!--<td>__CDN__</td>-->
<!--</tr>-->
<!--<tr>-->
<!--<td>{:__('Language')}</td>-->
<!--<td>{$config.language}</td>-->
<!--</tr>-->
<!--</tbody>-->
<!--</table>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--<div class="tab-pane fade" id="two">-->
<!--<div class="row">-->
<!--<div class="col-xs-12">-->
<!--{:__('Custom zone')}-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
<!--</div>-->
</div>
<script id="newstpl" type="text/html">
<ul class="nav nav-stacked">
<%for(var i=0;i < news.length;i++){%>
<%var item=news[i];%>
<li>
<a href="<%=item.url%>" target="_blank">
<span class="text"><%=item.title%></span>
</a>
</li>
<%}%>
</ul>
</script>
<script id="discussiontpl" type="text/html">
<ul class="products-list product-list-in-box">
<%for(var i=0;i < news.length;i++){%>
<%var item=news[i];%>
<li class="item">
<div class="">
<a href="<%=item.url%>" target="_blank" class="product-title"><%=item.title%>
<span class="label label-warning pull-right"><%=item.comments_count%></span></a>
<span class="product-description">
<%=item.last_time%>
</span>
</div>
</li>
<%}%>
</ul>
</script>
<script>
var Orderdata = {
column: {:json_encode(array_keys($paylist))},
... ...
... ... @@ -61,7 +61,7 @@
<div class="login-screen">
<div class="well">
<div class="login-form">
<img id="profile-img" class="profile-img-card" src="__CDN__/assets/img/avatar.png" />
<img class="profile-img-card" src="/assets/img/feifangu_logo.png" />
<p id="profile-name" class="profile-name-card"></p>
<form action="" method="post" id="login-form">
... ... @@ -98,7 +98,7 @@
</div>
</div>
<!-- FastAdmin是开源程序，建议在您的网站底部保留一个FastAdmin的链接 -->
<p class="copyright"><a href="https://www.fastadmin.net">Powered By FastAdmin</a></p>
<!--<p class="copyright"><a href="https://www.fastadmin.net">Powered By FastAdmin</a></p>-->
</div>
</div>
</div>
... ...
... ... @@ -12,13 +12,13 @@
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('ulist/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
<!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('ulist/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
<!--<div class="dropdown btn-group {:$auth->check('ulist/multi')?'':'hide'}">-->
<!--<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>-->
<!--<ul class="dropdown-menu text-left" role="menu">-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
<!--</ul>-->
<!--</div>-->
<div class="dropdown btn-group {:$auth->check('ulist/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
<ul class="dropdown-menu text-left" role="menu">
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i>启用</a></li>
<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i>禁用</a></li>
</ul>
</div>
<a class="btn btn-success btn-recyclebin btn-dialog {:$auth->check('ulist/recyclebin')?'':'hide'}" href="ulist/recyclebin" title="{:__('Recycle bin')}"><i class="fa fa-recycle"></i> {:__('Recycle bin')}</a>
</div>
... ...
... ... @@ -98,7 +98,7 @@ class Index extends Api
if($this->request->isGet()){
$arr = [];
//轮播图
$res_banner = Common::selectData('banner','id,image,url');
$res_banner = Common::selectWhereData('banner',['status'=>'normal'],'id,image,url');
foreach ($res_banner as &$b_value){
$b_value['image'] = $this->auth->absolutionUrlOne($b_value['image']);
}
... ... @@ -127,8 +127,7 @@ class Index extends Api
$arr['res_design'] = $res_design;
//用户晒单
$limit = config('verify.limit');
$res_u_list = Common::selectSoftLimitData('ulist','id,images,title,nickname,address',$limit);
$res_u_list = Common::selectSoftWhereLimitData('ulist',['status'=>'normal'],'id,images,title,nickname,address','id desc');
foreach ($res_u_list as &$u_value){
$u_value['images'] = $this->auth->absolutionUrl($u_value['images']);
}
... ... @@ -256,7 +255,7 @@ class Index extends Api
"data": {
"id": 2,//晒单id
"g_id": 6,//商品id
"images": [//图片路径（取第一个即可）
"images": [//图片路径
"http://jinglong.springchunjia.cn/uploads/20191127/febfea9a34c918cb2f100f669ede2547.png",
"http://jinglong.springchunjia.cn/uploads/20191127/042a3256122af7b10e26efb5e7649904.png"
],
... ...
... ... @@ -27,6 +27,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'id', title: __('Id')},
{field: 'image', title: __('Image'), events: Table.api.events.image, formatter: Table.api.formatter.image,operate:false},
{field: 'url', title: __('Url')},
{field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal:'启用', hidden: '禁用'}},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
... ...
... ... @@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'address', title: __('Address')},
{field: 'goods.name', title: __('Goods.name')},
{field: 'goods.type_name', title: __('Goods.type_name')},
{field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal:'启用', hidden: '禁用'}},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
... ...