Commit 7bc04676 authored by 陈志良's avatar 陈志良

Merge branch '0922_forum_share' into SANDBOX

parents 5d152c58 109edf1c
......@@ -60,15 +60,15 @@ function getWX(res, title, desc, link, imgUrl, mid,ent_code, id,type,forumThread
error:err
});
}else{
title = title.replace(/{板块名称}/g, forumInfo.name);
desc = desc.replace(/{板块名称}/g, forumInfo.name);
title = title?title.replace(/{板块名称}/g, forumInfo.name):'';
desc = desc?desc.replace(/{板块名称}/g, forumInfo.name):'';
write(res, title, desc, link, imgUrl, mid,ent_code);
}
});
} else if(type === "Thread"){
title = title.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title);
desc = desc.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title);
title = title?title.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title):'';
desc = desc?desc.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title):'';
write(res, title, desc, link, imgUrl, mid,ent_code);
}
}
......@@ -162,7 +162,7 @@ router.get('/:ent_code/share.js', function(req, res, next) {
}
var baseParamsUrl = '&infoId=' + thread.info + '&ent_code=' + ent_code + '&id=' + thread._id + '&uId='+uId;
link += baseParamsUrl;
desc = thread.content.replace(/<\/?.+?>/g,"").replace(/&nbsp;/g,"");
desc = thread.content?thread.content.replace(/<\/?.+?>/g,"").replace(/&nbsp;/g,""):'';
imgUrl = thread.from.displayIcon || thread.from.icon || thread.info.icon;
//获取分享设置
if (!thread.share || thread.share_type==1) {
......@@ -251,13 +251,13 @@ function getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,forumThre
error:err
});
}else{
title = title?title.replace(/{板块名称}/g, forumInfo.name):title;
desc = desc?desc.replace(/{板块名称}/g, forumInfo.name):desc;
title = title?title.replace(/{板块名称}/g, forumInfo.name):'';
desc = desc?desc.replace(/{板块名称}/g, forumInfo.name):'';
}
});
} else if(type === "Thread"){
title = title?title.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title):title;
desc = desc?desc.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title):desc;
title = title?title.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title):'';
desc = desc?desc.replace(/{文章标题}|{话题名称}|{照片墙标题}/g, forumThread.title):'';
}
res.json({
title:title,
......@@ -353,7 +353,7 @@ router.get('/sharev2.js', function(req, res, next) {
}
break;
}
desc = thread.content.replace(/<\/?.+?>/g,"").replace(/&nbsp;/g,"");
desc = thread.content?thread.content.replace(/<\/?.+?>/g,"").replace(/&nbsp;/g,""):'';
imgUrl = thread.from.displayIcon || thread.from.icon || thread.info.icon;
link += baseParamsUrl;
//获取分享设置
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment