幸运24-后台-额外数组配置-根据三天内投产比较

src/views/luckGift/luckGiftSet.vue

@@ -423,38 +423,52 @@
       </div>
 
       <div class="inquire">
-        <span>单次投入金币门槛</span>
-        <el-input v-model="inquire.extraPoolConfig.inputThreshold"
+        <span>当天获得次数限制</span>
+        <el-input v-model="inquire.extraPoolConfig.dayCountLimit"
                   class="input"
                   disabled></el-input>
       </div>
 
       <div class="inquire">
-        <span>用户充值等级</span>
-        <el-input v-model="inquire.extraPoolConfig.userRechargeLevels"
+        <span>当天进入判断点位（最后一位循环判断）</span>
+        <el-input v-model="inquire.extraPoolConfig.timesJudgeArray"
                   class="input"
                   disabled></el-input>
       </div>
 
       <div class="inquire">
-        <span>当天退出率</span>
-        <el-input v-model="inquire.extraPoolConfig.todayProductionRatio"
-                  class="input"
-                  disabled></el-input>
-      </div>
-
-      <div class="inquire">
-        <span>当天差额</span>
-        <el-input v-model="inquire.extraPoolConfig.todayDiff"
-                  class="input"
-                  disabled></el-input>
-      </div>
-
-      <div class="inquire">
-        <span>近两天获得次数限制</span>
-        <el-input v-model="inquire.extraPoolConfig.twoDayCountLimit"
-                  class="input"
-                  disabled></el-input>
+        <span>配置</span>
+        <!-- 使用卡片展示judgeConfig -->
+        <el-card v-for="(level2Obj, level1Key) in inquire.extraPoolConfig.judgeConfig" 
+                 :key="level1Key" 
+                 class="judge-config-card">
+          <template #header>
+            <span>当天内平均进入大于等于 {{ level1Key }}</span>
+          </template>
+          <el-table :data="getLevel2TableData(level2Obj)" style="width: 100%" border stripe>
+            <el-table-column prop="level2Key" label="三天内总进入/三天内投产比" />
+            <el-table-column label="1000">
+              <template #default="scope">
+                {{ getKeyByValue(scope.row.level3Obj, 1000) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="500">
+              <template #default="scope">
+                {{ getKeyByValue(scope.row.level3Obj, 500) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="250">
+              <template #default="scope">
+                {{ getKeyByValue(scope.row.level3Obj, 250) }}
+              </template>
+            </el-table-column>
+            <el-table-column label="100">
+              <template #default="scope">
+                {{ getKeyByValue(scope.row.level3Obj, 100) }}
+              </template>
+            </el-table-column>
+          </el-table>
+        </el-card>
       </div>
 
       <el-button class="primary"
@@ -607,22 +621,12 @@
                       class="input" />
           </el-col>
         </el-form-item>
-        <el-form-item label="单次投入金币门槛">
-          <el-input v-model="inquire.extraPoolConfig.inputThreshold" />
-        </el-form-item>
-        <el-form-item label="用户充值等级">
-          <el-input v-model="inquire.extraPoolConfig.userRechargeLevels" />
-        </el-form-item>
-        <el-form-item label="当天退出率">
-          <el-input v-model="inquire.extraPoolConfig.todayProductionRatio"
+        <el-form-item label="当天获得次数限制">
+          <el-input v-model="inquire.extraPoolConfig.dayCountLimit"
                     class="input"></el-input>
         </el-form-item>
-        <el-form-item label="当天差额">
-          <el-input v-model="inquire.extraPoolConfig.todayDiff"
-                    class="input"></el-input>
-        </el-form-item>
-        <el-form-item label="近两天获得次数限制">
-          <el-input v-model="inquire.extraPoolConfig.twoDayCountLimit"
+        <el-form-item label="当天进入判断点位（最后一位循环判断）">
+          <el-input v-model="inquire.extraPoolConfig.timesJudgeArray"
                     class="input"></el-input>
         </el-form-item>
       </el-form>
@@ -696,6 +700,9 @@ export default {
       multiEditDialogTitle: "",
       detailsDialog: false,
       extraPoolDialog: false,
+      judgeConfigDialogVisible: false,
+      activeJudgeTab: '0',
+      tempJudgeConfig: {}, // 用于临时存储编辑的judgeConfig
       extraDialogButClick: true,
       value: "",
       type: null,
@@ -741,9 +748,29 @@ export default {
 
         this.inquire.extraStock = res.data.extraStock;
         this.inquire.extraPoolConfig = res.data.extraPoolConfig;
-        this.inquire.extraPoolConfig.userRechargeLevels = res.data.extraPoolConfig.userRechargeLevels.join(',');
+        this.inquire.extraPoolConfig.timesJudgeArray = res.data.extraPoolConfig.timesJudgeArray.join(',');
+        this.inquire.extraPoolConfig.judgeConfigTree = this.convertToTree(res.data.extraPoolConfig.judgeConfig)
+        console.info(this.inquire.extraPoolConfig.judgeConfigTree)
+        
       });
     },
+    // 获取第二层表格数据
+    getLevel2TableData(level2Obj) {
+      return Object.keys(level2Obj).map(level2Key => ({
+        level2Key,
+        level3Obj: level2Obj[level2Key]
+      }));
+    },
+    
+    // 根据值获取键
+    getKeyByValue(obj, value) {
+      for (const key in obj) {
+        if (obj[key] === value) {
+          return key;
+        }
+      }
+      return ''; // 如果没有找到对应的值，返回空字符串
+    },
     // 排序
     sortK12 (kObj) {
       // 创建一个新对象以保持排序后的键值对
@@ -927,7 +954,7 @@ export default {
       obj.partitionId = this.inquire.value;
       obj.extraPoolConfig = this.inquire.extraPoolConfig;
       console.info(this.inquire.extraPoolConfig.userRechargeLevels)
-      obj.extraPoolConfig.userRechargeLevels = this.inquire.extraPoolConfig.userRechargeLevels.split(",");
+      obj.extraPoolConfig.timesJudgeArray = this.inquire.extraPoolConfig.timesJudgeArray.split(",");
       updateSet(obj).then((res) => {
         if (res.code == 200) {
           ElMessage({
@@ -976,4 +1003,23 @@ export default {
     margin-bottom: 20px;
   }
 }
-</style>
+
+// 卡片样式适配表单项
+.judge-config-card {
+  border: 1px solid #dcdfe6;
+  border-radius: 4px;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+  margin-bottom: 10px;
+  background-color: #fff;
+}
+.el-card__header {
+    padding: 10px 15px;
+    border-bottom: 1px solid #dcdfe6;
+    font-size: 14px;
+    color: #303133;
+    line-height: 1.5;
+}
+.el-card__body {
+    padding: 15px;
+}
+</style>

src/views/record/OfficicalGoldView.vue

@@ -339,6 +339,8 @@ export default {
                 isGiveBol = false;
               }
             });
+          }else{
+            isGiveBol = false;
           }
         }
 

src/views/resource/GamePlayView.vue

@@ -163,6 +163,14 @@
                        label="可见用户"
                        :formatter="ruleJsonFormatter" />
                        <el-table-column align="center"
+                       prop="USER_LEVEL"
+                       label="用户等级"
+                       :formatter="ruleJsonFormatter" />
+                       <el-table-column align="center"
+                       prop="USER_LEVEL_LIMIT_ROLE"
+                       label="财富等级限制生效范围"
+                       :formatter="ruleJsonFormatter" />
+                       <el-table-column align="center"
                        prop="panelType"
                        label="游戏第三方" >
                        <template v-slot="scope">{{ scope.row.code=='BAISHUN'?'百顺':scope.row.code=='LEADERCC'?'灵仙':'Joy'}}</template>
@@ -393,7 +401,7 @@
                   style="width: 75%"
                   class="input"
                   :placeholder="rule.description"
-                  v-if="rule.ruleKind != 'IN' && rule.ruleKind != 'LEFT_LIKE' && ((rule.ruleCode == 'NOT_CHANNELS' || rule.ruleCode == 'PLATFORM' || rule.ruleCode == 'USER_LEVEL') || (!resource.ruleValue['PLATFORM'] || resource.ruleValue['PLATFORM'] == '' || resource.ruleValue['PLATFORM'] == 'null' || (rule.ruleCode == 'IOS_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'IOS_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'ANDROID_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'android') || (rule.ruleCode == 'ANDROID_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'android')))"></el-input>
+                  v-if="rule.ruleKind != 'EQ' && rule.ruleKind != 'IN' && rule.ruleKind != 'LEFT_LIKE' && ((rule.ruleCode == 'NOT_CHANNELS' || rule.ruleCode == 'PLATFORM' || rule.ruleCode == 'USER_LEVEL') || (!resource.ruleValue['PLATFORM'] || resource.ruleValue['PLATFORM'] == '' || resource.ruleValue['PLATFORM'] == 'null' || (rule.ruleCode == 'IOS_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'IOS_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'ios') || (rule.ruleCode == 'ANDROID_LOW_VERSION' && resource.ruleValue['PLATFORM'] == 'android') || (rule.ruleCode == 'ANDROID_HIGH_VERSION' && resource.ruleValue['PLATFORM'] == 'android')))"></el-input>
         <el-select v-model="resource.ruleValue[rule.ruleCode]"
                    style="width: 75%"
                    placeholder="请选择"
@@ -414,6 +422,15 @@
                      :label="value"
                      :value="value"></el-option>
         </el-select>
+        <el-select v-model="resource.ruleValue[rule.ruleCode]"
+                   style="width: 75%"
+                   placeholder="请选择"
+                   v-if="rule.ruleKind == 'EQ'">
+          <el-option v-for="value in rule.ruleValue.split(',')"
+                     :key="value"
+                     :label="value == 1?'全部用户' : '非公会成员'"
+                     :value="value"></el-option>
+        </el-select>
       </div>
       <template #footer>
         <span class="dialog-footer">
@@ -497,7 +514,9 @@ export default {
         startTime: null,
         endTime: null,
         seqNo: 0,
-        ruleValue: {},
+        ruleValue: {
+          USER_LEVEL_LIMIT_ROLE:"1"
+        },
         partitionId: null,
         seriesNameZh: '',
         seriesNameEn: '',
@@ -574,6 +593,8 @@ export default {
       if (!value) {
         if (key == 'NOT_CHANNELS' || key == 'NOT_UIDS') {
           value = '-';
+        } else if (key == 'USER_LEVEL_LIMIT_ROLE') {
+          value = '全部用户';
         } else {
           value = '全部';
         }
@@ -583,6 +604,9 @@ export default {
       } else if (key == 'ANDROID') {
         value = ruleObj['ANDROID_LOW_VERSION'] + '~' + ruleObj['ANDROID_HIGH_VERSION'];
       }
+      if (key == 'USER_LEVEL_LIMIT_ROLE') {
+          value = ruleObj['USER_LEVEL_LIMIT_ROLE']?ruleObj['USER_LEVEL_LIMIT_ROLE'] == 1?'全部用户':'非公会成员':'全部用户';
+        } 
       return value;
     },
     getData () {
@@ -642,6 +666,7 @@ export default {
         let rule = this.rules[i];
         this.resource.ruleValue[rule.ruleCode] = '';
       }
+      this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] = "1";
       this.partitionId = null;
       this.editDialog = true;
     },
@@ -677,10 +702,12 @@ export default {
         }
         this.resource.ruleValue[ruleCode] = rule;
       }
+      this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] = this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'] ?this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE']:"1";
       this.resource.partitionId = row.partitionId;
       this.editDialog = true;
     },
     editDialogClick () {
+      console.log(this.resource.ruleValue['USER_LEVEL_LIMIT_ROLE'],'editDialogClick');
       let startTime = this.resource.startTime;
       if (startTime) {
         this.resource.startTime = new Date(startTime).format("yyyy-MM-dd hh:mm:ss");