修复底部代码无效的问题

maodajie · Jun 22, 2021 · 6171eac · 6171eac
1 parent 67467ca
commit 6171eac
Show file tree

Hide file tree

Showing 21 changed files with 2,122 additions and 836 deletions.
diff --git a/html/public/footer.html b/html/public/footer.html
@@ -1,6 +1,6 @@
 <div class="mo-foot-wrap dc-layout dc-wane mo-back-white">
 	<div class="dc-body dc-center dc-pa-10 dc-pa-md20">
-		<p class="dc-center dc-line-30 dc-font-14">{$mojia['other']['foot']['code']}</p>
+		<p class="dc-center dc-line-30 dc-font-14">{$mojia.base.foot.code}</p>
 		<p class="dc-center dc-line-30 dc-font-14">
 			<a class="dc-iblock" href="{:mac_url('rss/index')}" target="_blank">RSS订阅</a>
 			<span class="dc-iblock">&nbsp;-&nbsp;</span>

diff --git a/option/admin/controller/Index.php b/option/admin/controller/Index.php
diff --git a/option/admin/view/module/themes.html b/option/admin/view/module/themes.html
@@ -58,7 +58,7 @@
 			</tr>
 			<tr>
 				<td>到期时间</td>
-				<td><a href="{:mac_url('index/verify')}" target="_blank"><span class="layui-badge">{if!is_numeric($mojia.config.token)}永久授权{else}{:date('Y-m-d',strtotime($mojia.config.token))}{/if}</span></a></td>
+				<td><a href="{:mac_url('index/verify')}" target="_blank"><span class="layui-badge">{if!is_numeric($mojia.config.token)}永久授权{else}{:date('Y-m-d',strtotime($mojia.config.token))}到期{/if}</span></a></td>
 				<td>KEY: {$mojia.config.key}</td>
 			</tr>
 			<tr>

diff --git a/option/admin/view/public/footer.html b/option/admin/view/public/footer.html
@@ -6,7 +6,7 @@
 		'tpl': '{$mojia.config.tpl}',
 		'cdn': '{$mojia.config.cdn}',
 		'ver': '{$mojia.config.ver}',
-		'mac': '{$mojia.config.path}{$mojia.base.edit.entry}',
+		'mac': '{$mojia.base.edit.entry}',
 		'inc': '{$GLOBALS["package"][$GLOBALS["package"]["mode"]]["income"]}',
 		'name': '{$mojia.config.name}'
 	};

diff --git a/option/common.php b/option/common.php
diff --git a/option/extra/search.php b/option/extra/search.php