lxy/redbbs-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

社区升级

Browse Source 
1、表字段统一小写，
   2、表模块划分
   3、表状态等字段统一smallint
   4、部分字段值重新定义
This commit is contained in:
lxyer
2018-06-17 20:37:12 +08:00
parent 05bcd44e97
commit 1f79682516
35 changed files with 832 additions and 948 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
root/_t/layout.html
View File

@@ -158,7 +158,7 @@
#define user_side(e)
<ul class="layui-nav layui-nav-tree layui-inline" lay-filter="user">
<li class="layui-nav-item #if(e == '') layui-this #end">
<a href="/user/#(mine.userId)">
<a href="/user/#(mine.userid)">
<i class="layui-icon">&#xe609;</i>
我的主页
</a>

BIN
root/favicon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.2 KiB

40
root/index.html
View File

@@ -14,17 +14,17 @@
<ul class="fly-list">
#for(x : top.rows??)
<li>
<a href="/user/#(x.userId)" class="fly-avatar">
<a href="/user/#(x.userid)" class="fly-avatar">
<img src="#(x.avatar)" alt="#(x.nickname)">
</a>
<h2 title="#(x.title)">
#if(x.status == 3)
#if(x.status == 30)
<a class="layui-badge">私密</a>
#else
<a class="layui-badge">#(x.typeName)</a>
<a class="layui-badge">#(x.typename)</a>
#end
<a href="/jie/detail/#(x.contentId)">
#if(x.top == 3)
<a href="/jie/detail/#(x.contentid)">
#if(x.top == 30)
<span style="color: #AB5D7C;font-weight: bold;">#(x.title)</span>
#else
#(x.title)
@@ -32,20 +32,20 @@
</a>
</h2>
<div class="fly-list-info">
<a href="/user/#(x.userId)" link>
<a href="/user/#(x.userid)" link>
<cite>#(x.nickname)</cite>
<!--<i class="iconfont icon-renzheng" title="认证信息：XXX"></i>
<i class="layui-badge fly-badge-vip">VIP3</i>-->
</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="layui-badge fly-badge-accept layui-hide-xs">已结</span>
-->
<span class="fly-list-nums">
<i class="iconfont" title="人气">&#xe60b;</i> #(x.viewNum??0)
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replyNum??0)
<i class="iconfont" title="人气">&#xe60b;</i> #(x.viewnum??0)
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replynum??0)
</span>
</div>
<div class="fly-list-badge">
@@ -79,34 +79,34 @@
<ul class="fly-list">
#for(x : contents.rows??)
<li>
<a href="/user/#(x.userId)" class="fly-avatar">
<a href="/user/#(x.userid)" class="fly-avatar">
<img src="#(x.avatar)" alt="#(x.nickname)">
</a>
<h2 title="#(x.title)">
#if(x.status == 3)
#if(x.status == 30)
<a class="layui-badge">私密</a>
#else
<a class="layui-badge">#(x.typeName)</a>
<a class="layui-badge">#(x.typename)</a>
#end
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
<a href="/jie/detail/#(x.contentid)">#(x.title)</a>
</h2>
<div class="fly-list-info">
<a href="/user/#(x.userId)" link>
<a href="/user/#(x.userid)" link>
<cite>#(x.nickname)</cite>
<!--
<i class="iconfont icon-renzheng" title="认证信息：XXX"></i>
<i class="layui-badge fly-badge-vip">VIP3</i>
-->
</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="layui-badge fly-badge-accept layui-hide-xs">已结</span>
-->
<span class="fly-list-nums">
<i class="iconfont" title="人气">&#xe60b;</i> #(x.viewNum??0)
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replyNum??0)
<i class="iconfont" title="人气">&#xe60b;</i> #(x.viewnum??0)
<i class="iconfont icon-pinglun1" title="回答"></i> #(x.replynum??0)
</span>
</div>
<div class="fly-list-badge">
@@ -184,7 +184,7 @@
<!--<i class="layui-icon fly-loading">&#xe63d;</i>-->
#for(x : lastReg.rows??)
<dd>
<a href="/user/#(x.userId)">
<a href="/user/#(x.userid)">
<img src="#(x.avatar)"><cite>#(x.nickname)</cite><i>#(x.time)</i>
</a>
</dd>
@@ -197,8 +197,8 @@
<dt class="fly-panel-title">本周热议</dt>
#for(x : hotReply.rows)
<dd>
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
<span><i class="iconfont icon-pinglun1"></i> #(x.replyNum)</span>
<a href="/jie/detail/#(x.contentid)">#(x.title)</a>
<span><i class="iconfont icon-pinglun1"></i> #(x.replynum)</span>
</dd>
#else
<div class="fly-none">没有相关数据</div>

6
root/jie/add.html
View File

@@ -24,7 +24,7 @@
<option value="20" #if(bean.type?? == 20) selected #end>分享</option>
<option value="30" #if(bean.type?? == 30) selected #end>讨论</option>
<!--高级权限开放类别-->
#if(mine.roleId?? == 1)
#if(mine.roleid?? == 1)
<option value="40" #if(bean.type?? == 40) selected #end>公告</option>
<option value="50" #if(bean.type?? == 50) selected #end>动态</option>
#end
@@ -34,7 +34,7 @@
<div class="layui-col-md6">
<label for="L_title" class="layui-form-label">标题</label>
<div class="layui-input-block">
<input type="hidden" name="contentId" value="#(bean.contentId??)">
<input type="hidden" name="contentid" value="#(bean.contentid??)">
<input type="text" id="L_title" name="title" value="#(bean.title??)" required lay-verify="required" autocomplete="off" class="layui-input">
<!-- <input type="hidden" name="id" value="{{d.edit.id}}"> -->
</div>
@@ -140,7 +140,7 @@
fly: 'index'
}).use(['fly','jie'], function () {
var jie = layui.jie;
jie.createEditer();
jie.createEditer("content");
});
</script>
#end

70
root/jie/detail.html
View File

@@ -13,67 +13,67 @@
<h1>#(bean.title)</h1>
<div class="fly-detail-info">
<!-- <span class="layui-badge">审核中</span> -->
#if(bean.status == 3)
#if(bean.status == 30)
<span class="layui-badge layui-bg-green fly-detail-column">私密</span>
#else
<span class="layui-badge layui-bg-green fly-detail-column">#(bean.typeName)</span>
<span class="layui-badge layui-bg-green fly-detail-column">#(bean.typename)</span>
#end
<span class="layui-badge" style="background-color: #999;">未结</span>
<!-- <span class="layui-badge" style="background-color: #5FB878;">已结</span> -->
#if(bean.top == 1)
#if(bean.top == 10)
<span class="layui-badge layui-bg-black">置顶</span>
#end
#if(bean.wonderful == 1)
#if(bean.wonderful == 10)
<span class="layui-badge layui-bg-red">精帖</span>
#end
#if(mine.roleId?? == 1)
<div class="fly-admin-box" data-id="#(bean.contentId)">
#if(mine.roleid?? == 1)
<div class="fly-admin-box" data-id="#(bean.contentid)">
<span class="layui-btn layui-btn-xs jie-admin" type="del">删除</span>
#if(bean.top == 1)
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="top" v="0" style="background-color:#ccc;">取消置顶</span>
#if(bean.top >= 20)
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="top" v="10" style="background-color:#ccc;">取消置顶</span>
#else
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="top" v="1">置顶</span>
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="top" v="20">置顶</span>
#end
#if(bean.wonderful == 1)
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="wonderful" v="0" style="background-color:#ccc;">取消加精</span>
#if(bean.wonderful >= 20)
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="wonderful" v="10" style="background-color:#ccc;">取消加精</span>
#else
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="wonderful" v="1">加精</span>
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="wonderful" v="20">加精</span>
#end
#if(bean.status != 3)
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="status" v="3">设为私密</span>
#if(bean.status != 30)
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="status" v="30">设为私密</span>
#else
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="status" v="1">设为公开</span>
<span class="layui-btn layui-btn-xs jie-admin" type="set" field="status" v="10">设为公开</span>
#end
</div>
#end
<span class="fly-list-nums">
<a href="#comment"><i class="iconfont" title="回答">&#xe60c;</i> #(bean.replyNum??0)</a>
<i class="iconfont" title="人气">&#xe60b;</i> #(bean.viewNum??1)
<a href="#comment"><i class="iconfont" title="回答">&#xe60c;</i> #(bean.replynum??0)</a>
<i class="iconfont" title="人气">&#xe60b;</i> #(bean.viewnum??1)
</span>
</div>
<div class="detail-about">
<a class="fly-avatar" href="/user/#(bean.userId)">
<a class="fly-avatar" href="/user/#(bean.userid)">
<img src="#(bean.avatar)" alt="#(bean.nickname)">
</a>
<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>
<!--
<i class="iconfont icon-renzheng" title="认证信息：{{ rows.user.approve }}"></i>
<i class="layui-badge fly-badge-vip">VIP3</i>
-->
</a>
<span>#(bean.createTime??)</span>
<span>#(bean.createtime??)</span>
</div>
<div class="detail-hits" id="LAY_jieAdmin" data-id="123">
<!--
<span style="padding-right: 10px; color: #FF7200">悬赏：60飞吻</span>
-->
#if(bean.userId == mine.userId?? || mine.roleId?? == 1)
<span class="layui-btn layui-btn-xs jie-admin" type="edit"><a href="/jie/add/#(bean.contentId)">编辑此贴</a></span>
#if(bean.userid == mine.userid?? || mine.roleid?? == 1)
<span class="layui-btn layui-btn-xs jie-admin" type="edit"><a href="/jie/add/#(bean.contentid)">编辑此贴</a></span>
#end
</div>
</div>
@@ -101,10 +101,10 @@
<ul class="jieda" id="jieda">
#for(x : comments.rows??)
<li data-id="#(x.commentId)" class="jieda-daan">
<li data-id="#(x.commentid)" class="jieda-daan">
<a name="item-1111111111"></a>
<div class="detail-about detail-about-reply">
<a class="fly-avatar" href="/user/#(x.userId)">
<a class="fly-avatar" href="/user/#(x.userid)">
<img src="#(x.avatar)" alt="#(x.nickname)">
</a>
<div class="fly-detail-user">
@@ -113,7 +113,7 @@
<!--<i class="iconfont icon-renzheng" title="认证信息：XXX"></i>
<i class="layui-badge fly-badge-vip">VIP3</i>-->
</a>
#if(x.userId == bean.userId??)
#if(x.userid == bean.userid??)
<span>(楼主)</span>
#end
<!--
@@ -123,7 +123,7 @@
-->
</div>
<div class="detail-hits"><span>#(x.createTime??)</span></div>
<div class="detail-hits"><span>#(x.createtime??)</span></div>
#if(1>2)
<i class="iconfont icon-caina" title="最佳答案"></i>
#end
@@ -132,18 +132,18 @@
#(x.content)
</div>
<div class="jieda-reply">
#if(x.hadSupport == 1)
<span class="jieda-zan zanok" type="zan"><i class="iconfont icon-zan"></i><em>#(x.supportNum)</em></span>
#if(x.hadsupport == 1)
<span class="jieda-zan zanok" type="zan"><i class="iconfont icon-zan"></i><em>#(x.supportnum)</em></span>
#else
<span class="jieda-zan" type="zan"><i class="iconfont icon-zan"></i><em>#(x.supportNum)</em></span>
<span class="jieda-zan" type="zan"><i class="iconfont icon-zan"></i><em>#(x.supportnum)</em></span>
#end
<span type="reply"><i class="iconfont icon-svgmoban53"></i>回复</span>
<div class="jieda-admin">
#if(x.userId == mine.userId?? && false)
#if(x.userid == mine.userid?? && false)
<span type="edit">编辑</span>
<span type="del">删除</span>
#end
#if(bean.userId == mine.userId??)
#if(bean.userid == mine.userid??)
<span class="jieda-accept" type="accept">采纳</span>
#end
</div>
@@ -164,7 +164,7 @@
<div id="editor"></div>
</div>
<div class="layui-form-item">
<input type="hidden" name="contentId" value="#(bean.contentId??)">
<input type="hidden" name="contentid" value="#(bean.contentid??)">
<input type="hidden" name="pid" value="0">
<button class="layui-btn" lay-filter="jie-reply" lay-submit>提交回复</button>
</div>
@@ -178,8 +178,8 @@
<dt class="fly-panel-title">本周热议</dt>
#for(x : hotReply.rows)
<dd>
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
<span><i class="iconfont icon-pinglun1"></i> #(x.replyNum)</span>
<a href="/jie/detail/#(x.contentid)">#(x.title)</a>
<span><i class="iconfont icon-pinglun1"></i> #(x.replynum)</span>
</dd>
#else
<div class="fly-none">没有相关数据</div>
@@ -232,7 +232,7 @@
othis.html(fly.content(html));
});*/
jie.createEditer();
jie.createEditer("comment");
});
</script>
#end

22
root/jie/index.html
View File

@@ -33,40 +33,40 @@
#for(x : contents.rows)
<li>
<a href="/user/#(x.userId)" class="fly-avatar">
<a href="/user/#(x.userid)" class="fly-avatar">
<img src="#(x.avatar??)" alt="#(x.nickname)">
</a>
<h2>
#if(x.status == 3)
#if(x.status == 30)
<a class="layui-badge">私密</a>
#else
<a class="layui-badge">#(x.typeName)</a>
<a class="layui-badge">#(x.typename)</a>
#end
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
<a href="/jie/detail/#(x.contentid)">#(x.title)</a>
</h2>
<div class="fly-list-info">
<a href="user/#(x.userId)" link>
<a href="user/#(x.userid)" link>
<cite>#(x.nickname)</cite>
<!--
<i class="iconfont icon-renzheng" title="认证信息：XXX"></i>
<i class="layui-badge fly-badge-vip">VIP3</i>
-->
</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="layui-badge fly-badge-accept layui-hide-xs">已结</span>
-->
<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>
</div>
<div class="fly-list-badge">
#if(x.top > 0)
#if(x.top >= 20)
<span class="layui-badge layui-bg-black">置顶</span>
#end
#if(x.wonderful == 1)
#if(x.wonderful >= 20)
<span class="layui-badge layui-bg-red">精帖</span>
#end
</div>
@@ -87,8 +87,8 @@
<dt class="fly-panel-title">本周热议</dt>
#for(x : hotReply.rows??)
<dd>
<a href="/jie/detail/#(x.contentId)">#(x.title)</a>
<span><i class="iconfont icon-pinglun1"></i> #(x.replyNum)</span>
<a href="/jie/detail/#(x.contentid)">#(x.title)</a>
<span><i class="iconfont icon-pinglun1"></i> #(x.replynum)</span>
</dd>
#else
<div class="fly-none">没有相关数据</div>

4
root/res/mods/index.js
View File

@@ -250,12 +250,12 @@ layui.define(['layer', 'laytpl', 'form', 'element', 'upload', 'util', 'face'], f
}
,editer: function(){
,editer: function(key){
var E = window.wangEditor;
var editor = new E('#editor');
editor.customConfig.uploadImgServer = '/upload/img';
var cache_key = "content_" + $("input[name='contentId']").val();
var cache_key = key+"_" + $("input[name='contentid']").val();
var html = localStorage.getItem(cache_key);
editor.customConfig.onblur = function (html) {

16
root/res/mods/jie.js
View File

@@ -22,8 +22,8 @@ layui.define(['fly','laypage'], function(exports){
};
var jie = {
createEditer : function(){
editor = fly.editer();
createEditer : function(key){
editor = fly.editer(key);
}
}
@@ -86,7 +86,7 @@ layui.define(['fly','laypage'], function(exports){
layer.close(index);
fly.json('/os/content/set', {
id: div.data('id')
,v: -1
,v: -10
,field:"status"
}, function(res){
location.href= "/";
@@ -147,7 +147,7 @@ layui.define(['fly','laypage'], function(exports){
zan: function(li){ //赞
var othis = $(this), ok = othis.hasClass('zanok');
fly.json('/os/comment/support', {
commentId: li.data('id')
commentid: li.data('id')
,ok: ok?-1:1
}, function(res){
var zans = othis.find('em').html()|0;
@@ -239,7 +239,7 @@ layui.define(['fly','laypage'], function(exports){
form.on('submit(jie-add)', function(data){
var bean = {};
["contentId","title", "content", "type", "status"].forEach(function (value) {
["contentid","title", "content", "type", "status"].forEach(function (value) {
bean[value] = data.field[value];
});
bean["content"] = editor.txt.html();
@@ -249,7 +249,7 @@ layui.define(['fly','laypage'], function(exports){
bean:JSON.stringify(bean)
},function (res) {
layer.msg("发布成功",{time:2000},function () {
var cache_key = "content_" + $("input[name='contentId']").val();
var cache_key = "content_" + $("input[name='contentid']").val();
localStorage.removeItem(cache_key);
location.href = "/user";
});
@@ -258,7 +258,7 @@ layui.define(['fly','laypage'], function(exports){
});
form.on('submit(jie-reply)', function(data){
var bean = {};
["contentId","pid", "content"].forEach(function (value) {
["contentid","pid", "content"].forEach(function (value) {
bean[value] = data.field[value];
});
bean["content"] = editor.txt.html();
@@ -269,6 +269,8 @@ layui.define(['fly','laypage'], function(exports){
},function (res) {
layer.msg("回复成功",{time:2000},function () {
//location.href = "/";
var cache_key = "comment_" + $("input[name='contentid']").val();
localStorage.removeItem(cache_key);
location.reload();
});
});

19
root/user/home.html
View File

@@ -9,9 +9,14 @@
-->
<h1>
#(user.nickname??)
#if(user.sex == 10)
<i class="iconfont icon-nan"></i>
<!--
#elseif(user.sex == 20)
<i class="iconfont icon-nv"></i>
#else
#end
<!--
<i class="layui-badge fly-badge-vip">VIP3</i>
<span style="color:#c00;">（管理员）</span>
<span style="color:#5FB878;">（社区之光）</span>
@@ -27,7 +32,7 @@
<!--
<i class="iconfont icon-kiss" title="飞吻"></i><span style="color: #FF7200;">66666 飞吻</span>
-->
<i class="iconfont icon-shijian"></i><span>#(EJ.date(user.createTime??,"yyyy-MM-dd")) 加入</span>
<i class="iconfont icon-shijian"></i><span>#(EJ.date(user.createtime??,"yyyy-MM-dd")) 加入</span>
<i class="iconfont icon-chengshi"></i><span>来自#(user.city?? "火星")</span>
</p>
@@ -53,9 +58,9 @@
#if(x.wonderful == 1)
<span class="fly-jing">精</span>
#end
<a href="/jie/detail/#(x.contentId)" class="jie-title">#(x.title)</a>
<i>#(x.createTime)</i>
<em class="layui-hide-xs">#(x.viewNum)阅/#(x.replyNum)答</em>
<a href="/jie/detail/#(x.contentid)" class="jie-title">#(x.title)</a>
<i>#(x.createtime)</i>
<em class="layui-hide-xs">#(x.viewnum)阅/#(x.replynum)答</em>
</li>
#end
<!-- <div class="fly-none" style="min-height: 50px; padding:30px 0; height:auto;"><i style="font-size:14px;">没有发表任何求解</i></div> -->
@@ -70,8 +75,8 @@
#for(x : comments.rows??)
<li>
<p>
<span>#(x.createTime)</span>
在<a href="/jie/detail/#(x.contentId)" target="_blank">#(x.title)</a>中回答：
<span>#(x.createtime)</span>
在<a href="/jie/detail/#(x.contentid)" target="_blank">#(x.title)</a>中回答：
</p>
<div class="home-dacontent">
#(x.content)

12
root/user/index.html
View File

@@ -31,10 +31,10 @@
<ul class="mine-view jie-row">
#for(x : contents.rows)
<li>
<a class="jie-title" href="/jie/detail/#(x.contentId)" target="_blank">#(x.title)</a>
<i>#(x.createTime) </i>
<a class="mine-edit" href="/jie/add/#(x.contentId)">编辑</a>
<em>#(x.viewNum)阅/#(x.replyNum)答</em>
<a class="jie-title" href="/jie/detail/#(x.contentid)" target="_blank">#(x.title)</a>
<i>#(x.createtime) </i>
<a class="mine-edit" href="/jie/add/#(x.contentid)">编辑</a>
<em>#(x.viewnum)阅/#(x.replynum)答</em>
</li>
#end
</ul>
@@ -44,8 +44,8 @@
<ul class="mine-view jie-row">
#for(x : collects.rows??)
<li>
<a class="jie-title" href="/jie/detail/#(x.contentId)" target="_blank">#(x.title)</a>
<i>收藏于#(x.createTime)</i>
<a class="jie-title" href="/jie/detail/#(x.contentid)" target="_blank">#(x.title)</a>
<i>收藏于#(x.createtime)</i>
</li>
#end
</ul>

6
root/user/set.html
View File

@@ -20,7 +20,7 @@
<li class="layui-this" lay-id="info">我的资料</li>
<li lay-id="avatar">头像</li>
<li lay-id="pass">密码</li>
#if(mine.roleId == 1)
#if(mine.roleid == 1)
<li lay-id="blog">博客地址</li>
#end
<!--<li lay-id="bind">帐号绑定</li>-->
@@ -43,8 +43,8 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
<input type="radio" name="sex" value="1" #if(mine.sex == 1) checked #end title="男">
<input type="radio" name="sex" value="2" #if(mine.sex == 2) checked #end title="女">
<input type="radio" name="sex" value="10" #if(mine.sex == 10) checked #end title="男">
<input type="radio" name="sex" value="20" #if(mine.sex == 20) checked #end title="女">
</div>
</div>
</div>