房间内角标入口 - 编辑修复财富等级限制生效范围问题

src/views/guildOperationManagement/guildAnchorManagement.vue

@@ -59,6 +59,11 @@
                 </template>
             </el-table-column>
             <el-table-column prop="adminName" align="center" label="操作人" />
+            <el-table-column prop="enable" align="center" label="操作时间" >
+                <template v-slot="scope">
+                    {{scope.row.enable  ? convertTimestamp(scope.row.createTime) : convertTimestamp(scope.row.updateTime)}}
+                </template>
+            </el-table-column>
         </el-table>
         <!-- 分页 -->
         <el-pagination style="margin-top: 10px" class="paginationClass" :current-page="formData.page"
@@ -181,6 +186,10 @@ export default {
             formData.pageNum = val;
             getData();
         };
+       const convertTimestamp =(time)=> {
+      let date = new Date(time);
+      return date.format("yyyy-MM-dd hh:mm:ss");
+    };
         return {
             formData,
             addFormData,
@@ -191,7 +200,8 @@ export default {
             handleCurrentChange,
             addFun,
             detailPageFun,
-            deleteId
+            deleteId,
+            convertTimestamp
 
         }
   }

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");