修改游戏管理里分区展示问题，修改充值明细文字展示，子代充里修改和代充身份设置一样

2025-04-08 15:32:41 +08:00
parent 715845cd66
commit 9cd5f79a99
3 changed files with 129 additions and 167 deletions
--- a/src/views/recharge/RechargeSubUserView.vue
+++ b/src/views/recharge/RechargeSubUserView.vue
@@ -116,12 +116,18 @@
        <el-form-item label="信誉值">
          <el-rate v-model="obj.starLevel"/>
        </el-form-item>
-        <el-form-item label="列表展示">
+        <el-form-item label="展示在H5充值列表">
          <el-switch v-model="obj.hasCharge"
              active-text="是"
              inactive-text="否"
          />
        </el-form-item>
+        <el-form-item label="展示在代发薪资列表">
+          <el-switch v-model="obj.hasGuildCharge"
+              active-text="是"
+              inactive-text="否"
+          />
+        </el-form-item>
        <el-form-item label="地区">
          <el-checkbox v-for="item in obj.userRegions"
                       :key="item.type"
@@ -202,6 +208,7 @@ export default {
    edit(obj) {
      this.obj = Object.assign({}, obj);
      this.obj.hasCharge = obj.hasCharge === 1;
+      this.obj.hasGuildCharge = obj.hasGuildCharge === 1;
      this.obj.userRegions.forEach(item => {
        item.check = true;
      })
@@ -236,6 +243,7 @@ export default {
        type: this.obj.type,
        starLevel: this.obj.starLevel,
        hasCharge: this.obj.hasCharge? 1: 0,
+        hasGuildCharge:this.obj.hasGuildCharge? 1: 0,
        userRegions: JSON.stringify(this.obj.userRegions.filter(item=>item.check)),
      }
      save(data).then((res) => {
--- a/src/views/record/ChargeRecordView.vue
+++ b/src/views/record/ChargeRecordView.vue
@@ -19,37 +19,17 @@
            <form class="form-inline">
              <div class="form-group">
                <label for="qErbanNo">平台号：</label>
-                <input
-                  type="text"
-                  class="form-control"
-                  name="erbanNo"
-                  id="qErbanNo"
-                />
+                <input type="text" class="form-control" name="erbanNo" id="qErbanNo" />
              </div>
              <div class="form-group">
                <label for="qChannel">渠道:</label>
-                <input
-                  type="text"
-                  class="form-control"
-                  name="channel"
-                  id="qChannel"
-                />
+                <input type="text" class="form-control" name="channel" id="qChannel" />
              </div>
              <div class="form-group">
                <label for="qChannel">时间:</label>
-                <input
-                  type="text"
-                  class="form-control datetime"
-                  name="startTime"
-                  id="qStartTime"
-                />
+                <input type="text" class="form-control datetime" name="startTime" id="qStartTime" />
                <label for="qChannel">-</label>
-                <input
-                  type="text"
-                  class="form-control datetime"
-                  name="endTime"
-                  id="qEndTime"
-                />
+                <input type="text" class="form-control datetime" name="endTime" id="qEndTime" />
              </div>
              <div class="form-group">
                <label for="qStatus">状态:</label>
@@ -69,12 +49,7 @@
              </div>
              <div class="form-group">
                <label for="qChannel">app渠道</label>
-                <input
-                  type="text"
-                  class="form-control"
-                  name="appChannel"
-                  id="qAppChannel"
-                />
+                <input type="text" class="form-control" name="appChannel" id="qAppChannel" />
              </div>
            </form>
            <div id="mapObjHtml"></div>
@@ -222,14 +197,28 @@ export default {
                return keyA === "总充值{USD}"
                  ? -1
                  : keyB === "总充值{USD}"
-                  ? 1
-                  : 0;
+                    ? 1
+                    : 0;
              });
-              for (const key of sortedKeys) {
+              console.log(sortedKeys,'-------sortedKeys');
+            //   for (const key of sortedKeys) {
+            //     str += `
+            //   <span style="margin-right:10px;display: inline-block;font-size: 18px;color: #2049a9;" type="text">${key}: ${totalMap[key]}, </span>
+            // `;
+            //   }
+            // 处理第二项和最后一项
+            sortedKeys.forEach((key, index) => {
+                let value = totalMap[key];
+                if (index === 1) {
+                  key = `包括(${key}`;
+                }
+                if (index === sortedKeys.length - 1) {
+                  value = `${value})`;
+                }
                str += `
-              <span style="margin-right:10px;display: inline-block;font-size: 18px;color: #2049a9;" type="text">${key}: ${totalMap[key]}, </span>
-            `;
-              }
+                  <span style="margin-right:10px;display: inline-block;font-size: 18px;color: #2049a9;" type="text">${key}: ${value}</span>
+                `;
+              });
              $("#mapObjHtml").append(str);
            }
          },
--- a/src/views/room/GameAdmin.vue
+++ b/src/views/room/GameAdmin.vue
@@ -4,49 +4,23 @@
    <div class="inquire" style="display: inline-block; margin-right: 20px">
      <span class="demonstration">地区:</span>
      <el-select v-model="inquire.partitionFlag" placeholder="请选择">
-        <el-option
-          v-for="item in options"
-          :key="item.partitionFlag"
-          :label="item.label"
-          :value="item.partitionFlag"
-        >
+        <el-option v-for="item in options" :key="item.partitionFlag" :label="item.label" :value="item.partitionFlag">
        </el-option>
      </el-select>
    </div>

    <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
+    <el-button class="primary" type="primary" @click="getData()">查询</el-button>

    <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
+    <el-table v-loading="loading" :data="tableData" border style="width: 100%; margin-top: 25px">
      <el-table-column prop="mgId" align="center" label="游戏ID" />

      <el-table-column prop="name" align="center" label="游戏名称" />

      <el-table-column prop="partitionFlag" align="center" label="所属地区">
        <template v-slot="scope">{{
-          scope.row.partitionFlag == 1
-            ? "英语区"
-            : scope.row.partitionFlag == 2
-            ? "阿拉伯语区"
-            : scope.row.partitionFlag == 4
-            ? "华语区"
-            : scope.row.partitionFlag == 3
-            ? "英语区、阿拉伯语区"
-            : scope.row.partitionFlag == 5
-            ? "英语区、华语区"
-            : scope.row.partitionFlag == 6
-            ? "阿拉伯语区、华语区"
-            : scope.row.partitionFlag == 7 || scope.row.partitionFlag == 0
-            ? "英语区、阿拉伯语区、华语区"
-            : "无所属地区"
+          partitionFlagFun(scope.row.partitionFlag)
        }}</template>
      </el-table-column>

@@ -73,8 +47,8 @@
          scope.row.isAuthority == 0
            ? "否"
            : scope.row.isAuthority == 1
-            ? "是"
-            : "/"
+              ? "是"
+              : "/"
        }}</template>
      </el-table-column>

@@ -83,22 +57,16 @@
          scope.row.roleFlag == 1
            ? "房主"
            : scope.row.roleFlag == 2
-            ? "管理员"
-            : scope.row.roleFlag == 3
-            ? "房主、管理员"
-            : "/"
+              ? "管理员"
+              : scope.row.roleFlag == 3
+                ? "房主、管理员"
+                : "/"
        }}</template>
      </el-table-column>

      <el-table-column align="center" label="操作" width="300">
        <template v-slot="scope">
-          <el-button
-            @click="ediClick(scope)"
-            class="primary"
-            type="primary"
-            size="default"
-            >编辑</el-button
-          >
+          <el-button @click="ediClick(scope)" class="primary" type="primary" size="default">编辑</el-button>
        </template>
      </el-table-column>
    </el-table>
@@ -107,39 +75,17 @@
    <el-dialog v-model="editDialog" title="编辑" width="28%" center>
      <!-- 游戏ID -->
      <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >游戏ID</span
-        >
-        <el-input
-          v-model="ediObj.gameId"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px" class="col-sm-2 control-label">游戏ID</span>
+        <el-input v-model="ediObj.gameId" style="width: 75%" class="input" disabled></el-input>
      </div>
      <!-- 游戏昵称 -->
      <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >游戏昵称(中文)</span
-        >
-        <el-input
-          v-model="ediObj.gameNick"
-          style="width: 75%"
-          class="input"
-          disabled
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px" class="col-sm-2 control-label">游戏昵称(中文)</span>
+        <el-input v-model="ediObj.gameNick" style="width: 75%" class="input" disabled></el-input>
      </div>
      <!-- 所属地区 -->
      <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >所属地区</span
-        >
+        <span style="display: inline-block; margin-right: 20px" class="col-sm-2 control-label">所属地区</span>
        <el-checkbox-group v-model="ediObj.checkList">
          <el-checkbox label="华语区"></el-checkbox>
          <el-checkbox label="英语区"></el-checkbox>
@@ -150,45 +96,23 @@
      </div>
      <!-- 是否展示 -->
      <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >是否展示</span
-        >
+        <span style="display: inline-block; margin-right: 20px" class="col-sm-2 control-label">是否展示</span>
        <el-select v-model="ediObj.value1" placeholder="请选择">
-          <el-option
-            v-for="item in ediObj.options"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+          <el-option v-for="item in ediObj.options" :key="item.value" :label="item.label" :value="item.value">
          </el-option>
        </el-select>
      </div>
      <!-- 是否限制 -->
      <div v-show="ediObj.value1" style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >是否限制</span
-        >
+        <span style="display: inline-block; margin-right: 20px" class="col-sm-2 control-label">是否限制</span>
        <el-select v-model="ediObj.value2" placeholder="请选择">
-          <el-option
-            v-for="item in ediObj.options2"
-            :key="item.value"
-            :label="item.label"
-            :value="item.value"
-          >
+          <el-option v-for="item in ediObj.options2" :key="item.value" :label="item.label" :value="item.value">
          </el-option>
        </el-select>
      </div>
      <!-- 可开启角色 -->
      <div v-show="ediObj.value1" style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >可开启角色</span
-        >
+        <span style="display: inline-block; margin-right: 20px" class="col-sm-2 control-label">可开启角色</span>
        <el-checkbox-group v-model="ediObj.checkList2">
          <el-checkbox label="房主"></el-checkbox>
          <el-checkbox label="管理员"></el-checkbox>
@@ -205,17 +129,10 @@
    </el-dialog>

    <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px; display: none"
-      class="paginationClass"
-      v-model:current-page="currentPage"
-      v-model:page-size="pageSize"
-      :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
-      layout="sizes, prev, pager, next"
-      :total="total"
-      @size-change="handleSizeChange"
-      @current-change="handleCurrentChange"
-    />
+    <el-pagination style="margin-top: 10px; display: none" class="paginationClass" v-model:current-page="currentPage"
+      v-model:page-size="pageSize" :page-sizes="[10, 20, 30, 40, 50, 100, 200, 300, 400, 500, 999999999]"
+      layout="sizes, prev, pager, next" :total="total" @size-change="handleSizeChange"
+      @current-change="handleCurrentChange" />
  </div>
 </template>
 <script>
@@ -343,34 +260,35 @@ export default {
      this.ediObj.gameId = obj.mgIdStr;
      this.ediObj.gameNick = JSON.parse(obj.name).zh;
      this.ediObj.partitionFlag = obj.partitionFlag;
-      this.ediObj.checkList =
-        obj.partitionFlag == 1
-          ? ["英语区"]
-          : obj.partitionFlag == 2
-          ? ["阿拉伯语区"]
-          : obj.partitionFlag == 4
-          ? ["华语区"]
-          : obj.partitionFlag == 3
-          ? ["英语区", "阿拉伯语区"]
-          : obj.partitionFlag == 5
-          ? ["英语区", "华语区"]
-          : obj.partitionFlag == 6
-          ? ["阿拉伯语区", "华语区"]
-          : scope.row.partitionFlag == 7 ||
-            scope.row.partitionFlag == 0 ||
-            scope.row.partitionFlag == ""
-          ? ["英语区", "阿拉伯语区", "华语区"]
-          : [];
+      // this.ediObj.checkList =
+      //   obj.partitionFlag == 1
+      //     ? ["英语区"]
+      //     : obj.partitionFlag == 2
+      //       ? ["阿拉伯语区"]
+      //       : obj.partitionFlag == 4
+      //         ? ["华语区"]
+      //         : obj.partitionFlag == 3
+      //           ? ["英语区", "阿拉伯语区"]
+      //           : obj.partitionFlag == 5
+      //             ? ["英语区", "华语区"]
+      //             : obj.partitionFlag == 6
+      //               ? ["阿拉伯语区", "华语区"]
+      //               : scope.row.partitionFlag == 7 ||
+      //                 scope.row.partitionFlag == 0 ||
+      //                 scope.row.partitionFlag == ""
+      //                 ? ["英语区", "阿拉伯语区", "华语区"]
+      //                 : [];
+      this.ediObj.checkList = this.partitionFlagCheckFun(this.ediObj.partitionFlag)
      this.ediObj.value1 = obj.isShow == false ? 0 : 1;
      this.ediObj.value2 = obj.isAuthority;
      this.ediObj.checkList2 =
        obj.roleFlag == 1
          ? ["房主"]
          : obj.roleFlag == 2
-          ? ["管理员"]
-          : obj.roleFlag == 3
-          ? ["房主", "管理员"]
-          : [];
+            ? ["管理员"]
+            : obj.roleFlag == 3
+              ? ["房主", "管理员"]
+              : [];
      console.log(obj);
    },
    // 确认编辑按钮
@@ -412,6 +330,8 @@ export default {
          华语区: 4,
          英语区: 1,
          阿拉伯语区: 2,
+          土耳其区: 8,
+          英语2区: 16
        };
        this.ediObj.checkList.forEach((res, i) => {
          num += district[res];
@@ -427,6 +347,46 @@ export default {
      }
      return num;
    },
+    // 展示所属地区
+    partitionFlagFun(val) {
+      let value = '';
+      if ((val & 1) != 0) {
+        value += '英语区  ';
+      }
+      if ((val & 2) != 0) {
+        value += '阿拉伯语区  ';
+      }
+      if ((val & 4) != 0) {
+        value += '华语区  ';
+      }
+      if ((val & 8) != 0) {
+        value += '土耳其区  ';
+      }
+      if ((val & 16) != 0) {
+        value += '英语2区  ';
+      }
+      return value;
+    },
+    // 编辑回显分区
+    partitionFlagCheckFun(val){
+      let arr = [];
+      if ((val & 1) != 0) {
+        arr.push('英语区');
+      }
+      if ((val & 2) != 0) {
+        arr.push('阿拉伯语区');
+      }
+      if ((val & 4) != 0) {
+        arr.push('华语区');
+      }
+      if ((val & 8) != 0) {
+        arr.push('土耳其区');
+      }
+      if ((val & 16) != 0) {
+        arr.push('英语2区');
+      }
+      return arr;
+    },
    // 分页导航
    handleSizeChange() {
      this.getData();
@@ -441,21 +401,26 @@ export default {
 .box {
  padding-top: 20px;
  background: #ecf0f5;
+
  .inquire {
    display: inline-block;
    margin-right: 20px;
+
    span {
      margin-right: 10px;
    }
+
    .input {
      width: 180px;
      margin-right: 10px;
    }
  }
+
  .dialogTableVisibleBut {
    display: block;
    margin: 30px 0 0 830px;
  }
+
  .paginationClass {
    margin: 15px 0 5px 0px;
  }