platform / platform-cms · Commits

Go to a project

Authored by mlge
Commit 6478b2f78496bc9e2cca56b3290c2880183de133 2 parents 16324be4 54e5d899

Merge branch 'test6.9.1' of http://git.yoho.cn/platform/platform-cms into test6.9.1

Inline Side-by-side
Showing 4 changed files with 16 additions and 11 deletions
... ... @@ -127,7 +127,7 @@
<span style="color:red">*</span><label style="font-size: 14px;">回复内容(必填项，内容不能为空)</label> <br>
<div style="width:600px; word-wrap:break-word;float: left;position: relative" >
<textarea rows="5" id="content" style="width:60%; white-space: pre-wrap;" name = "content" class="form-control" placeholder="不超过五十字" required="" maxlength="50"></textarea>
<textarea rows="5" id="content" style="width:80%; white-space: pre-wrap;" name = "content" class="form-control" placeholder="不超过50字" required="" maxlength="50"></textarea>
</div>
<!--<div style="clear: both;"> <span id="content-count">0</span>/500</div>-->
... ... @@ -136,6 +136,7 @@
<tr>
<td style="width:100px ">
<a href="#" class="easyui-linkbutton" onclick="replyNow()" data-options="menu:'#mm1',iconCls:'icon-edit'">立即回复</a>
<a href="#EndofPage"></a>
<!--<input id="replyBtn" type="button" onclick="test()"/>-->
</td>
</tr>
... ... @@ -149,6 +150,7 @@
<!--</div>-->
<script>
location.href = "#EndofPage"; // firstAnchor为锚点名称
var mySwiper = new Swiper('.swiper-container', {
// direction: 'vertical', // 垂直切换选项
// loop: true, // 循环模式选项
... ...
... ... @@ -469,6 +469,9 @@
str += "<a role='shieldR' class='btn-success' dataId='"+rowData.articleId+ "' dataAuthStatus='4' index='"+ rowIndex + "' style='margin-left:10px'>屏蔽</a>";
}
str += "<a role='deleteR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' style='margin-left:10px'>删除</a>";
if(rowData.authStatus == 1){
str += "<a role='showDetail' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>评论</a>";
}
return str;
}
}
... ...
... ... @@ -287,7 +287,7 @@
window.self.paramObject.mkData = {"commentId":commentId,"articleId":articleId};
$(activityList).myDialog({
title: title,
width: "30%",
width: "42%",
height: "50%",
resizable:false,
modal: true,
... ...
... ... @@ -65,15 +65,15 @@
</script>
<div id="tt" class="easyui-layout" fit="true" style="margin:0">
<form name="commentReplyForm" id="commentReplyForm" method="post">
<form name="commentReplyForm" id="commentReplyForm" fit="true" method="post">
<div style="margin-top: 20px;margin-left: 30px;" id="replyDiv">
<table border="0" style="width:95%;margin-top:5px;line-height:30px;" id="replyTable">
<tr style="height: 60px">
<tr style="height: 10%">
<td style="width:100% ">
<div style="float: left;width:700px;" >
<div style="float: left;width:50%;" >
<span style="color:red">*</span><label style="font-size: 14px;">选择马甲</label> <br>
<input id="replyUid" name="replyUid" style="width:300px " class="easyui-textbox"/>
<input id="replyUid" name="replyUid" style="width:50% " class="easyui-textbox"/>
<a href="#" class="easyui-linkbutton" onclick="getUserInfo()" data-options="menu:'#mm1',iconCls:'icon-edit'">确定</a>
<br>
</div>
... ... @@ -82,19 +82,19 @@
</td>
</tr>
<tr style="height: 60px">
<tr style="height: 10%">
<td style="width:100%; word-wrap:break-word;" >
<span style="color:red">*</span><label style="font-size: 14px;">回复内容(必填项，内容不能为空)</label> <br>
<div style="width:600px; word-wrap:break-word;float: left;position: relative" >
<textarea rows="5" id="content" style="width:60%; white-space: pre-wrap;" name = "content" class="form-control" placeholder="不超过五十字" required="" maxlength="50"></textarea>
<div style="width:100%; word-wrap:break-word;float: left;position: relative" >
<textarea rows="5" id="content" style="width:80%; white-space: pre-wrap;" name = "content" class="form-control" placeholder="不超过50字" required="" maxlength="50"></textarea>
</div>
<!--<div style="clear: both;"> <span id="content-count">0</span>/500</div>-->
</td>
</tr>
<tr style="height: 60px">
<td style="width:100px ">
<tr style="height: 20%">
<td style="width:20% ">
<a href="#" class="easyui-linkbutton" onclick="replyNow()" data-options="menu:'#mm1',iconCls:'icon-edit'">立即回复</a>
<a href="#" class="easyui-linkbutton" onclick="closeNow()" data-options="menu:'#mm1',iconCls:'icon-cancel'">关闭</a>
<!--<input id="replyBtn" type="button" onclick="test()"/>-->
... ...