更新

2020-02-17 23:43:41 +08:00
parent 259d232d89
commit 5fb45fc57c
73 changed files with 711 additions and 357 deletions
--- a/view/admin/action/detail.html
+++ b/view/admin/action/detail.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box no-header clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/action/index.html
+++ b/view/admin/action/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box no-header clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/action/log.html
+++ b/view/admin/action/log.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}

 {block name="body"}
 <div class="main-box no-header clearfix">
--- a/view/admin/ad/index.html
+++ b/view/admin/ad/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/ad/lists.html
+++ b/view/admin/ad/lists.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/addons/add.html
+++ b/view/admin/addons/add.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/addons/hooks.html
+++ b/view/admin/addons/hooks.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/addons/index.html
+++ b/view/admin/addons/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/attribute/index.html
+++ b/view/admin/attribute/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/category/edit.html
+++ b/view/admin/category/edit.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/category/edit_channel.html
+++ b/view/admin/category/edit_channel.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <!-- datepicker end -->
 <div class="main-box clearfix">
--- a/view/admin/category/index.html
+++ b/view/admin/category/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/category/operate.html
+++ b/view/admin/category/operate.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}

 {block name="body"}
 <div class="main-box clearfix">
--- a/view/admin/channel/edit.html
+++ b/view/admin/channel/edit.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/channel/index.html
+++ b/view/admin/channel/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/channel/sort.html
+++ b/view/admin/channel/sort.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}

 {block name="body"}
 <div class="main-box clearfix">
--- a/view/admin/client/add.html
+++ b/view/admin/client/add.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/client/index.html
+++ b/view/admin/client/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/config/edit.html
+++ b/view/admin/config/edit.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}

 <div class="main-box clearfix">
--- a/view/admin/config/group.html
+++ b/view/admin/config/group.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}

 <div class="main-box clearfix">
--- a/view/admin/config/index.html
+++ b/view/admin/config/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
    <header class="main-box-header clearfix">
--- a/view/admin/config/themes.html
+++ b/view/admin/config/themes.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/content/index.html
+++ b/view/admin/content/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/database/export.html
+++ b/view/admin/database/export.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/database/import.html
+++ b/view/admin/database/import.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}

 {block name="body"}
 <div class="main-box clearfix">
--- a/view/admin/form/attr.html
+++ b/view/admin/form/attr.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/form/detail_alumn.html
+++ b/view/admin/form/detail_alumn.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/form/index.html
+++ b/view/admin/form/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/form/list_alumn.html
+++ b/view/admin/form/list_alumn.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/group/access.html
+++ b/view/admin/group/access.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/group/auth.html
+++ b/view/admin/group/auth.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/group/index.html
+++ b/view/admin/group/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/link/index.html
+++ b/view/admin/link/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/menu/edit.html
+++ b/view/admin/menu/edit.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/menu/import.html
+++ b/view/admin/menu/import.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/menu/index.html
+++ b/view/admin/menu/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/menu/sort.html
+++ b/view/admin/menu/sort.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/model/add.html
+++ b/view/admin/model/add.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}

 {block name="body"}
 <div class="main-box clearfix">
--- a/view/admin/model/edit.html
+++ b/view/admin/model/edit.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/plugs/board/board.min.css">
 {/block}
--- a/view/admin/model/index.html
+++ b/view/admin/model/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}

 {block name="body"}
 <div class="main-box clearfix">
--- a/view/admin/public/base.html
+++ b/view/admin/public/base.html
@@ -11,12 +11,12 @@
 					<span class="icon-bar"></span>
 				</button>
 				<a href="{:url('Index/index')}" id="logo" class="navbar-brand">
-					<img src="__STATIC__/images/logo.png" alt="" class="normal-logo logo-white"/>
+					<img src="__static__/common/images/logo.png" alt="" class="normal-logo logo-white"/>
 				</a>
 				<ul class="nav navbar-nav pull-right visible-xs">
 					<li class="dropdown profile-dropdown">
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-							<img src="__STATIC__/images/samples/scarlet-159.png" alt=""/>
+							<img src="__img__/samples/scarlet-159.png" alt=""/>
 							<span class="hidden-xs">{:session('user_auth.username')}</span> <b class="caret"></b>
 						</a>
 						<ul class="dropdown-menu dropdown-menu-right">
@@ -39,7 +39,7 @@
 								</a>
 							</li>
 							<li>
-								<a href="{:config('WEB_SITE_URL')}" target="_blank">
+								<a href="/" target="_blank">
 									<i class="fa fa-home"></i>
 									前台首页
 								</a>
@@ -70,7 +70,7 @@
 				<ul class="nav navbar-nav pull-right">
 					<li class="dropdown profile-dropdown hidden-sm hidden-xs">
 						<a href="#" class="dropdown-toggle" data-toggle="dropdown">
-							<img src="__STATIC__/images/samples/scarlet-159.png" alt=""/>
+							<img src="__img__/samples/scarlet-159.png" alt=""/>
 							<span class="hidden-xs">{:session('user_auth.username')}</span> <b class="caret"></b>
 						</a>
 						<ul class="dropdown-menu dropdown-menu-right">
@@ -93,7 +93,7 @@
 								</a>
 							</li>
 							<li>
-								<a href="{:config('WEB_SITE_URL')}" target="_blank">
+								<a href="/" target="_blank">
 									<i class="fa fa-home"></i>
 									前台首页
 								</a>
--- a/view/admin/public/edit.html
+++ b/view/admin/public/edit.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" href="__PUBLIC__/plugs/tagsinput/bootstrap-tagsinput.css">
 <script src="__PUBLIC__/plugs/tagsinput/bootstrap-tagsinput.js"></script>
--- a/view/admin/public/footer.html
+++ b/view/admin/public/footer.html
@@ -1,25 +1,22 @@
-<link rel="stylesheet" type="text/css" href="__STATIC__/plugs/nanoscroller/nanoscroller.css">
-<script src="__STATIC__/plugs/nanoscroller/jquery.nanoscroller.min.js"></script>
-<script src="__STATIC__/js/bootstrap.js"></script>
-<script src="__STATIC__/plugs/jquery/pace.min.js"></script>
+<link rel="stylesheet" type="text/css" href="__static__/plugins/nanoscroller/nanoscroller.css">
+<script src="__static__/plugins/nanoscroller/jquery.nanoscroller.min.js"></script>
+<script src="__static__/common/js/bootstrap.js"></script>
+<script src="__static__/plugins/jquery/pace.min.js"></script>

-<script src="__STATIC__/js/hopscotch.js"></script>
-<link rel="stylesheet" type="text/css" href="__STATIC__/css/libs/hopscotch.css">
+<script src="__static__/common/js/hopscotch.js"></script>
+<link rel="stylesheet" type="text/css" href="__static__/common/css/hopscotch.css">

-<script src="__STATIC__/js/messager.js"></script>
-<script src="__STATIC__/js/admin/app.js"></script>
+<script src="__static__/common/js/messager.js"></script>
+<script src="__js__/app.js"></script>
 <script type="text/javascript">
 (function(){
 	var SentCMS = window.Sent = {
 		"ROOT"   : "__ROOT__", //当前网站地址
 		"APP"    : "__APP__", //当前项目地址
-		"PUBLIC" : "__STATIC__", //项目公共目录地址
-		"DEEP"   : "{:config('URL_PATHINFO_DEPR')}", //PATHINFO分割符
-		"MODEL"  : ["{:config('URL_MODEL')}", "{:config('URL_CASE_INSENSITIVE')}", "{:config('URL_HTML_SUFFIX')}"],
-		"VAR"    : ["{:config('VAR_MODULE')}", "{:config('VAR_CONTROLLER')}", "{:config('VAR_ACTION')}"]
+		"PUBLIC" : "__static__", //项目公共目录地址
 	}
 })();
 </script>
-<script src="__STATIC__/js/core.js"></script>
+<script src="__static__/common/js/core.js"></script>
 </body>
 </html>
--- a/view/admin/public/header.html
+++ b/view/admin/public/header.html
@@ -13,7 +13,7 @@
 <script type="text/javascript" src="__static__/plugins/jquery/jquery.min.js"></script>
 <script type="text/javascript" src="__static__/plugins/layui/layui.all.js"></script>
 <script type="text/javascript">
-//var BASE_URL = "{:config('base_url')}"; //根目录地址
+//var BASE_URL = "/"; //根目录地址
 $(function(){
 	var height = $(window).height();
 	if ($('#content-wrapper').height() < height) {
--- a/view/admin/public/tool.html
+++ b/view/admin/public/tool.html
@@ -48,4 +48,4 @@
 		</ul>
 	</div>
 </div>
-<script src="__STATIC__/js/admin/skin-changer.js"></script> 
+<script src="__js__/skin-changer.js"></script> 
--- a/view/admin/seo/index.html
+++ b/view/admin/seo/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/seo/rewrite.html
+++ b/view/admin/seo/rewrite.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="style"}
 <link rel="stylesheet" type="text/css" href="__PUBLIC__/css/libs/bootstrap-editable.css">
 {/block}
--- a/view/admin/user/auth.html
+++ b/view/admin/user/auth.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box clearfix">
 	<header class="main-box-header clearfix">
--- a/view/admin/user/editpwd.html
+++ b/view/admin/user/editpwd.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box no-header clearfix">
 	
--- a/view/admin/user/index.html
+++ b/view/admin/user/index.html
@@ -1,4 +1,4 @@
-{extend name="public/base"/}
+{extend name="admin/public/base"/}
 {block name="body"}
 <div class="main-box no-header clearfix">
 	<header class="main-box-header clearfix">
@@ -70,8 +70,8 @@
 						<td>
 							<span >{$item['mobile']}</span>
 						</td>
-						<td>{$item['group_list']|implode=',',###}</td>
-						<td>{$item['reg_time']|date='Y-m-d',###}</td>
+						<td></td>
+						<td>{$item['reg_time']}</td>
 						<td class="text-center">
 							{if condition="$item['status']"}
 							<span class="label label-primary">启用</span>