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
15f59646
Commit
15f59646
authored
Nov 10, 2020
by
zhaofei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改模板
parent
ecfafee3
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
3 deletions
+7
-3
probability-prize-table.axml
...rize/probability-prize-table/probability-prize-table.axml
+2
-1
probability-prize-table.js
.../prize/probability-prize-table/probability-prize-table.js
+1
-0
rank-table.axml
client/components/rank/rank-table/rank-table.axml
+1
-0
rank-table.js
client/components/rank/rank-table/rank-table.js
+1
-0
activityconfig.service.ts
server/duibats/src/service/activityconfig.service.ts
+2
-2
No files found.
client/components/prize/probability-prize-table/probability-prize-table.axml
View file @
15f59646
...
...
@@ -39,6 +39,7 @@
a:if="{{dialogVisible}}"
visible="{{dialogVisible}}"
isEdit="{{isEdit}}"
conditionKeys="{{conditionKeys}}"
prizeDialogData="{{prizeDialogData}}"
onClose="onCloseDialog"
type="probablity"
...
...
client/components/prize/probability-prize-table/probability-prize-table.js
View file @
15f59646
...
...
@@ -10,6 +10,7 @@ Component({
list
:
[],
onChange
:
()
=>
{
},
dataName
:
''
,
conditionKeys
:
[],
imageLimit
:
[
250
,
250
],
prizeDataType
:
null
},
...
...
client/components/rank/rank-table/rank-table.axml
View file @
15f59646
...
...
@@ -37,6 +37,7 @@
a:if="{{dialogVisible}}"
visible="{{dialogVisible}}"
isEdit="{{isEdit}}"
conditionKeys="{{conditionKeys}}"
prizeDialogData="{{prizeDialogData}}"
imageLimit="{{imageLimit}}"
onClose="onCloseDialog"
...
...
client/components/rank/rank-table/rank-table.js
View file @
15f59646
...
...
@@ -9,6 +9,7 @@ Component({
limit
:
20
,
imageLimit
:
[
250
,
250
],
fixedRank
:
[],
conditionKeys
:
[],
maxRankLimit
:
''
,
list
:
[],
onChange
:
()
=>
{
},
...
...
server/duibats/src/service/activityconfig.service.ts
View file @
15f59646
...
...
@@ -417,14 +417,14 @@ export default class ActivityConfigService {
// level 根据level排序
let
prizeList
=
prizeConfig
.
sort
((
a
,
b
)
=>
a
.
level
-
b
.
level
)
const
poolConfig
=
<%-
JSON
.
stringify
(
activityConfigList
)
%>
// 取出奖池
let
prizeData
=
{}
poolConfig
.
forEach
(
item
=>
{
prizeData
[
item
.
key
]
=
prizeList
.
filter
(
prize
=>
{
return
+
item
.
prizeDataType
==
+
prize
.
prizeDataType
})
});
// 过滤奖池条件
poolConfig
.
forEach
(
item
=>
{
if
(
item
.
conditionKeys
?.
length
)
{
item
.
conditionKeys
.
forEach
(
condition
=>
{
...
...
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