Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pisns-forum-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
scrmGroup
pisns-forum-api
Commits
943e8539
Commit
943e8539
authored
Mar 04, 2016
by
陈家荣
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新照片墙显示
parent
21c0f268
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
forumThread.js
app/controllers/mobile/forumThread.js
+6
-7
No files found.
app/controllers/mobile/forumThread.js
View file @
943e8539
...
@@ -36,8 +36,6 @@ function create(req, callback) {
...
@@ -36,8 +36,6 @@ function create(req, callback) {
entity
.
pid
=
null
;
entity
.
pid
=
null
;
}
}
var
address
=
entity
.
address
||
null
;
var
address
=
entity
.
address
||
null
;
if
(
address
)
{
if
(
address
)
{
entity
.
address
=
JSON
.
parse
(
address
);
entity
.
address
=
JSON
.
parse
(
address
);
...
@@ -72,7 +70,8 @@ function create(req, callback) {
...
@@ -72,7 +70,8 @@ function create(req, callback) {
type
:
3
,
type
:
3
,
level
:
'2'
,
level
:
'2'
,
pid
:
entity
.
pid
,
pid
:
entity
.
pid
,
from
:
entity
.
from
from
:
entity
.
from
,
status
:
{
$ne
:
3
}
},
function
(
err
,
doc
)
{
},
function
(
err
,
doc
)
{
if
(
doc
)
{
if
(
doc
)
{
var
update
=
{
var
update
=
{
...
@@ -533,10 +532,9 @@ router.get('/thread/:tid/get', function(req, res, next) {
...
@@ -533,10 +532,9 @@ router.get('/thread/:tid/get', function(req, res, next) {
if
(
tid
)
{
if
(
tid
)
{
async
.
waterfall
([
async
.
waterfall
([
function
(
callback
)
{
function
(
callback
)
{
forumThreadService
.
getThreadById
(
tid
,
function
(
err
,
thread
)
{
forumThreadService
.
getThreadById
(
tid
,
function
(
err
,
thread
)
{
//文章类型 1、文章 2、话题 3、照片墙
//文章类型 1、文章 2、话题 3、照片墙
if
(
err
)
{
if
(
err
||
!
thread
)
{
callback
(
err
,
null
);
callback
(
err
,
null
);
}
else
{
}
else
{
callback
(
null
,
thread
);
callback
(
null
,
thread
);
...
@@ -621,13 +619,14 @@ router.get('/thread/:tid/get', function(req, res, next) {
...
@@ -621,13 +619,14 @@ router.get('/thread/:tid/get', function(req, res, next) {
//获取目标论坛文章
//获取目标论坛文章
router
.
get
(
'/thread/photo/:pid/get'
,
function
(
req
,
res
,
next
)
{
router
.
get
(
'/thread/photo/:pid/get'
,
function
(
req
,
res
,
next
)
{
var
pid
=
req
.
params
.
pid
||
null
,
var
pid
=
req
.
params
.
pid
||
null
,
userId
=
req
.
session
.
mobileForumUser
.
userId
;
;
userId
=
user
.
getMobileUser
(
req
)
;
if
(
pid
)
{
if
(
pid
)
{
forumThreadService
.
getByConditions
({
forumThreadService
.
getByConditions
({
type
:
3
,
type
:
3
,
level
:
'2'
,
level
:
'2'
,
pid
:
pid
,
pid
:
pid
,
from
:
userId
from
:
userId
,
status
:
{
$ne
:
3
}
},
function
(
err
,
thread
)
{
},
function
(
err
,
thread
)
{
if
(
err
)
{
if
(
err
)
{
console
.
error
(
err
);
console
.
error
(
err
);
...
...
strong
@strong
mentioned in commit
047114f2
·
Mar 04, 2016
mentioned in commit
047114f2
mentioned in commit 047114f2ef1d73b2d47751bbc82e51cda767fb2f
Toggle commit list
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment