Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
taobao-mini-template
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
qinhaitao
taobao-mini-template
Commits
287f2c44
Commit
287f2c44
authored
Sep 24, 2020
by
qinhaitao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix:
🐛
返回错误
parent
7106ab22
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
prize-dialog.js
client/components/dialog/prize-dialog/prize-dialog.js
+1
-1
activityconfig.service.ts
server/duibats/src/service/activityconfig.service.ts
+2
-2
No files found.
client/components/dialog/prize-dialog/prize-dialog.js
View file @
287f2c44
...
@@ -8,7 +8,7 @@ import { passUrlList, urlCheck } from "../../../utils/helper";
...
@@ -8,7 +8,7 @@ import { passUrlList, urlCheck } from "../../../utils/helper";
const
EQUITY_TYPE
=
1
;
const
EQUITY_TYPE
=
1
;
const
CREDITS_TYPE
=
2
;
const
CREDITS_TYPE
=
2
;
const
OBJECT_TYPE
=
3
;
const
OBJECT_TYPE
=
3
;
const
THANKS_TYPE
=
4
;
const
THANKS_TYPE
=
5
;
const
STOCK_LIMIT
=
1
;
const
STOCK_LIMIT
=
1
;
const
STOCK_NO_LIMIT
=
2
;
const
STOCK_NO_LIMIT
=
2
;
...
...
server/duibats/src/service/activityconfig.service.ts
View file @
287f2c44
...
@@ -3,7 +3,7 @@
...
@@ -3,7 +3,7 @@
import
{
BaseDao
}
from
'../sdk'
import
{
BaseDao
}
from
'../sdk'
import
{
ACTIVITY_CONFIG_DB_NAME
,
PRIZE_CONFIG_DB_NAME
}
from
'../db'
import
{
ACTIVITY_CONFIG_DB_NAME
,
PRIZE_CONFIG_DB_NAME
}
from
'../db'
import
{
DELETE_STATUS
,
OPEN_PRIZE_STATUS
}
from
'../constants'
import
{
DELETE_STATUS
,
OPEN_PRIZE_STATUS
,
PRIZE_TYPE
}
from
'../constants'
import
{
signFigures
}
from
'../utils'
import
{
signFigures
}
from
'../utils'
export
default
class
ActivityConfigService
{
export
default
class
ActivityConfigService
{
...
@@ -292,7 +292,7 @@ export default class ActivityConfigService {
...
@@ -292,7 +292,7 @@ export default class ActivityConfigService {
deleteStatus
:
DELETE_STATUS
.
EXIST
deleteStatus
:
DELETE_STATUS
.
EXIST
}),
}),
prizeConfig
:
await
this
.
activityconfigPrizeDao
.
find
(
prizeConfig
:
await
this
.
activityconfigPrizeDao
.
find
(
{
activityId
,
deleteStatus
:
DELETE_STATUS
.
EXIST
},
{
activityId
,
deleteStatus
:
DELETE_STATUS
.
EXIST
,
type
:
{
$ne
:
PRIZE_TYPE
.
THANK
}
},
{
sort
:
{
level
:
1
}
}
{
sort
:
{
level
:
1
}
}
)
)
}
}
...
...
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