This commit is contained in:
lxyer 2017-12-11 00:54:51 +08:00
parent eb73162cce
commit 2d42eddd04
5 changed files with 11 additions and 5 deletions

View File

@ -9,7 +9,7 @@
<div class="fly-panel"> <div class="fly-panel">
<div class="fly-panel-title fly-filter"> <div class="fly-panel-title fly-filter">
<a>置顶</a> <a>置顶</a>
<a href="#signin" class="layui-hide-sm layui-show-xs-block fly-right" id="LAY_goSignin" style="color: #FF5722;">去签到</a> <!--<a href="#signin" class="layui-hide-sm layui-show-xs-block fly-right" id="LAY_goSignin" style="color: #FF5722;">去签到</a>-->
</div> </div>
<ul class="fly-list"> <ul class="fly-list">
#for(x : top.rows??) #for(x : top.rows??)
@ -29,8 +29,10 @@
</a> </a>
<span>#(x.createTime)</span> <span>#(x.createTime)</span>
<!--<span class="fly-list-kiss layui-hide-xs" title="悬赏飞吻"><i class="iconfont icon-kiss"></i> 60</span>--> <!--
<span class="fly-list-kiss layui-hide-xs" title="悬赏飞吻"><i class="iconfont icon-kiss"></i> 60</span>
<span class="layui-badge fly-badge-accept layui-hide-xs">已结</span> <span class="layui-badge fly-badge-accept layui-hide-xs">已结</span>
-->
<span class="fly-list-nums"> <span class="fly-list-nums">
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replyNum??0) <i class="iconfont icon-pinglun1" title="回答"></i> #(x.replyNum??0)
</span> </span>

View File

@ -51,13 +51,17 @@
<div class="fly-detail-user"> <div class="fly-detail-user">
<a href="/user/#(bean.userId)" class="fly-link"> <a href="/user/#(bean.userId)" class="fly-link">
<cite>#(bean.nickname)</cite> <cite>#(bean.nickname)</cite>
<!--
<i class="iconfont icon-renzheng" title="认证信息:{{ rows.user.approve }}"></i> <i class="iconfont icon-renzheng" title="认证信息:{{ rows.user.approve }}"></i>
<i class="layui-badge fly-badge-vip">VIP3</i> <i class="layui-badge fly-badge-vip">VIP3</i>
-->
</a> </a>
<span>#(bean.createTime??)</span> <span>#(bean.createTime??)</span>
</div> </div>
<div class="detail-hits" id="LAY_jieAdmin" data-id="123"> <div class="detail-hits" id="LAY_jieAdmin" data-id="123">
<!--
<span style="padding-right: 10px; color: #FF7200">悬赏60飞吻</span> <span style="padding-right: 10px; color: #FF7200">悬赏60飞吻</span>
-->
#if(bean.userId == mine.userId?? || mine.userId?? == 100001) #if(bean.userId == mine.userId?? || mine.userId?? == 100001)
<span class="layui-btn layui-btn-xs jie-admin" type="edit"><a href="/jie/add/#(bean.contentId)">编辑此贴</a></span> <span class="layui-btn layui-btn-xs jie-admin" type="edit"><a href="/jie/add/#(bean.contentId)">编辑此贴</a></span>
#end #end

View File

@ -160,7 +160,7 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f
upload.render({ upload.render({
elem: '#uploadImg' elem: '#uploadImg'
,url: '/os/file/upload' ,url: '/os/file/upload'
,size: 200 ,size: 2000000
,done: function(res){ ,done: function(res){
if(res.retcode == 0){ if(res.retcode == 0){
image.val(res.retinfo); image.val(res.retinfo);

View File

@ -295,7 +295,7 @@ layui.define(['fly','laypage'], function(exports){
elem:"jie-laypage" elem:"jie-laypage"
,curr:layui.cache.curr ,curr:layui.cache.curr
,count: layui.cache.total ,count: layui.cache.total
,limit:5 ,limit:20
,jump: function(obj, first){ ,jump: function(obj, first){
var curr = obj.curr; var curr = obj.curr;
if(!first){ if(!first){

View File

@ -66,7 +66,7 @@ public class IndexServlet extends BaseServlet {
Kv column = Kv.by("qz", 10).set("fx", 20).set("jy", 30).set("gg", 40).set("dt", 50);//栏目 Kv column = Kv.by("qz", 10).set("fx", 20).set("jy", 30).set("gg", 40).set("dt", 50);//栏目
Flipper flipper = new Flipper().offset((curr-1) * 5).limit(5).sort("top DESC,createTime DESC"); Flipper flipper = new Flipper().offset((curr-1) * 20).limit(20).sort("top DESC,createTime DESC");
//帖子列表 //帖子列表
FilterNode filterNode = FilterNode.create("status", FilterExpress.NOTEQUAL, -1).and("type", column.getAs(para)); FilterNode filterNode = FilterNode.create("status", FilterExpress.NOTEQUAL, -1).and("type", column.getAs(para));
if (solved > -1) filterNode.and("solved", solved); if (solved > -1) filterNode.and("solved", solved);