Commit 68658031 authored by 陈家荣's avatar 陈家荣

调试分享

parent bc2b4864
...@@ -19,7 +19,7 @@ module.exports = function(app) { ...@@ -19,7 +19,7 @@ module.exports = function(app) {
//查询单个头衔信息人员信息 //查询单个头衔信息人员信息
router.get('/honorTitle/:hid/list', function(req, res, next) { router.get('/honorTitle/:hid/list', function(req, res, next) {
var pageNo = req.query.pageNo || 1; var pageNo = req.query.pageNo || 1;
var pageSize = req.query.pageSize || 4; var pageSize = req.query.pageSize || 999;
var ent_code = req.session.user.ent_code; var ent_code = req.session.user.ent_code;
var honorTitleId = req.params.hid; var honorTitleId = req.params.hid;
...@@ -73,9 +73,7 @@ router.get('/honorTitle/list', function(req, res, next) { ...@@ -73,9 +73,7 @@ router.get('/honorTitle/list', function(req, res, next) {
asyncTasks.push(function(cont) { asyncTasks.push(function(cont) {
var user_conditions = { var user_conditions = {
ent_code: ent_code, ent_code: ent_code,
honor: { honor: one._id
$in: [one._id]
}
}; };
forumUserHonorTimeLineService.getAll(pageNo, pageSize, user_conditions,fields,'-_id', function(err, results) { forumUserHonorTimeLineService.getAll(pageNo, pageSize, user_conditions,fields,'-_id', function(err, results) {
if (err) { if (err) {
......
...@@ -308,7 +308,8 @@ router.get('/sharev2.js', function(req, res, next) { ...@@ -308,7 +308,8 @@ router.get('/sharev2.js', function(req, res, next) {
var key = ent_code + 'forum_share_index_info'; var key = ent_code + 'forum_share_index_info';
console.log('key: ' + key); console.log('----------- in ---------');
console.log(type);
if(type && type === 'index'){ if(type && type === 'index'){
var expire = 60 * 60; var expire = 60 * 60;
...@@ -450,16 +451,12 @@ router.get('/sharev2.js', function(req, res, next) { ...@@ -450,16 +451,12 @@ router.get('/sharev2.js', function(req, res, next) {
share_log.p_thread = thread.pid; share_log.p_thread = thread.pid;
share_log.info = thread.info._id || thread.info; share_log.info = thread.info._id || thread.info;
share_log.thread_type = thread.pid?4:thread.type; share_log.thread_type = thread.pid?4:thread.type;
console.log(' old session -----------> ');
console.log(req.session);
//替换分享log内容 //替换分享log内容
req.session.shareLog = share_log; req.session.shareLog = share_log;
console.log(' new session -----------> '); console.log(' new session -----------> ');
console.log(req.session); console.log(req.session.shareLog);
//组装分享路径与判断分享类型 //组装分享路径与判断分享类型
......
...@@ -142,6 +142,7 @@ exports.createLog = function(req,source,info,type,thread_type,thread,p_thread) { ...@@ -142,6 +142,7 @@ exports.createLog = function(req,source,info,type,thread_type,thread,p_thread) {
}; };
exports.createShareLog = function(req,share_type) { exports.createShareLog = function(req,share_type) {
console.log('----------- in createShareLog ---------');
var logObj = req.session.shareLog || {}; var logObj = req.session.shareLog || {};
logObj.source = req.session.mobileForumUser.source; logObj.source = req.session.mobileForumUser.source;
logObj.mid = req.session.openUser.mid; logObj.mid = req.session.openUser.mid;
...@@ -160,6 +161,7 @@ exports.createShareLog = function(req,share_type) { ...@@ -160,6 +161,7 @@ exports.createShareLog = function(req,share_type) {
}).then(function(cont){ }).then(function(cont){
if(logObj.thread){ if(logObj.thread){
ForumThread.update({_id:logObj.thread},{$inc:{share_count:1}},function(err){ ForumThread.update({_id:logObj.thread},{$inc:{share_count:1}},function(err){
console.log('----------- update share_count success ---------');
cont(err); cont(err);
}); });
} }
......
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