Commit d13937bc authored by 陈志良's avatar 陈志良

Merge branch 'Notice' into SANDBOX

parents 5b837d1e f8dc1f5a
...@@ -579,8 +579,8 @@ router.get('/info/myAttend', function(req, res, next) { ...@@ -579,8 +579,8 @@ router.get('/info/myAttend', function(req, res, next) {
var conditions = {}; var conditions = {};
if(results){ if(results){
conditions._id ={ conditions._id ={
$in:threadIds, $in:threadIds
$nin:results // $nin:results
} }
}else{ }else{
conditions._id ={ conditions._id ={
......
...@@ -134,7 +134,6 @@ router.get('/notice/newestAct', function(req, res, next) { ...@@ -134,7 +134,6 @@ router.get('/notice/newestAct', function(req, res, next) {
}else{ }else{
_condition.plate=null; _condition.plate=null;
} }
console.log(_condition);
queryList(_condition,_sort,pageNo,pageSize,function(err,result){ queryList(_condition,_sort,pageNo,pageSize,function(err,result){
if(err){ if(err){
return res.json(err); return res.json(err);
......
...@@ -304,8 +304,6 @@ router.get('/sharev2.js', function(req, res, next) { ...@@ -304,8 +304,6 @@ router.get('/sharev2.js', function(req, res, next) {
mid = req.session.openUser.mid; mid = req.session.openUser.mid;
} }
delete req.session.mobileForumUser.share_log; delete req.session.mobileForumUser.share_log;
console.log(type);
console.log(id);
//板块微信接口 //板块微信接口
if(!type || !id){ if(!type || !id){
console.error('请求参数错误') console.error('请求参数错误')
...@@ -349,7 +347,6 @@ router.get('/sharev2.js', function(req, res, next) { ...@@ -349,7 +347,6 @@ router.get('/sharev2.js', function(req, res, next) {
} }
}); });
link = link + 'index&infoId='+ id+'&uId='+uId; link = link + 'index&infoId='+ id+'&uId='+uId;
console.log(1);
getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,null); getWXV2(res, title, desc, link, imgUrl, mid,ent_code, id,type,null);
}else{ }else{
//没找到板块默认分享设置 //没找到板块默认分享设置
......
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