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
d13937bc
Commit
d13937bc
authored
Aug 29, 2015
by
陈志良
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'Notice' into SANDBOX
parents
5b837d1e
f8dc1f5a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
6 deletions
+2
-6
forumInfo.js
app/controllers/mobile/forumInfo.js
+2
-2
forumNotice.js
app/controllers/mobile/forumNotice.js
+0
-1
forumShare.js
app/controllers/mobile/forumShare.js
+0
-3
No files found.
app/controllers/mobile/forumInfo.js
View file @
d13937bc
...
@@ -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
=
{
...
...
app/controllers/mobile/forumNotice.js
View file @
d13937bc
...
@@ -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
);
...
...
app/controllers/mobile/forumShare.js
View file @
d13937bc
...
@@ -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
{
//没找到板块默认分享设置
//没找到板块默认分享设置
...
...
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