Authored by 张帅

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

... ... @@ -267,19 +267,19 @@
width: 50,
align: "center",
formatter: function (value, rowData, rowIndex) {
var str='';
if(rowData.authStatus==0){//待审核状态--允许审核通过 和 不通过
str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>审核通过</a>";
str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='2' style='margin-left:10px'>不通过</a>";
}
if(rowData.authStatus==1){//审核通过了--允许驳回
str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='2' style='margin-left:10px'>不通过</a>";
}
if(rowData.authStatus==2){//审核不通过的--允许通过
str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>审核通过</a>";
}
//还有一个编辑按钮
var str = "<a role='validateR' dataId='"+rowData.articleId+ "' style='margin-left:10px' class='btn-success' >审核</a>";
// if(rowData.authStatus==0){//待审核状态--允许审核通过 和 不通过
// str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>审核通过</a>";
// str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='2' style='margin-left:10px'>不通过</a>";
// }
// if(rowData.authStatus==1){//审核通过了--允许驳回
// str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='2' style='margin-left:10px'>不通过</a>";
// }
// if(rowData.authStatus==2){//审核不通过的--允许通过
// str += "<a role='switchR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>审核通过</a>";
// }
// //还有一个编辑按钮
str += "<a role='deleteR' class='btn-success' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' style='margin-left:10px'>删除</a>";
return str;
}
... ... @@ -325,6 +325,14 @@
});
$(this).datagrid("getPanel").find("a[role='validateR']").linkbutton({
iconCls : "icon-edit",
onClick: function () {
var dataId = $(this).attr("dataId");
window.open(contextPath+"/html/grass/articleAuthorizeManage/articleDetail.html?articleId="+dataId);
}
});
$(this).datagrid("getPanel").find("a[role='deleteR']").linkbutton({
iconCls : "icon-edit",
onClick: function () {
... ...
... ... @@ -178,13 +178,19 @@
var imgList = rowData.imgList;
str =str + '<p>';
if(imgList !=null){//可能没有图片
for (var i=0; i<imgList.length; i++) {
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ imgList[0]+'" >' ;
/*for (var i=0; i<imgList.length; i++) {
if(i > 0 && i % 4 == 0){
str = str + "</br>";//每四张换行
str = str + "</br>";//每四张换行
}
str = str + ' <img style="width: 60px; height: 60px" src="'+ imgList[i]+'" onclick="bigImage(this);" >';
}
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ imgList[i]+'" rowImages="'+imgList+'" onclick="bigImage(this);" >' ;
}*/
}
str = str + "<a target='_blank' href='"+contextPath+"/html/grass/articleAuthorizeManage/articleDetail.html?articleId="+rowData.articleId+"'>查看详情</a>";
str =str + '</p>';
var labelList = rowData.labelList;
var labelStr = "";
... ...
... ... @@ -27,7 +27,7 @@
<body class="easyui-layout">
<div region="north" style="height: 200px;">
<script>
document.write(addHead('运营管理', '话题管理'));
document.write(addHead('种草社区管理', '话题管理'));
</script>
<div style="margin-left: 20px;margin-top: 10px">
... ...