diff --git a/app/install/data/taoler.sql b/app/install/data/taoler.sql index 68bd954..142a35e 100644 --- a/app/install/data/taoler.sql +++ b/app/install/data/taoler.sql @@ -330,7 +330,7 @@ CREATE TABLE `tao_system` ( PRIMARY KEY (`id`) ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8 COMMENT='系统配置表'; -INSERT INTO `tao_system` VALUES ('1', 'TaoLer社区演示站', '轻论坛系统', 'http://www.xxx.com', 'taoler', '/storage/logo/logo.png', '10', '2048', 'png|gif|jpg|jpeg|zip|rarr', 'aieok.com 版权所有', 'TaoLer,轻社区系统,bbs,论坛,Thinkphp6,layui,fly模板,', '这是一个Taoler轻社区论坛系统', '1', '1', '1', '0.0.0.0', '管理员|admin|审核员|超级|垃圾', '1.5.0', '', 'http://api.aieok.com/v1/index/cy', 'http://api.aieok.com/v1/upload/check', 'http://api.aieok.com/v1/upload/api', '1581221008', '1577419197'); +INSERT INTO `tao_system` VALUES ('1', 'TaoLer社区演示站', '轻论坛系统', 'http://www.xxx.com', 'taoler', '/storage/logo/logo.png', '10', '2048', 'png|gif|jpg|jpeg|zip|rarr', 'aieok.com 版权所有', 'TaoLer,轻社区系统,bbs,论坛,Thinkphp6,layui,fly模板,', '这是一个Taoler轻社区论坛系统', '1', '1', '1', '0.0.0.0', '管理员|admin|审核员|超级|垃圾', '1.5.1', '', 'http://api.aieok.com/v1/index/cy', 'http://api.aieok.com/v1/upload/check', 'http://api.aieok.com/v1/upload/api', '1581221008', '1577419197'); DROP TABLE IF EXISTS `tao_user`; diff --git a/view/taoler/index/article/add.html b/view/taoler/index/article/add.html index 4c6f3bf..90f6f1f 100644 --- a/view/taoler/index/article/add.html +++ b/view/taoler/index/article/add.html @@ -141,27 +141,33 @@ }); -{/block} \ No newline at end of file +{/block} +{block name="cachepage"}jie{/block} \ No newline at end of file diff --git a/view/taoler/index/article/cate.html b/view/taoler/index/article/cate.html index f63884c..7095ba1 100644 --- a/view/taoler/index/article/cate.html +++ b/view/taoler/index/article/cate.html @@ -94,10 +94,10 @@ layui.cache.page = 'jie'; layui.cache.user = { username: '{$user.name??'游客'}' - ,uid: {$user.id ? 168*$user.id : -1} - ,avatar: '{if condition="$user['user_img'] neq ''"}{$user['user_img']}{else /}/static/res/images/avatar/00.jpg{/if}' - ,experience: 83 - ,sex: '{if condition="$user['sex'] eq 0"}男{else/}女{/if}' + ,uid: '{$user.id ?? -1}' + ,avatar: '{$user['user_img'] ?? '/static/res/images/avatar/00.jpg'}' + ,experience: '{$user.point ?? ''}' + ,sex: '{$user.sex ? '女':'男'}' }; layui.config({ version: "3.0.0" diff --git a/view/taoler/index/article/detail.html b/view/taoler/index/article/detail.html index d50e180..ce6b295 100644 --- a/view/taoler/index/article/detail.html +++ b/view/taoler/index/article/detail.html @@ -27,7 +27,7 @@ 精帖 {/if}
- {if ($user.auth == 1)} + {if ($user.auth ?? '')} 删除 {if($article.is_top == 0)} 置顶 @@ -65,7 +65,7 @@
- {if(session('user_name')==$article.user.name || $user.auth == 1)} + {if(session('user_name')==$article.user.name || ($user.auth ?? ''))} 编辑此贴 {/if}
@@ -126,7 +126,7 @@ 回复
- {if (session('user_id') == $vo.user.id) && (getLimtTime($vo.create_time) < 2) OR $user.auth == 1} + {if (session('user_id') == $vo.user.id) && (getLimtTime($vo.create_time) < 2) OR ($user.auth ?? '')} 编辑 删除 {if $vo.cai == 0 && session('user_id') == $article.user_id /} @@ -225,12 +225,12 @@ var collectionFind = "{:url('index/Collection/find')}", commentJiedaDelete = "{:url('index/Comment/jiedaDelete')}"; layui.cache.page = 'jie'; layui.cache.user = { - username: '{$user.name??'游客'}' - ,uid: "{$user.id ? $user.id : -1}" - ,avatar: "{$user.name? $user['user_img']:'/static/res/images/avatar/00.jpg'}" - ,experience: 83 - ,sex: "{if condition="$user['sex'] eq 0"}男{else /}女{/if}" -}; + username: '{$user.name??'游客'}' + ,uid: '{$user.id ?? -1}' + ,avatar: '{$user['user_img'] ?? '/static/res/images/avatar/00.jpg'}' + ,experience: '{$user.point ?? ''}' + ,sex: '{$user.sex ? '女':'男'}' + }; layui.config({ version: "3.0.0" ,base: '/static/res/mods/' @@ -324,15 +324,15 @@ layui.config({ } }); }); - - //如果你是采用模版自带的编辑器,你需要开启以下语句来解析。 + + //如果你是采用模版自带的编辑器,你需要开启以下语句来解析。 $('.detail-body').each(function(){ var othis = $(this), html = othis.html(); othis.html(fly.content(html)); }) + }); - - {/block} \ No newline at end of file diff --git a/view/taoler/index/index/search.html b/view/taoler/index/index/search.html index 3a2ec64..3f602b1 100644 --- a/view/taoler/index/index/search.html +++ b/view/taoler/index/index/search.html @@ -92,17 +92,15 @@ TP5学习制作:Tao.2019
{/block} - {block name="script"} - + + diff --git a/view/taoler/index/public/user.html b/view/taoler/index/public/user.html index 65290e9..8d3015c 100644 --- a/view/taoler/index/public/user.html +++ b/view/taoler/index/public/user.html @@ -10,7 +10,7 @@ - {block name="css"} {/block} + {block name="css"}{/block} {include file="public/header" /} @@ -22,8 +22,6 @@ {include file="public/footer" /} -{include file="public/js" /} - {block name="script"} js脚本 {/block} diff --git a/view/taoler/index/user/home.html b/view/taoler/index/user/home.html index 6e5d877..2e33ecf 100644 --- a/view/taoler/index/user/home.html +++ b/view/taoler/index/user/home.html @@ -80,10 +80,10 @@ layui.cache.page = 'jie'; layui.cache.user = { username: '{$user.name??'游客'}' - ,uid: {$user.id ? $user.id : -1} - ,avatar: '{if condition="$user['user_img'] neq ''"}/uploads/{$user['user_img']}{else /}/static/res/images/avatar/00.jpg{/if}' - ,experience: 83 - ,sex: '{if condition="$user['sex'] eq 0"}男{else/}女{/if}' + ,uid: '{$user.id ?? -1}' + ,avatar: '{$user['user_img'] ?? '/static/res/images/avatar/00.jpg'}' + ,experience: '{$user.point ?? ''}' + ,sex: '{$user.sex ? '女':'男'}' }; layui.config({ version: "3.0.0" diff --git a/view/taoler/index/user/index.html b/view/taoler/index/user/index.html index 8e261ac..e9439fa 100644 --- a/view/taoler/index/user/index.html +++ b/view/taoler/index/user/index.html @@ -164,10 +164,10 @@ layui.cache.page = 'user'; layui.cache.user = { username: '{$user.name??'游客'}' - ,uid: {$user.id ? 168*$user.id : -1} - ,avatar: '{if condition="$user['user_img'] neq ''"}/uploads/{$user['user_img']}{else /}/static/res/images/avatar/00.jpg{/if}' - ,experience: 83 - ,sex: '{if condition="$user['sex'] eq 0"}男{else/}女{/if}' + ,uid: '{$user.id ?? -1}' + ,avatar: '{$user['user_img'] ?? '/static/res/images/avatar/00.jpg'}' + ,experience: '{$user.point ?? ''}' + ,sex: '{$user.sex ? '女':'男'}' }; layui.config({ version: "3.0.0" diff --git a/view/taoler/index/user/message.html b/view/taoler/index/user/message.html index aa75c83..3644837 100644 --- a/view/taoler/index/user/message.html +++ b/view/taoler/index/user/message.html @@ -8,13 +8,16 @@ {/block} {block name="script"}