房间内角标入口 - 配置增加财富等级限制生效范围

src/views/luckGift/luckGiftSet.vue

@@ -423,52 +423,38 @@
       </div>
 
       <div class="inquire">
-        <span>当天获得次数限制</span>
-        <el-input v-model="inquire.extraPoolConfig.dayCountLimit"
+        <span>单次投入金币门槛</span>
+        <el-input v-model="inquire.extraPoolConfig.inputThreshold"
                   class="input"
                   disabled></el-input>
       </div>
 
       <div class="inquire">
-        <span>当天进入判断点位（最后一位循环判断）</span>
-        <el-input v-model="inquire.extraPoolConfig.timesJudgeArray"
+        <span>用户充值等级</span>
+        <el-input v-model="inquire.extraPoolConfig.userRechargeLevels"
                   class="input"
                   disabled></el-input>
       </div>
 
       <div class="inquire">
-        <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>
+        <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>
       </div>
 
       <el-button class="primary"
@@ -621,12 +607,22 @@
                       class="input" />
           </el-col>
         </el-form-item>
-        <el-form-item label="当天获得次数限制">
-          <el-input v-model="inquire.extraPoolConfig.dayCountLimit"
+        <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"
                     class="input"></el-input>
         </el-form-item>
-        <el-form-item label="当天进入判断点位（最后一位循环判断）">
-          <el-input v-model="inquire.extraPoolConfig.timesJudgeArray"
+        <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"
                     class="input"></el-input>
         </el-form-item>
       </el-form>
@@ -700,9 +696,6 @@ export default {
       multiEditDialogTitle: "",
       detailsDialog: false,
       extraPoolDialog: false,
-      judgeConfigDialogVisible: false,
-      activeJudgeTab: '0',
-      tempJudgeConfig: {}, // 用于临时存储编辑的judgeConfig
       extraDialogButClick: true,
       value: "",
       type: null,
@@ -748,29 +741,9 @@ export default {
 
         this.inquire.extraStock = res.data.extraStock;
         this.inquire.extraPoolConfig = res.data.extraPoolConfig;
-        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)
-        
+        this.inquire.extraPoolConfig.userRechargeLevels = res.data.extraPoolConfig.userRechargeLevels.join(',');
       });
     },
-    // 获取第二层表格数据
-    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) {
       // 创建一个新对象以保持排序后的键值对
@@ -954,7 +927,7 @@ export default {
       obj.partitionId = this.inquire.value;
       obj.extraPoolConfig = this.inquire.extraPoolConfig;
       console.info(this.inquire.extraPoolConfig.userRechargeLevels)
-      obj.extraPoolConfig.timesJudgeArray = this.inquire.extraPoolConfig.timesJudgeArray.split(",");
+      obj.extraPoolConfig.userRechargeLevels = this.inquire.extraPoolConfig.userRechargeLevels.split(",");
       updateSet(obj).then((res) => {
         if (res.code == 200) {
           ElMessage({
@@ -1003,23 +976,4 @@ export default {
     margin-bottom: 20px;
   }
 }
-
-// 卡片样式适配表单项
-.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>
+</style>

src/views/resource/GamePlayView.vue

@@ -163,14 +163,6 @@
                        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>
@@ -593,8 +585,6 @@ export default {
       if (!value) {
         if (key == 'NOT_CHANNELS' || key == 'NOT_UIDS') {
           value = '-';
-        } else if (key == 'USER_LEVEL_LIMIT_ROLE') {
-          value = '全部用户';
         } else {
           value = '全部';
         }
@@ -604,9 +594,6 @@ 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 () {
@@ -702,7 +689,7 @@ 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.ruleValue['USER_LEVEL_LIMIT_ROLE'] = "1";
       this.resource.partitionId = row.partitionId;
       this.editDialog = true;
     },