Commit 15f59646 authored by zhaofei's avatar zhaofei

修改模板

parent ecfafee3
...@@ -39,6 +39,7 @@ ...@@ -39,6 +39,7 @@
a:if="{{dialogVisible}}" a:if="{{dialogVisible}}"
visible="{{dialogVisible}}" visible="{{dialogVisible}}"
isEdit="{{isEdit}}" isEdit="{{isEdit}}"
conditionKeys="{{conditionKeys}}"
prizeDialogData="{{prizeDialogData}}" prizeDialogData="{{prizeDialogData}}"
onClose="onCloseDialog" onClose="onCloseDialog"
type="probablity" type="probablity"
......
...@@ -10,6 +10,7 @@ Component({ ...@@ -10,6 +10,7 @@ Component({
list: [], list: [],
onChange: () => { }, onChange: () => { },
dataName: '', dataName: '',
conditionKeys: [],
imageLimit: [250, 250], imageLimit: [250, 250],
prizeDataType: null prizeDataType: null
}, },
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
a:if="{{dialogVisible}}" a:if="{{dialogVisible}}"
visible="{{dialogVisible}}" visible="{{dialogVisible}}"
isEdit="{{isEdit}}" isEdit="{{isEdit}}"
conditionKeys="{{conditionKeys}}"
prizeDialogData="{{prizeDialogData}}" prizeDialogData="{{prizeDialogData}}"
imageLimit="{{imageLimit}}" imageLimit="{{imageLimit}}"
onClose="onCloseDialog" onClose="onCloseDialog"
......
...@@ -9,6 +9,7 @@ Component({ ...@@ -9,6 +9,7 @@ Component({
limit: 20, limit: 20,
imageLimit: [250, 250], imageLimit: [250, 250],
fixedRank: [], fixedRank: [],
conditionKeys: [],
maxRankLimit: '', maxRankLimit: '',
list: [], list: [],
onChange: () => { }, onChange: () => { },
......
...@@ -417,14 +417,14 @@ export default class ActivityConfigService { ...@@ -417,14 +417,14 @@ export default class ActivityConfigService {
// level 根据level排序 // level 根据level排序
let prizeList = prizeConfig.sort((a, b) => a.level - b.level) let prizeList = prizeConfig.sort((a, b) => a.level - b.level)
const poolConfig = <%- JSON.stringify(activityConfigList) %> const poolConfig = <%- JSON.stringify(activityConfigList) %>
// 取出奖池
let prizeData = {} let prizeData = {}
poolConfig.forEach(item => { poolConfig.forEach(item => {
prizeData[item.key] = prizeList.filter(prize => { prizeData[item.key] = prizeList.filter(prize => {
return +item.prizeDataType == +prize.prizeDataType return +item.prizeDataType == +prize.prizeDataType
}) })
}); });
// 过滤奖池条件
poolConfig.forEach(item => { poolConfig.forEach(item => {
if (item.conditionKeys?.length) { if (item.conditionKeys?.length) {
item.conditionKeys.forEach(condition => { item.conditionKeys.forEach(condition => {
......
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