修改模板

client/components/prize/probability-prize-table/probability-prize-table.axml

@@ -38,7 +38,8 @@
 <prize-dialog
   a:if="{{dialogVisible}}"
   visible="{{dialogVisible}}"
-  isEdit="{{isEdit}}"  
+  isEdit="{{isEdit}}"
+  conditionKeys="{{conditionKeys}}"
   prizeDialogData="{{prizeDialogData}}"
   onClose="onCloseDialog"
   type="probablity"

client/components/prize/probability-prize-table/probability-prize-table.js

@@ -10,6 +10,7 @@ Component({
     list: [],
     onChange: () => { },
     dataName: '',
+    conditionKeys: [],
     imageLimit: [250, 250],
     prizeDataType: null
   },

client/components/rank/rank-table/rank-table.axml

@@ -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

@@ -9,6 +9,7 @@ Component({
     limit: 20,
     imageLimit: [250, 250],
     fixedRank: [],
+    conditionKeys: [],
     maxRankLimit: '',
     list: [],
     onChange: () => { },

server/duibats/src/service/activityconfig.service.ts

@@ -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 => {