Authored by 周少峰

Merge branch 'dev-内容管理小视频' into feature/video

# Conflicts:
#	web/src/main/webapp/html/grass/articleManage/articleList.html
... ... @@ -8,7 +8,6 @@ import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
import com.yoho.core.dal.datasource.annotation.Database;
import com.yoho.core.rest.client.ServiceCaller;
import com.yoho.quartz.utils.DateUtils;
import com.yoho.service.model.sns.model.enums.GrassInboxBusinessTypeEnum;
import com.yoho.service.model.social.request.BaseReqBO;
import com.yoho.service.model.social.request.UicUserReqBO;
... ... @@ -40,7 +39,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.ResponseBody;
import javax.annotation.Resource;
import java.util.*;
... ... @@ -1258,8 +1256,8 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
List<String> imageList = new ArrayList<>();
String text = "";
for (GrassArticleBlock content : grassArticleContentList) {
JSONObject data = JSON.parseObject(content.getContentData());
if ("image".equals(content.getTemplateKey())) {
JSONObject data = JSON.parseObject(content.getContentData());
String src = JSON.parseObject(data.getString("data")).getString("src");
src = StringUtils.isEmpty(src) ? "" : src.substring(0, src.indexOf("?"));
imageList.add(src);
... ... @@ -1269,15 +1267,17 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
rspBo.setImgWidth(JSON.parseObject(data.getString("data")).getString("width"));
}
}
if ("text".equals(content.getTemplateKey())) {
JSONObject data = JSON.parseObject(content.getContentData());
else if ("text".equals(content.getTemplateKey())) {
text = JSON.parseObject(data.getString("data")).getString("text");
}
if ("link".equals(content.getTemplateKey())) {
JSONObject data = JSON.parseObject(content.getContentData());
else if ("link".equals(content.getTemplateKey())) {
String linkTUrl = JSON.parseObject(data.getString("data")).getString("url");
rspBo.setActionUrl(linkTUrl);
}
else if("video".equals(content.getTemplateKey())){
rspBo.setCoverImg(JSON.parseObject(data.getString("data")).getString("coverUrl"));
rspBo.setVideoUrl(JSON.parseObject(data.getString("data")).getString("videoUrl"));
}
}
rspBo.setArticleContent(text);
rspBo.setImgList(imageList);
... ... @@ -1419,6 +1419,7 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
Map<Integer, List<GrassArticleProductBo>> sknMap = Maps.newHashMap();
Map<Integer, List<JSONObject>> labelMap = buildLabelInfoMap(labelList);
Map<Integer, GrassTopic> topicMap = buildTopicInfoMap(grassArticleTopics);
Map<Integer,JSONObject> videoMap = Maps.newHashMap();
grassArticleContentList.forEach(content -> {
if ("image".equals(content.getTemplateKey())) {
List<String> images = imgMap.get(content.getArticleId());
... ... @@ -1441,6 +1442,10 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
String text = JSON.parseObject(data.getString("data")).getString("url");
linkMap.put(content.getArticleId(), text);
}
if("video".equals(content.getTemplateKey())){
JSONObject data = JSON.parseObject(content.getContentData());
videoMap.put(content.getArticleId(), data.getJSONObject("data"));
}
});
... ... @@ -1522,6 +1527,10 @@ public class GrassArticleServiceImpl implements IGrassArticleService {
rspBo.setHasPublished(article.getCreateTime() >= System.currentTimeMillis() ? "N" : "Y");
//拼接文章预览的url 类似:http://yoho-community-web.test3.ingress.dev.yohocorp.com/grass/article/1408536?type=preview
rspBo.setPreviewUrl(previewUrl + article.getId() + "?type=preview");
//短视频封面图
rspBo.setCoverImg(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("coverUrl"));
//短视频url
rspBo.setVideoUrl(videoMap.get(article.getId()) == null ? "" : videoMap.get(article.getId()).getString("videoUrl"));
rspBoList.add(rspBo);
});
return rspBoList;
... ...
... ... @@ -480,7 +480,7 @@ public class GrassUserVirtualImpl implements IGrassVirtualService{
return new HashSet<>();
}
//数量--随着时间的推移,线性的
double numDouble = k * x + b;
double numDouble = k * x + b + new Random().nextInt(5);
int num = new Double(numDouble).intValue();//需要增加的点
int totalVitual = virtualList.size();
Set<Integer> set = new HashSet<>();
... ...
... ... @@ -62,7 +62,7 @@
</td>
</tr>
<tr style="height: 60px">
<tr id="imgTr" style="height: 60px;display: none">
<td>
<div class="swiper-container">
<div class="swiper-wrapper" id="imageListDiv">
... ... @@ -80,6 +80,13 @@
</div>
</td>
</tr>
<tr id="videoTr" style="height: 60px;display: none">
<td>
<div id="videoDiv">
</div>
</td>
</tr>
<tr style="height: 60px">
<td>
... ... @@ -147,7 +154,7 @@
type: "get",
url: serverContextPath + "/grassArticle/getArticleById?articleId=" + articleId,
success: function (data) {
debugger
debugger;
if (data != null) {//成功的
var detailInfo = data.data;
$("#authorUid").html(detailInfo.authorUid);
... ... @@ -159,15 +166,26 @@
var imgSize = detailInfo.imgList == null ? 0 : detailInfo.imgList.length;
$("#imgSize").html(imgSize);
//展示图片(肯定有图片,没图片那就是业务有问题,或者数据有问题)
if (detailInfo.imgList != null && detailInfo.imgList.length > 0) {
var imageDivStr = "";
for (var i = 0; i < detailInfo.imgList.length; i++) {
imageDivStr += '<div class="swiper-slide" style="text-align: center;line-height:300px;"><img src="' + detailInfo.imgList[i] + '" style="max-width: 400px;max-height:300px;margin-left: 100px;margin-right: 5px"/></div>';
if(detailInfo.sort != 4){
$("#imgTr").show();
$("#videoTr").hide();
//展示图片(肯定有图片,没图片那就是业务有问题,或者数据有问题)
if (detailInfo.imgList != null && detailInfo.imgList.length > 0) {
var imageDivStr = "";
for (var i = 0; i < detailInfo.imgList.length; i++) {
imageDivStr += '<div class="swiper-slide" style="text-align: center;line-height:300px;"><img src="' + detailInfo.imgList[i] + '" style="max-width: 400px;max-height:300px;margin-left: 100px;margin-right: 5px"/></div>';
}
$("#imageListDiv").html(imageDivStr);
}
$("#imageListDiv").html(imageDivStr);
}else{
$("#imgTr").hide();
$("#videoTr").show();
//var videoStr = '<video src="' + detailInfo.videoUrl + '" controls autoplay loop muted preload="auto" poster="' + detailInfo.coverImg + '" >';
var videoStr = '<video src="http://flv01.static.yhbimg.com/goodsvideo/2017/08/25/17/039b9ce839a967ee0352049ebe2484df21.mp4" controls autoplay loop muted preload="auto" poster="' + detailInfo.coverImg + '" >';
$("#videoDiv").html(videoStr);
}
var productSize = detailInfo.productlList == null ? 0 : detailInfo.productlList.length;
$("#productSize").html(productSize);
var authStatusStr = "";
... ...
... ... @@ -81,7 +81,6 @@
iconCls : "icon-search",
onClick : function() {
//清空筛选数据
debugger
$("#publisher").textbox("setValue","");
$("#articleId").textbox("setValue","");
$("#isPublished").combobox("setValue","");
... ... @@ -94,7 +93,6 @@
});
debugger
$("#publisher").textbox({
required:false,
prompt: "用户昵称"
... ... @@ -128,7 +126,6 @@
loadFilter: function (data) {
var data = defaultLoadFilter(data);
data.unshift({'id': '0', 'groupName': '全部'});
debugger
return data;
}
});
... ... @@ -137,7 +134,6 @@
$("#searchBtn1").linkbutton({
iconCls : "icon-search",
onClick : function() {
debugger;
// var startTime="";
// var endTime="";
// if ($("#startTimeStr").datetimebox('getValue')!='') {
... ... @@ -186,10 +182,9 @@
width: 100,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '<div style=" margin-left: 15px">';
if(rowData.sort!=2 && rowData.sort!=3){
if(rowData.sort == 1 || rowData.sort == 4){
if(rowData.articleContent!='' && rowData.articleContent!=null){
if(rowData.articleContent.length>30){
str = str +'<p style=" white-space: pre-wrap;word-wrap:break-word">' +rowData.articleContent.substring(0,30) +'...</p>'
... ... @@ -218,6 +213,9 @@
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ imgList[i]+'" rowImages="'+imgList+'" onclick="bigImage(this);" >' ;
}*/
}
if(rowData.sort == 4 && rowData.coverImg != ''){
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ rowData.coverImg + '?imageView/2/w/60/h/60" >' ;
}
str = str + "<a role='showDetail' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>查看详情</a>";
... ... @@ -254,7 +252,6 @@
width: 20,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '';//不明身份者
if(rowData.sort == '1'){
str = "笔记";
... ... @@ -265,6 +262,9 @@
if(rowData.sort == '3'){
str = "H5跳转链接";
}
if(rowData.sort == '4'){
str = "短视频";
}
return str;
}
... ... @@ -275,7 +275,7 @@
width: 25,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var uid ="uid:"+ rowData.authorUid;
var nickName ="昵称:"+ rowData.nickName;
return uid+"<br>"+nickName;
... ... @@ -293,7 +293,7 @@
width: 30,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '';
if(rowData.authStatus == '9'){
str = "";
... ... @@ -311,7 +311,7 @@
width: 25,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '';
if(rowData.authStatus == '9'){
str = "未发布";
... ... @@ -329,7 +329,6 @@
width: 50,
align: "center",
formatter: function (value, rowData, rowIndex) {
debugger;
var str='';
if(rowData.authStatus == 9){
str += "<a role='edit'";
... ... @@ -385,7 +384,6 @@
$(this).datagrid("getPanel").find("a[role='edit']").linkbutton({
iconCls : "icon-edit",
onClick: function () {
debugger
var dataId = $(this).attr("dataId");
var sort = $(this).attr("sort");
index = $(this).attr("index");
... ... @@ -466,7 +464,6 @@
});
function publishArticle(id) {
debugger
var operateType = 5;
$.post(serverContextPath + "/grassArticle/updateArticle.do?articleId=" + id + "&operateType="+ operateType, function (data) {
if(data.code != 200){
... ... @@ -501,7 +498,6 @@
}
function switchTimer(id, status,publishTime) {
debugger
var operateType = status == 1 ? 3 : 4;
$.post(serverContextPath + "/grassArticle/updateArticle.do?articleId=" + id + "&publishTime=" + publishTime+ "&operateType="+ operateType, function (data) {
if(data.code != 200){
... ... @@ -531,7 +527,7 @@
}
}],
modal: true,
href: contextPath + "/html/grass/articleAuthorizeManage/imageView.html",
href: contextPath + "/html/grass/articleAuthorizeManage/imageView.html"
});
}
... ... @@ -552,7 +548,6 @@
text:textVar,
iconCls : "icon-save",
handler:function(){
debugger;
if($("#publishTimeStr").datetimebox('getValue') !=null && $("#publishTimeStr").datetimebox('getValue') !=''){
var time = parseInt(new Date($("#publishTimeStr").datetimebox('getValue')).getTime() );
switchTimer(id, status,time);
... ... @@ -613,7 +608,7 @@
// 审核 文章详情页
function getDetailDialog(rowData){
var articleId = rowData.articleId;
var detailUrl = rowData.sort == 1 ? "/html/grass/article/draftArticleDetail.html" : "/html/grass/longArticle/detail.html";
var detailUrl = (rowData.sort == 1 || rowData.sort == 4)? "/html/grass/article/draftArticleDetail.html" : "/html/grass/longArticle/detail.html";
var activityList = $("<div id='activityList'>").appendTo($(document.body));
var title = "内容详情";
// var textVar = articleId == null ? "保存":"保存";
... ... @@ -660,7 +655,7 @@
}
],
modal: true,
href: contextPath + detailUrl,
href: contextPath + detailUrl
});
}
... ...
... ... @@ -99,7 +99,7 @@
</td>
</tr>
<tr style="height: 20px">
<tr id="imgTr" style="height: 20px;display: none">
<td >
<span style="color:red">*</span><label style="font-size: 14px;">选择图片(最多九张)</label><br>
<span style="color:red">1.需要上传1-9张图片,必填项;&nbsp&nbsp&nbsp
... ... @@ -108,12 +108,19 @@
<input id="imgs" name="articleImages" hidden="hidden"/>
</td>
</tr>
<tr style="height: 60px">
<tr id="imgUploadTr" style="height: 60px;display: none">
<td id="imgTd">
<div id="imageUpload1">
</div>
</td>
</tr>
<tr id="videoTr" style="height: 60px;display: none">
<td>
<div id="videoDiv">
</div>
</td>
</tr>
<tr style="height: 60px">
<td>
<label style="font-size: 14px;">关联商品</label> <br>
... ... @@ -287,7 +294,6 @@
// });
/*字数限制*/
$("#content").emojioneArea()[0].emojioneArea.on("keyup change",function (edite,event) {
debugger
var $this = $(this);
var count = $this[0].getText().length;
var content = $this[0].getText();
... ... @@ -318,7 +324,7 @@
arr = $(this).combobox("getValues");
}
var labelList='';
debugger
for (var i=0; i<arr.length;i++){
var text = '';
for (var j=0; j< textarr.length;j++){
... ... @@ -334,7 +340,7 @@
var arr = $(this).combobox("getValues");
var textarr = $(this).combobox("getData");
var labelList='';
debugger
for (var i=0; i<arr.length;i++){
var text = '';
for (var j=0; j< textarr.length;j++){
... ... @@ -359,7 +365,7 @@
return defaultLoadFilter(data);
},
onChange:function (data) {
debugger
$('#topicId').combobox('reload',serverContextPath + "/grassTopicManage/grassTopicByGroupId?groupId="+data);
// 清空业务线
... ... @@ -381,7 +387,7 @@
var arr = $(this).combobox("getValue");
var textarr = $(this).combobox("getData");
var html='';
debugger
var text = '';
for (var j=0; j< textarr.length;j++){
if( arr == textarr[j].id){
... ... @@ -414,7 +420,7 @@
});
$(document).on("click", ".goodTag", function () {
debugger
var product_skn = $(this).attr("data-index");
removeSingleItemById(product_skn);
var skns = '';
... ... @@ -437,7 +443,7 @@
$("#publishArticleForm").form("submit",{
url : subottonUrl,
onSubmit : function(param) {
debugger;
if (!$("#publishArticleForm").form("validate")) {
return false;
... ... @@ -455,7 +461,7 @@
var imgs = '';
var imageCount = 0;
$("input[name='url']").each(function(j,item){
debugger
var url = item.value;
if(imgs == ''){
imgs = url;
... ... @@ -475,7 +481,7 @@
}
var labels = '';
$("input[name='labelId']").each(function(j,item){
debugger
var id = item.value;
if(labels == ''){
labels = id;
... ... @@ -521,7 +527,6 @@
$("#publishArticleForm").form("submit",{
url : serverContextPath+"/grassArticle/updateArticleDraft",
onSubmit : function(param) {
debugger;
if (!$("#publishArticleForm").form("validate")) {
return false;
... ... @@ -539,7 +544,7 @@
var imgs = '';
var imageCount = 0;
$("input[name='url']").each(function(j,item){
debugger
var url = item.value;
if(imgs == ''){
imgs = url;
... ... @@ -559,7 +564,6 @@
}
var labels = '';
$("input[name='labelId']").each(function(j,item){
debugger
var id = item.value;
if(labels == ''){
labels = id;
... ... @@ -608,14 +612,13 @@
bucket: "grassImg"
},
onBeforeSubmit: function () {
debugger;
var oobj = $(this).find("input[type='file']");
var files = oobj[0].files;
for(var i=0; i<files.length;i++){
var obj = files[i];
if(obj!=null && obj!=''){
debugger
if(obj.name.substring(obj.name.lastIndexOf(".")).toLowerCase() == '.png'){
$.messager.alert("提示","不允许上传png格式的图片", "info", function(){return false;});
return false;
... ... @@ -628,7 +631,7 @@
}
var imageCount = 0;
$("input[name='url']").each(function(j,item){
debugger
var url = item.value;
if(url != ''){
imageCount++;
... ... @@ -646,7 +649,7 @@
});
},
filterFileName: function (data) {
debugger;
if (!data || data.code != 200) {
$.messager.progress("close");
initimg(1,1);
... ... @@ -669,7 +672,6 @@
}
});
debugger;
var data = paramObject.mkData;
if (data){
... ... @@ -700,13 +702,23 @@
htmlTopic(data.topicName);
if(data.sort != 4){
$("#imgTr").show();
$("#imgUploadTr").show();
$("#videoTr").hide();
initimg(1,data.imgList.length);
for (var j= 1; j<= data.imgList.length; j++){
$("#imageUpload"+j).imageUpload("setValue",data.imgList[j-1])
}
}else {
$("#imgTr").hide();
$("#imgUploadTr").hide();
$("#videoTr").show();
initimg(1,data.imgList.length);
for (var j= 1; j<= data.imgList.length; j++){
$("#imageUpload"+j).imageUpload("setValue",data.imgList[j-1])
}
debugger
if(data.sknList!=null && data.sknList.length>0){
checkedItems =data.sknList;
}
... ... @@ -738,7 +750,6 @@
text:textVar,
iconCls : "icon-save",
handler:function(){
debugger;
var time=''
if($("#publishTimeStr").datetimebox('getValue') !=null && $("#publishTimeStr").datetimebox('getValue') !=''){
time = parseInt(new Date($("#publishTimeStr").datetimebox('getValue')).getTime() );
... ... @@ -749,7 +760,6 @@
$("#publishArticleForm").form("submit",{
url : serverContextPath+"/grassArticle/updateArticleDraft",
onSubmit : function(param) {
debugger;
if (!$("#publishArticleForm").form("validate")) {
return false;
}
... ... @@ -767,7 +777,7 @@
var imgs = '';
var imageCount = 0;
$("input[name='url']").each(function(j,item){
debugger
var url = item.value;
if(imgs == ''){
imgs = url;
... ... @@ -787,7 +797,7 @@
}
var labels = '';
$("input[name='labelId']").each(function(j,item){
debugger
var id = item.value;
if(labels == ''){
labels = id;
... ... @@ -852,7 +862,6 @@
text:textVar,
iconCls : "icon-save",
handler:function(){
debugger;
$("#goodstd").html("<div id=\"good0\" style=\"float: left;margin-left: 30px;width: 300px\">\n" +
" </div>");
... ... @@ -896,7 +905,7 @@
for(var i=0; i<files.length;i++){
var obj = files[i];
if(obj!=null && obj!=''){
debugger
if(obj.name.substring(obj.name.lastIndexOf(".")).toLowerCase() == 'png'){
$.messager.alert("提示","不允许上传png格式的图片", "info", function(){return false;});
return false;
... ... @@ -909,7 +918,7 @@
}
var imageCount = 0;
$("input[name='url']").each(function(j,item){
debugger
var url = item.value;
if(url != ''){
imageCount++;
... ... @@ -927,7 +936,6 @@
});
},
filterFileName: function (data) {
debugger;
if (!data || data.code != 200) {
$.messager.progress("close");
initimg(num,1);
... ... @@ -938,7 +946,6 @@
return data.data[0];
},
onLoadSuccess: function (data) {
debugger;
initimg(num,data.data.length);
var c =0;
for (var i= 0; i<= data.data.length; i++){
... ... @@ -959,7 +966,6 @@
function initimg(m,n) {
for (var i =1 ; i<=n; i++){
debugger
var nnum = m+i;
$("#imageUpload"+(nnum-1)).after('<div id="imageUpload'+nnum+'"> </div>');
oo(nnum);
... ... @@ -967,7 +973,6 @@
}
function buildgood(index,obj) {
debugger;
var data = checkedItemsObj[obj];
if(data ==null){
return;
... ... @@ -1064,7 +1069,7 @@
}
}
function removeSingleItemById(id) {
debugger
var k = findCheckedItem(id);
if (k != -1) {
checkedItems.splice(k, 1);
... ... @@ -1072,7 +1077,7 @@
}
function initGoods(skns,type) {
debugger
var url=serverContextPath+"/grassArticle/queryGoods";
// var url = contextPath+"/search/queryGoods";
var query ='';
... ... @@ -1095,7 +1100,7 @@
url : url+params,
async : false,
success : function(data){
debugger
if(data.code == 200){
for (var i=0; i<data.data.list.length;i++){
var rowdata = data.data.list[i]
... ...
... ... @@ -202,7 +202,7 @@
align: "left",
formatter: function (value, rowData, rowIndex) {
var str = '<div style=" margin-left: 15px">';
if(rowData.sort!=2 && rowData.sort!=3){
if(rowData.sort == 1 || rowData.sort != 4){
if(rowData.articleContent!='' && rowData.articleContent!=null){
if(rowData.articleContent.length>30){
str = str +'<p style=" white-space: pre-wrap;word-wrap:break-word">' +rowData.articleContent.substring(0,30) +'...</p>'
... ... @@ -224,6 +224,9 @@
if(imgList !=null){//可能没有图片
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ imgList[0]+'?imageView/2/w/60/h/60" >' ;
}
if(rowData.sort == 4 && rowData.coverImg != ''){
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ rowData.coverImg + '?imageView/2/w/60/h/60" >' ;
}
str = str + "<a role='showDetail' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>查看详情</a>";
str =str + '</p>';
... ... @@ -445,7 +448,7 @@
// 审核--通过不通过
function getDetailDialog(rowData){
var articleId = rowData.articleId;
var detailUrl = rowData.sort == 1 ? "/html/grass/articleAuthorizeManage/articleDetail.html?articleId" : "/html/grass/articleAuthorizeManage/longArticleDetail.html?articleId";
var detailUrl = (rowData.sort == 1 || rowData.sort == 4)? "/html/grass/articleAuthorizeManage/articleDetail.html?articleId" : "/html/grass/articleAuthorizeManage/longArticleDetail.html?articleId";
var activityList = $("<div id='activityList'>").appendTo($(document.body));
var title = "内容详情";
... ... @@ -513,7 +516,7 @@
}
],
modal: true,
href: contextPath + detailUrl + articleId,
href: contextPath + detailUrl + articleId
});
}
... ...
... ... @@ -62,7 +62,7 @@
</td>
</tr>
<tr style="height: 60px">
<tr id="imgTr" style="height: 60px;display: none">
<td>
<div class="swiper-container">
<div class="swiper-wrapper" id="imageListDiv">
... ... @@ -80,6 +80,13 @@
</div>
</td>
</tr>
<tr id="videoTr" style="height: 60px;display: none">
<td>
<div id="videoDiv">
</div>
</td>
</tr>
<tr style="height: 60px">
<td>
... ... @@ -163,7 +170,7 @@
// 如果需要前进后退按钮
navigation: {
nextEl: '.swiper-button-next',
prevEl: '.swiper-button-prev',
prevEl: '.swiper-button-prev'
},
observer: true,//修改swiper自己或子元素时,自动初始化swiper
observeParents: true//修改swiper的父元素时,自动初始化swiper
... ... @@ -198,15 +205,27 @@
var imgSize = detailInfo.imgList == null ? 0 : detailInfo.imgList.length;
$("#imgSize").html(imgSize);
//展示图片(肯定有图片,没图片那就是业务有问题,或者数据有问题)
if (detailInfo.imgList != null && detailInfo.imgList.length > 0) {
var imageDivStr = "";
for (var i = 0; i < detailInfo.imgList.length; i++) {
imageDivStr += '<div class="swiper-slide" style="text-align: center;line-height:300px;"><img src="' + detailInfo.imgList[i] + '" style="max-width: 400px;max-height:300px;margin-left: 100px;margin-right: 5px"/></div>';
if(detailInfo.sort != 4){
$("#imgTr").show();
$("#videoTr").hide();
//展示图片(肯定有图片,没图片那就是业务有问题,或者数据有问题)
if (detailInfo.imgList != null && detailInfo.imgList.length > 0) {
var imageDivStr = "";
for (var i = 0; i < detailInfo.imgList.length; i++) {
imageDivStr += '<div class="swiper-slide" style="text-align: center;line-height:300px;"><img src="' + detailInfo.imgList[i] + '" style="max-width: 400px;max-height:300px;margin-left: 100px;margin-right: 5px"/></div>';
}
$("#imageListDiv").html(imageDivStr);
}
$("#imageListDiv").html(imageDivStr);
}else{
$("#imgTr").hide();
$("#videoTr").show();
var videoStr = '<video src="' + detailInfo.videoUrl + '" controls autoplay loop muted preload="auto" poster="' + detailInfo.coverImg + '" >';
//var videoStr = '<video src="http://flv01.static.yhbimg.com/goodsvideo/2017/08/25/17/039b9ce839a967ee0352049ebe2484df21.mp4" controls autoplay loop muted preload="auto" poster="' + detailInfo.coverImg + '" >';
$("#videoDiv").html(videoStr);
}
var productSize = detailInfo.productlList == null ? 0 : detailInfo.productlList.length;
$("#productSize").html(productSize);
var authStatusStr = "";
... ...
... ... @@ -95,7 +95,6 @@
iconCls : "icon-search",
onClick : function() {
//清空筛选数据
debugger
$("#publisher").textbox("setValue","");
$("#articleId").textbox("setValue","");
$("#source").combobox("setValue","");
... ... @@ -111,8 +110,6 @@
}
});
debugger
$("#publisher").textbox({
required:false,
prompt: "用户昵称"
... ... @@ -158,7 +155,6 @@
loadFilter: function (data) {
var data = defaultLoadFilter(data);
data.unshift({'id': '0', 'groupName': '全部'});
debugger
return data;
}
});
... ... @@ -205,7 +201,7 @@
required:false,
editable:false,
prompt: "文章内容类型",
data:[{text:"全部",value:"0"},{text:"普通笔记",value:"1"},{text:"长文章",value:"2"},{text:"H5跳转链接",value:"3"}]
data:[{text:"全部",value:"0"},{text:"普通笔记",value:"1"},{text:"长文章",value:"2"},{text:"H5跳转链接",value:"3"},{text:"短视频",value:"4"}]
});
... ... @@ -213,7 +209,6 @@
$("#searchBtn").linkbutton({
iconCls : "icon-search",
onClick : function() {
debugger;
var startTime="";
var endTime="";
if ($("#startTimeStr").datetimebox('getValue')!='') {
... ... @@ -273,9 +268,8 @@
width: 60,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '<div style=" margin-left: 15px">';
if(rowData.sort!=2 && rowData.sort!=3){
if(rowData.sort == 1 || rowData.sort == 4){
if(rowData.articleContent!='' && rowData.articleContent!=null){
if(rowData.articleContent.length>30){
str = str +'<p style=" white-space: pre-wrap;word-wrap:break-word">' +rowData.articleContent.substring(0,30) +'...</p>'
... ... @@ -295,9 +289,12 @@
var imgList = rowData.imgList;
str =str + '<p>';
if(imgList !=null){//可能没有图片
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ imgList[0]+'?imageView/2/w/60/h/60" >' ;
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ imgList[0] + '?imageView/2/w/60/h/60" >' ;
}
if(rowData.sort == 4 && rowData.coverImg != ''){
str = str + ' <img style="width:60px; height: 60px;margin-left: 3px" src="'+ rowData.coverImg + '?imageView/2/w/60/h/60" >' ;
}
str = str + "<a role='showDetail' dataId='"+rowData.articleId+ "' index='"+ rowIndex + "' status='1' style='margin-left:10px'>查看详情</a>";
... ... @@ -318,7 +315,6 @@
width: 25,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var uid ="uid:"+ rowData.authorUid;
var nickName ="昵称:"+ rowData.nickName;
return uid+"<br>"+nickName;
... ... @@ -339,7 +335,6 @@
width: 20,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '';
if(rowData.source == '1'){
... ... @@ -370,7 +365,6 @@
width: 20,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '';
if(rowData.sort == '1'){
str = "笔记";
... ... @@ -381,6 +375,9 @@
if(rowData.sort == '3'){
str = "H5跳转链接";
}
if(rowData.sort == '4'){
str = "短视频";
}
return str;
}
... ... @@ -425,7 +422,6 @@
width: 25,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '';
if(rowData.isRecommend == '1'){
str = "已推荐";
... ... @@ -441,7 +437,6 @@
width: 25,
align: "left",
formatter: function (value, rowData, rowIndex) {
debugger
var str = '';
if(rowData.isTop == '1'){
str = "已置顶";
... ... @@ -470,7 +465,6 @@
width: 50,
align: "center",
formatter: function (value, rowData, rowIndex) {
debugger
var str='';
str += "<a role='edit'";
var classStr = "class='btn-success'";
... ... @@ -478,14 +472,14 @@
var optStr = "编辑</a>" ;
str += optStr;
if(rowData.authStatus == 1){
str += "<a role='switchR'"
str += "<a role='switchR'";
var classStr = rowData.isRecommend == 1 ? "class='btn-danger'" : "class='btn-success'";
str += classStr +" dataId='" + rowData.articleId + "' index='"+ rowIndex +"' status='" + rowData.isRecommend + "' style='margin-left:10px'>";
var optStr = rowData.isRecommend == 1 ? "取消推荐</a>" : "推荐</a>";
str += optStr;
if(rowData.isRecommend == 1){
str += "<a role='switchT'"
str += "<a role='switchT'";
var classStr = rowData.isTop == 1 ? "class='btn-danger'" : "class='btn-success'";
str += classStr +" dataId='" + rowData.articleId + "' index='"+ rowIndex +"' status='" + rowData.isTop + "' style='margin-left:10px'>";
var optStr = rowData.isTop == 1 ? "取消置顶</a>" : "置顶</a>";
... ... @@ -535,7 +529,6 @@
$(this).datagrid("getPanel").find("a[role='edit']").linkbutton({
iconCls : "icon-edit",
onClick: function () {
debugger
var dataId = $(this).attr("dataId");
var sort = $(this).attr("sort");
index = $(this).attr("index");
... ... @@ -664,7 +657,7 @@
$(articleEditer).dialog("close");
}
}
],
]
});
}
... ... @@ -700,7 +693,6 @@
}
function switchRecommend(id, status) {
debugger
var switchStatus = status == 1 ? 0 : 1;
$.post(serverContextPath + "/grassArticle/updateArticle.do?articleId=" + id + "&isRecommend=" + switchStatus+ "&operateType=0", function (data) {
if(data.code != 200){
... ... @@ -712,7 +704,6 @@
}
function switchTop(id, status) {
debugger
var switchStatus = status == 1 ? 0 : 1;
$.post(serverContextPath + "/grassArticle/updateArticle.do?articleId=" + id + "&isTop=" + switchStatus+ "&operateType=0", function (data) {
if(data.code != 200){
... ... @@ -728,7 +719,12 @@
// 审核 文章详情页
function getDetailDialog(rowData){
var articleId = rowData.articleId;
var detailUrl = rowData.sort == 1 ? "/html/grass/articleAuthorizeManage/articleDetail.html?articleId" : "/html/grass/articleAuthorizeManage/longArticleDetail.html?articleId";
var detailUrl = "";
if(rowData.sort == 1 || rowData.sort == 4){
detailUrl = "/html/grass/articleAuthorizeManage/articleDetail.html?articleId";
}else{
detailUrl = "/html/grass/articleAuthorizeManage/longArticleDetail.html?articleId";
}
var activityList = $("<div id='activityList'>").appendTo($(document.body));
var title = "内容详情";
// var textVar = articleId == null ? "保存":"保存";
... ... @@ -796,7 +792,7 @@
}
],
modal: true,
href: contextPath + detailUrl + articleId,
href: contextPath + detailUrl + articleId
});
}
... ...
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title></title>
<style type="text/css">
*{margin:0;padding:0;color: #838383;}
table{font-size: 12px;margin: 10px;line-height: 30px; width: 80%; margin: 50px auto;}
.txt{width:300px;height:21px;line-height:21px;border:1px solid #d7d7d7;}
</style>
</head>
<body>
<table style="width: 420px; margin: 30px auto;">
<tr>
<td><label for="text"> 文本内容</label></td>
<td><input class="txt" id="text" type="text" disabled="true"/></td>
</tr>
<tr>
<td><label for="href"> 链接类型</var></label></td>
<td>
<select class="form-control observe" id="action" name="action" value="">
<option value="">请选择跳转列表</option>
<option value="go.brand">品牌列表页</option>
<option value="go.productDetail">商品详情页</option>
<option value="go.coupon">优惠券页</option>
<option value="go.fav">收藏列表页</option>
<option value="go.mine">我的页面</option>
<option value="go.list">列表或搜索页</option>
<option value="go.attention">关注页</option>
<option value="go.plus">plus页</option>
<option value="go.star">star页</option>
<option value="go.new">新品到着页</option>
<option value="go.sale">折扣页</option>
<option value="go.share">分享</option>
<option value="go.h5">h5网页</option>
<option value="go.weblogin">h5网页调用本地登录</option>
<option value="go.gender">男女首页</option>
<option value="go.activity">app活动页</option>
<option value="go.home">频道首页</option>
<option value="go.yohood">YOHOOD</option>
<option value="go.top100">热销排行</option>
<option value="go.activitytemplate">活动模板</option>
<option value="go.globalpurchase">全球购</option>
<option value="go.subchannel">二级频道</option>
<option value="go.showgoods">去晒单</option>
<option value="go.limitpurchase">尖货频道</option>
<option value="go.vippro">会员商品</option>
<option value="go.shortsize">断码页</option>
<option value="go.discountmarket">折扣专区</option>
<option value="go.discountmarketpro">折扣专区详情页</option>
<option value="go.signin">签到页</option>
<option value="go.playvideo">视频播放</option>
<option value="go.shop">店铺</option>
<option value="go.outletactivity">奥莱活动详情页</option>
<option value="go.newoutlet">奥莱频道页</option>
<option value="go.category">选择一级品类</option>
<option value="go.comm.postdetail">社区帖子详情页</option>
<option value="go.comm.forum">社区版块首页</option>
<option value="go.comm.h5">社区H5</option>
<option value="go.comm.productDetail">社区商品详情页</option>
<option value="go.videolive">直播详情页</option>
<option value="go.videoreplay">重播详情页</option>
<option value="go.newyohood">new YOHOOD</option>
<option value="go.myInstalment">分期</option>
<option value="go.blkbrandcategory">BLK品牌品类页</option>
<option value="go.findgoodgoods">发现好货</option>
<option value="go.poollist">商品列表页</option>
<option value="go.gallay">xx馆落地页</option>
<option value="go.shopactivity">店铺活动页</option>
<option value="go.newarrivalsingleshop">新品到着单品</option>
<option value="go.blkhome">有货BLK首页</option>
<option value="go.family">有货 !family</option>
<option value="go.vipInfo">会员中心页</option>
<option value="go.vipexclusivepro">会员专享列表</option>
<option value="go.minealliance">联盟</option>
<option value="go.miniapp">跳转到小程序</option>
<option value="go.collagehome">拼团首页</option>
<option value="go.switchchannel">频道切换</option>
<option value="go.mineredpackage">我的红包</option>
<option value="go.ufo">UFO落地页</option>
<option value="go.bargainlist">砍价商品列表</option>
<option value="go.searchlist">搜索结果页</option>
<option value="go.guangchannel">社区</option>
</select>
</td>
</tr>
<tr>
<td><label for="href"> 链接地址</var></label></td>
<td><input class="txt" id="href" type="text" /></td>
</tr>
<tr>
<td><label for="title"> 标题</label></td>
<td><input class="txt" id="title" type="text"/></td>
</tr>
<tr>
<td colspan="2" id="msg"></td>
</tr>
</table>
<!--页面中一定要引入internal.js为了能直接使用当前打开dialog的实例变量-->
<!--internal.js默认是放到dialogs目录下的-->
<script type="text/javascript" src="../../third-party/jquery-1.10.2.min.js"></script>
<script type="text/javascript" src="../internal.js"></script>
<script>
$(function () {
var lang = editor.getLang('link');
var action = $("#action");
var range = editor.selection.getRange(),
link = range.collapsed ? editor.queryCommandValue( "link" ) : editor.selection.getStart(),
url,
trueUrl,
text = $G('text'),
rangeLink = domUtils.findParentByTagName(range.getCommonAncestor(),'a',true),
orgText;
link = domUtils.findParentByTagName( link, "a", true );
if(link){
url = utils.html(link.getAttribute( '_href' ) || link.getAttribute( 'href', 2 ));
if(rangeLink === link && !link.getElementsByTagName('img').length){
text.removeAttribute('disabled');
orgText = text.value = link[browser.ie ? 'innerText':'textContent'];
}else{
text.setAttribute('disabled','true');
text.value = lang.validLink;
}
}else{
if(range.collapsed){
text.removeAttribute('disabled');
text.value = '';
}else{
text.setAttribute('disabled','true');
text.value = lang.validLink;
}
}
// url = url+'?openby:yohobuy=' + JSON.stringify({action: action, params: {url: url}});
// yoholink
if (url) {
var urlPart = url.split('?openby:yohobuy=');
if (urlPart.length == 2) {
try {
action.val(JSON.parse(urlPart[1]).action);
trueUrl = urlPart[0];
} catch (err) {
console.log("yoho link err", err);
}
}
}
$G("title").value = url ? link.title : "";
$G("href").value = url && trueUrl ? trueUrl : '';
$focus($G("href"));
function handleDialogOk(){
var href =$G('href').value.replace(/^\s+|\s+$/g, '');
if (!domainValidate(href)) {
return;
}
if(href){
if(!hrefStartWith(href,["http","/","ftp://",'#'])) {
href = "http://" + href;
}
var obj = {
'href' : href,
'title' : $G("title").value.replace(/^\s+|\s+$/g, ''),
'_href':href
};
//修改链接内容的情况太特殊了,所以先做到这里了
//todo:情况多的时候,做到command里
if(orgText && text.value != orgText){
link[browser.ie ? 'innerText' : 'textContent'] = obj.textValue = text.value;
range.selectNode(link).select()
}
if(range.collapsed){
obj.textValue = text.value;
}
var conItem = href.indexOf("?") > -1 ? "&" : "?";
obj._href = obj.href = href + conItem + 'openby:yohobuy=' + JSON.stringify({action: action.val(), params: {url: encodeURI(href)}});
editor.execCommand('link',utils.clearEmptyAttrs(obj) );
dialog.close();
}
}
dialog.onok = handleDialogOk;
function hrefStartWith(href,arr){
href = href.replace(/^\s+|\s+$/g, '');
for(var i=0,ai;ai=arr[i++];){
if(href.indexOf(ai)==0){
return true;
}
}
return false;
}
var hrefDomain = ["yohobuy.com", "yhbimg.com", "yohomars.com", "yoho.cn", "yohoboys.com"];
function domainValidate(href) {
var result = false;
for(var i=0; i< hrefDomain.length; i++) {
if (href.indexOf(hrefDomain[i]) > -1) {
result = true;
break;
}
}
return result;
}
$G('href').onblur = function(){
if(!hrefStartWith(this.value,["http","/","ftp://",'#'])){
$G("msg").innerHTML = "<span style='color: red'>"+lang.httpPrompt+"</span>";
}else{
$G("msg").innerHTML = "";
}
if(!domainValidate(this.value)) {
$G("msg").innerHTML = "<span style='color: red'>合法域名"+hrefDomain.join('、') +"</span>";
}
};
})
</script>
</body>
</html>
\ No newline at end of file
... ... @@ -217,6 +217,20 @@
$G("href").value = url && trueUrl ? trueUrl : '';
$focus($G("href"));
function getUrlParams(url) {
var params = {};
if (url.indexOf("?") != -1) {
var str = url.split("?")[1];
if(!str) {
return params;
}
strs = str.split("&");
for(var i = 0; i < strs.length; i ++) {
params[strs[i].split("=")[0]]=strs[i].split("=")[1];
}
}
return params;
}
function handleDialogOk(){
var href =$G('href').value.replace(/^\s+|\s+$/g, '');
if (!domainValidate(href)) {
... ... @@ -242,7 +256,7 @@
obj.textValue = text.value;
}
var conItem = href.indexOf("?") > -1 ? "&" : "?";
obj._href = obj.href = href + conItem + 'openby:yohobuy=' + JSON.stringify({action: action.val(), params: {url: encodeURI(href)}});
obj._href = obj.href = href + conItem + 'openby:yohobuy=' + JSON.stringify({action: action.val(), params: {url: href.split("?")[0], param: getUrlParams(href)}});
editor.execCommand('link',utils.clearEmptyAttrs(obj) );
dialog.close();
... ...