From 359a34c9555f210136fcb00621e63c8253c114dc Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Tue, 3 Jun 2025 16:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E4=BF=A1=E6=81=AF-=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=AC=E4=BC=9A=E9=95=BF=E5=9C=B0=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../guildOperationManagement/guildInfo.vue    | 708 +++++++++---------
 .../guildInfoCustomerService.vue              | 597 ++++++++-------
 2 files changed, 632 insertions(+), 673 deletions(-)

diff --git a/src/views/guildOperationManagement/guildInfo.vue b/src/views/guildOperationManagement/guildInfo.vue
index da507db..774f455 100644
--- a/src/views/guildOperationManagement/guildInfo.vue
+++ b/src/views/guildOperationManagement/guildInfo.vue
@@ -3,27 +3,30 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>公会ID</span>
-      <el-input
-          v-model="inquire.familyId"
-          class="input"
-          type="number"
-      ></el-input>
+      <el-input v-model="inquire.familyId"
+                class="input"
+                type="number"></el-input>
     </div>
     <div class="inquire">
       <span>会长ID</span>
-      <el-input
-        v-model="inquire.userId"
-        placeholder=""
-        class="input"
-      ></el-input>
+      <el-input v-model="inquire.userId"
+                placeholder=""
+                class="input"></el-input>
     </div>
     <div class="inquire">
       <div class="block">
         <span class="demonstration">分区</span>
         <partition-select v-model:partition-id="inquire.partitionId"
-                          v-model:partition-infos="inquire.partitionArr"
-                          v-model:after-init="getData"
-        />
+                          v-model:partition-infos="inquire.partitionArr" />
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">地区</span>
+        <partition-region-select v-model:partition-id="inquire.partitionId"
+                                 v-model:region-id="inquire.regionId"
+                                 v-model:region-infos="inquire.regionArr"
+                                 v-model:after-init="getData" />
       </div>
     </div>
     <!-- <div class="inquire">
@@ -49,107 +52,114 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
-    <el-button class="primary" type="primary" @click="addDialog = true"
-      >添加</el-button
-    >
-    <el-button class="primary" type="primary" @click="exportInfoFun()"
-      >导出</el-button
-    >
+    <el-button class="primary"
+               type="primary"
+               @click="getData()">查询</el-button>
+    <el-button class="primary"
+               type="primary"
+               @click="addDialog = true">添加</el-button>
+    <el-button class="primary"
+               type="primary"
+               @click="exportInfoFun()">导出</el-button>
 
     <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <el-table-column prop="id" align="center" label="公会ID" />
+    <el-table v-loading="loading"
+              :data="tableData"
+              border
+              style="width: 100%; margin-top: 25px">
+      <el-table-column prop="id"
+                       align="center"
+                       label="公会ID" />
       <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
-      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
-      <el-table-column
-        prop="ownerPartitionName"
-        align="center"
-        label="会长分区"
-      />
-      <el-table-column prop="name" align="center" label="公会昵称" />
-      <el-table-column align="center" prop="giftInfo" label="公会头像">
+      <el-table-column prop="ownerErbanNo"
+                       align="center"
+                       label="会长ID" />
+      <el-table-column prop="ownerNick"
+                       align="center"
+                       label="会长昵称" />
+      <el-table-column prop="ownerPartitionName"
+                       align="center"
+                       label="会长分区" />
+      <el-table-column prop="ownerRegionName"
+                       align="center"
+                       label="会长地区" />
+      <el-table-column prop="name"
+                       align="center"
+                       label="公会昵称" />
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会头像">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.avatar"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.avatar]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.avatar"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.avatar]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会背景图">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.backgroundUrl"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.backgroundUrl]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.backgroundUrl"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.backgroundUrl]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" align="center" label="创建日期" />
+      <el-table-column prop="createTime"
+                       align="center"
+                       label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center" label="成员数量/上限">
+      <el-table-column align="center"
+                       label="成员数量/上限">
         <template v-slot="scope">
-          <el-button
-            @click="memberDialogFun(scope.row)"
-            type="text"
-            size="default"
-            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
-          >
+          <el-button @click="memberDialogFun(scope.row)"
+                     type="text"
+                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="adminName" align="center" label="操作人" />
-      <el-table-column
-          prop="guildContactType"
-          align="center"
-          label="联系方式类型"
-      />
-      <el-table-column
-        prop="guildContact"
-        align="center"
-        label="公会联系方式"
-      />
-      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+      <el-table-column prop="adminName"
+                       align="center"
+                       label="操作人" />
+      <el-table-column prop="guildContactType"
+                       align="center"
+                       label="联系方式类型" />
+      <el-table-column prop="guildContact"
+                       align="center"
+                       label="公会联系方式" />
+      <el-table-column align="center"
+                       prop="idCard"
+                       label="公会长身份证件">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.idCard"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.idCard]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.idCard"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.idCard]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
-      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
-      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+      <el-table-column prop="inviteErbanNo"
+                       align="center"
+                       label="邀请人ID" />
+      <el-table-column prop="inviteCheck"
+                       align="center"
+                       label="邀请人证明">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.inviteCheck"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.inviteCheck]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.inviteCheck"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.inviteCheck]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" label="收款账户" width="300">
@@ -190,80 +200,61 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column align="center"
+                       label="操作"
+                       width="300">
         <template v-slot="scope">
-          <el-button
-            @click="ediClick(scope)"
-            class="primary"
-            type="primary"
-            size="default"
-            :disabled="!scope.row.enable"
-            >编辑</el-button
-          >
-          <el-button
-            @click="
+          <el-button @click="ediClick(scope)"
+                     class="primary"
+                     type="primary"
+                     size="default"
+                     :disabled="!scope.row.enable">编辑</el-button>
+          <el-button @click="
               delDialog = true;
               delDialogData = scope.row;
             "
-            :class="scope.row.enable ? 'danger' : 'info'"
-            :type="scope.row.enable ? 'danger' : 'info'"
-            size="default"
-            :disabled="!scope.row.enable"
-            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
-          >
+                     :class="scope.row.enable ? 'danger' : 'info'"
+                     :type="scope.row.enable ? 'danger' : 'info'"
+                     size="default"
+                     :disabled="!scope.row.enable">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog" title="新增" width="28%" center>
+    <el-dialog v-model="addDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >会长ID</span
-        >
-        <el-input
-          v-model="resource.id"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">会长ID</span>
+        <el-input v-model="resource.id"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <div style="margin-bottom: 25px">
-        <span
-            style="display: inline-block; margin-right: 20px; width: 100px"
-            class="col-sm-2 control-label"
-        >联系方式类型</span
-        >
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">联系方式类型</span>
         <el-select v-model="resource.guildContactType"
-                      style="width: 75%"
-                      class="input">
+                   style="width: 75%"
+                   class="input">
           <el-option value="whatsapp">whatsapp</el-option>
           <el-option value="facebook">facebook</el-option>
         </el-select>
       </div>
       <div style="margin-bottom: 25px">
-        <span
-            style="display: inline-block; margin-right: 20px; width: 100px"
-            class="col-sm-2 control-label"
-        >联系方式</span
-        >
-        <el-input
-            v-model="resource.guildContact"
-            style="width: 75%"
-            class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">联系方式</span>
+        <el-input v-model="resource.guildContact"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >邀请人ID</span
-        >
-        <el-input
-          v-model="resource.inviteErbanNo"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">邀请人ID</span>
+        <el-input v-model="resource.inviteErbanNo"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -292,257 +283,218 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary" @click="add()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px"
-      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"
+                   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-dialog v-model="editDialog" title="编辑" width="28%" center>
+    <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.id"
-          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.id"
+                  style="width: 75%"
+                  class="input"
+                  disabled></el-input>
       </div>
       <!-- 会长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.leaderId"
-          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.leaderId"
+                  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.leaderNick"
-          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.leaderNick"
+                  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.guildNick"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会昵称</span>
+        <el-input v-model="ediObj.guildNick"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- 公会头像 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会头像</span>
+        <span class="left"
+              style="margin-right: 20px">公会头像</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
-          class="avatar-uploader"
-          action="/admin/tencent/cos/upload/file"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess2"
-          :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
-        >
-          <img v-if="ediObj.imageUrl2" :src="ediObj.imageUrl2" class="avatar" />
-          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        <el-upload class="avatar-uploader"
+                   action="/admin/tencent/cos/upload/file"
+                   :show-file-list="false"
+                   :on-success="handleAvatarSuccess2"
+                   :before-upload="beforeAvatarUpload"
+                   :on-error="handleAvatarError">
+          <img v-if="ediObj.imageUrl2"
+               :src="ediObj.imageUrl2"
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
+            <Plus />
+          </el-icon>
         </el-upload>
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会背景图</span>
+        <span class="left"
+              style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
-          class="avatar-uploader"
-          action="/admin/tencent/cos/upload/file"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess"
-          :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
-        >
-          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
-          <el-icon v-else class="avatar-uploader-icon">
+        <el-upload class="avatar-uploader"
+                   action="/admin/tencent/cos/upload/file"
+                   :show-file-list="false"
+                   :on-success="handleAvatarSuccess"
+                   :before-upload="beforeAvatarUpload"
+                   :on-error="handleAvatarError">
+          <img v-if="ediObj.imageUrl1"
+               :src="ediObj.imageUrl1"
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
             <Plus />
           </el-icon>
         </el-upload>
       </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.guildNumber"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">成员数量上限</span>
+        <el-input v-model="ediObj.guildNumber"
+                  style="width: 75%"
+                  class="input"></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-select v-model="ediObj.guildContactType">
           <el-option value="whatsapp">whatsapp</el-option>
           <el-option value="facebook">facebook</el-option>
         </el-select>
       </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.guildContact"
-            style="width: 75%"
-            class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会联系方式</span>
+        <el-input v-model="ediObj.guildContact"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- 邀请人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.inviteErbanNo"
-          style="width: 75%"
-          class="input"
-          :disabled="!ediObj.enableEditInvite"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">邀请人ID</span>
+        <el-input v-model="ediObj.inviteErbanNo"
+                  style="width: 75%"
+                  class="input"
+                  :disabled="!ediObj.enableEditInvite"></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()">
+          <el-button type="primary"
+                     @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+    <el-dialog v-model="delDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog
-      v-model="payAccountDialog"
-      :title="payAccountTitle"
-      width="28%"
-      center
-    >
+    <el-dialog v-model="payAccountDialog"
+               :title="payAccountTitle"
+               width="28%"
+               center>
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >Payoneer</span
-        >
-        <el-input
-          v-model="payAccount.payoneer"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">Payoneer</span>
+        <el-input v-model="payAccount.payoneer"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- USDT-ERC20 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >USDT-ERC20</span
-        >
-        <el-input
-          v-model="payAccount.usdt"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">USDT-ERC20</span>
+        <el-input v-model="payAccount.usdt"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- PayPal -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >PayPal</span
-        >
-        <el-input
-          v-model="payAccount.payPal"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">PayPal</span>
+        <el-input v-model="payAccount.payPal"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="payAccountDialog = false">取消</el-button>
-          <el-button type="primary" @click="payAccountClick()">
+          <el-button type="primary"
+                     @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
+    <el-dialog v-model="memberDialog"
+               :title="memberTitle"
+               width="36%"
+               center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input
-          v-model="member.userID"
-          placeholder="请输入新增平台id"
-          class="input"
-        ></el-input>
-        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
+        <el-input v-model="member.userID"
+                  placeholder="请输入新增平台id"
+                  class="input"></el-input>
+        <el-button type="primary"
+                   @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table
-        v-loading="loading"
-        :data="member.tableData"
-        border
-        style="width: 100%; margin-top: 25px"
-      >
-        <el-table-column align="center" label="用户平台ID">
+      <el-table v-loading="loading"
+                :data="member.tableData"
+                border
+                style="width: 100%; margin-top: 25px">
+        <el-table-column align="center"
+                         label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -555,54 +507,61 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick" align="center" label="用户昵称" />
-        <el-table-column prop="createTime" align="center" label="加入时间" />
-        <el-table-column prop="adminName" align="center" label="操作人" />
-        <el-table-column align="center" label="操作" width="300">
+        <el-table-column prop="nick"
+                         align="center"
+                         label="用户昵称" />
+        <el-table-column prop="createTime"
+                         align="center"
+                         label="加入时间" />
+        <el-table-column prop="adminName"
+                         align="center"
+                         label="操作人" />
+        <el-table-column align="center"
+                         label="操作"
+                         width="300">
           <template v-slot="scope">
-            <el-button
-              @click="setMemberFun(scope.row)"
-              :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
-              :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
-              size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
-              >{{
+            <el-button @click="setMemberFun(scope.row)"
+                       :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
+                       :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
+                       size="default"
+                       :disabled="scope.row.roleType == 1 ? true : false">{{
                 scope.row.roleType == 1
                   ? "会长"
                   : scope.row.roleType == 2
                   ? "取消管理员"
                   : "设为管理员"
-              }}</el-button
-            >
-            <el-button
-              @click="
+              }}</el-button>
+            <el-button @click="
                 memberRemoveObj = scope.row;
                 memberRemoveDialog = true;
               "
-              class="danger"
-              type="danger"
-              size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
-              >删除</el-button
-            >
+                       class="danger"
+                       type="danger"
+                       size="default"
+                       :disabled="scope.row.roleType == 1 ? true : false">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="memberDialog = false">
+          <el-button type="primary"
+                     @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
+    <el-dialog v-model="memberRemoveDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary" @click="delmemberRemoveClick()">
+          <el-button type="primary"
+                     @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -627,12 +586,13 @@ import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 import PartitionSelect from "@/views/common/partitionSelect.vue";
-import {savePayAccount} from "@/api/nobleman/nobleman";
+import PartitionRegionSelect from "@/views/common/partitionRegionSelect.vue";
+import { savePayAccount } from "@/api/nobleman/nobleman";
 // import { fa } from "element-plus/es/locale";
 export default {
   name: "GuildInfoNew",
-  components: {PartitionSelect},
-  data() {
+  components: { PartitionSelect, PartitionRegionSelect },
+  data () {
     return {
       loading: false,
       delDialog: false,
@@ -645,6 +605,8 @@ export default {
         time: "",
         partitionId: undefined,
         partitionArr: [],
+        regionId: undefined,
+        regionArr: [],
       },
       //新增所需对象
       resource: {
@@ -652,8 +614,8 @@ export default {
         nick: "",
         referrer: "",
         guildContactType: "whatsapp",
-        guildContact:'',
-        inviteErbanNo:''
+        guildContact: '',
+        inviteErbanNo: ''
       },
       // 表格
       tableData: [],
@@ -673,8 +635,8 @@ export default {
         id: "",
         imageUrl1: "",
         imageUrl2: "",
-        enableEditInvite:false,
-        inviteErbanNo:''
+        enableEditInvite: false,
+        inviteErbanNo: ''
       },
       // 收款账户弹窗
       payAccountDialog: false,
@@ -700,7 +662,7 @@ export default {
   },
   methods: {
     // 查询接口
-    getData() {
+    getData () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -715,6 +677,7 @@ export default {
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
         partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
         pageNum: this.currentPage,
@@ -726,7 +689,7 @@ export default {
       });
     },
     // 打开成员信息弹窗
-    memberDialogFun(val) {
+    memberDialogFun (val) {
       var than = this;
       than.memberTitle = `【${val.name}】成员信息`;
       than.memberNew = val;
@@ -738,7 +701,7 @@ export default {
       });
     },
     // 二次确认删除成员
-    delmemberRemoveClick() {
+    delmemberRemoveClick () {
       removeMember({
         guildMemberId: this.memberRemoveObj.guildMemberId,
       }).then((res) => {
@@ -764,7 +727,7 @@ export default {
       });
     },
     // 设置管理员
-    setMemberFun(val) {
+    setMemberFun (val) {
       setManager({
         guildMemberId: val.guildMemberId,
         status: val.roleType == 3 ? true : val.roleType == 2 ? false : null,
@@ -791,7 +754,7 @@ export default {
       });
     },
     // 新增成员
-    addMemberFun() {
+    addMemberFun () {
       addMember({
         erbanNo: this.member.userID,
         guildId: this.memberNew.id,
@@ -818,7 +781,7 @@ export default {
       });
     },
     // 打开收款账户弹窗
-    payAccountDialogFun(val) {
+    payAccountDialogFun (val) {
       this.payAccountTitle = `(${val.ownerNick}【ID:${val.ownerErbanNo}】)的收款账户`;
       this.payAccount.payoneer = val.payAccount.payoneer;
       this.payAccount.usdt = val.payAccount.usdt;
@@ -827,7 +790,7 @@ export default {
       this.payAccountNew = val;
     },
     // 保存收款账户
-    payAccountClick() {
+    payAccountClick () {
       savePayAccount({
         id: this.payAccountNew.payAccount.familyId,
         payPal: this.payAccount.payPal,
@@ -852,7 +815,7 @@ export default {
       });
     },
     // 导出
-    exportInfoFun() {
+    exportInfoFun () {
       let time = this.inquire.time;
       let startTime = "";
       let endTime = "";
@@ -866,12 +829,13 @@ export default {
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
         partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
-      }).then((res) => {});
+      }).then((res) => { });
     },
     // 添加
-    add() {
+    add () {
       this.addDialog = false;
       create({
         erbanNo: this.resource.id,
@@ -897,7 +861,7 @@ export default {
       });
     },
     // 编辑按钮
-    ediClick(res) {
+    ediClick (res) {
       var obj = res.row;
       this.ediObj.leaderId = obj.ownerErbanNo;
       this.ediObj.leaderNick = obj.ownerNick;
@@ -913,7 +877,7 @@ export default {
       this.editDialog = true;
     },
     // 二次确认弹窗
-    editDialogClick() {
+    editDialogClick () {
       console.log(this.ediObj);
       update({
         id: this.ediObj.id,
@@ -921,9 +885,9 @@ export default {
         backgroundUrl: this.ediObj.imageUrl1,
         avatar: this.ediObj.imageUrl2,
         name: this.ediObj.guildNick,
-        guildContactType:this.ediObj.guildContactType,
-        guildContact:this.ediObj.guildContact,
-        inviteErbanNo:this.ediObj.inviteErbanNo
+        guildContactType: this.ediObj.guildContactType,
+        guildContact: this.ediObj.guildContact,
+        inviteErbanNo: this.ediObj.inviteErbanNo
       }).then((res) => {
         if (res.code == 200) {
           ElMessage({
@@ -944,7 +908,7 @@ export default {
       });
     },
     // 解散按钮
-    delClick() {
+    delClick () {
       console.log(this.delDialogData.id);
       var guildId = this.delDialogData.id;
       dismiss({ guildId }).then((res) => {
@@ -965,21 +929,21 @@ export default {
         this.delDialog = false;
       });
     },
-    beforeAvatarUpload() {
+    beforeAvatarUpload () {
       ElMessage({
         showClose: true,
         message: "上传中~",
         type: "warning",
       });
     },
-    handleAvatarError() {
+    handleAvatarError () {
       ElMessage({
         showClose: true,
         message: "上传失败！",
         type: "error",
       });
     },
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       console.log(file);
       this.ediObj.imageUrl1 = file.response.data;
       ElMessage({
@@ -988,7 +952,7 @@ export default {
         type: "success",
       });
     },
-    handleAvatarSuccess2(res, file) {
+    handleAvatarSuccess2 (res, file) {
       console.log(file);
       this.ediObj.imageUrl2 = file.response.data;
       ElMessage({
@@ -998,10 +962,10 @@ export default {
       });
     },
     // 分页导航
-    handleSizeChange() {
+    handleSizeChange () {
       this.getData();
     },
-    handleCurrentChange() {
+    handleCurrentChange () {
       this.getData();
     },
   },
diff --git a/src/views/guildOperationManagement/guildInfoCustomerService.vue b/src/views/guildOperationManagement/guildInfoCustomerService.vue
index 8771d90..26930f9 100644
--- a/src/views/guildOperationManagement/guildInfoCustomerService.vue
+++ b/src/views/guildOperationManagement/guildInfoCustomerService.vue
@@ -3,19 +3,25 @@
     <!-- 查询 -->
     <div class="inquire">
       <span>ID</span>
-      <el-input
-        v-model="inquire.userId"
-        placeholder=""
-        class="input"
-      ></el-input>
+      <el-input v-model="inquire.userId"
+                placeholder=""
+                class="input"></el-input>
     </div>
     <div class="inquire">
       <div class="block">
         <span class="demonstration">分区</span>
         <partition-select v-model:partition-id="inquire.partitionId"
                           v-model:partition-infos="inquire.partitionArr"
-                          v-model:after-init="getData"
-        />
+                          v-model:after-init="getData" />
+      </div>
+    </div>
+    <div class="inquire">
+      <div class="block">
+        <span class="demonstration">地区</span>
+        <partition-region-select v-model:partition-id="inquire.partitionId"
+                                 v-model:region-id="inquire.regionId"
+                                 v-model:region-infos="inquire.regionArr"
+                                 v-model:after-init="getData" />
       </div>
     </div>
     <!-- <div class="inquire">
@@ -41,102 +47,111 @@
       </div>
     </div> -->
     <!-- 查询按钮 -->
-    <el-button class="primary" type="primary" @click="getData()"
-      >查询</el-button
-    >
-    <el-button class="primary" type="primary" @click="addDialog = true"
-      >添加</el-button
-    >
-    <el-button class="primary" type="primary" @click="exportInfoFun()"
-      >导出</el-button
-    >
+    <el-button class="primary"
+               type="primary"
+               @click="getData()">查询</el-button>
+    <el-button class="primary"
+               type="primary"
+               @click="addDialog = true">添加</el-button>
+    <el-button class="primary"
+               type="primary"
+               @click="exportInfoFun()">导出</el-button>
 
     <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="tableData"
-      border
-      style="width: 100%; margin-top: 25px"
-    >
-      <el-table-column prop="id" align="center" label="公会ID" />
+    <el-table v-loading="loading"
+              :data="tableData"
+              border
+              style="width: 100%; margin-top: 25px">
+      <el-table-column prop="id"
+                       align="center"
+                       label="公会ID" />
       <!-- <el-table-column prop="referrer" align="center" label="推荐人" /> -->
-      <el-table-column prop="ownerErbanNo" align="center" label="会长ID" />
-      <el-table-column prop="ownerNick" align="center" label="会长昵称" />
-      <el-table-column
-        prop="ownerPartitionName"
-        align="center"
-        label="会长分区"
-      />
-      <el-table-column prop="name" align="center" label="公会昵称" />
-      <el-table-column align="center" prop="giftInfo" label="公会头像">
+      <el-table-column prop="ownerErbanNo"
+                       align="center"
+                       label="会长ID" />
+      <el-table-column prop="ownerNick"
+                       align="center"
+                       label="会长昵称" />
+      <el-table-column prop="ownerPartitionName"
+                       align="center"
+                       label="会长分区" />
+      <el-table-column prop="ownerRegionName"
+                       align="center"
+                       label="会长地区" />
+      <el-table-column prop="name"
+                       align="center"
+                       label="公会昵称" />
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会头像">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.avatar"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.avatar]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.avatar"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.avatar]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
-      <el-table-column align="center" prop="giftInfo" label="公会背景图">
+      <el-table-column align="center"
+                       prop="giftInfo"
+                       label="公会背景图">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.backgroundUrl"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.backgroundUrl]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.backgroundUrl"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.backgroundUrl]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
-      <el-table-column prop="createTime" align="center" label="创建日期" />
+      <el-table-column prop="createTime"
+                       align="center"
+                       label="创建日期" />
       <!-- <el-table-column prop="memberNum" align="center" label="成员数量" /> -->
-      <el-table-column align="center" label="成员数量/上限">
+      <el-table-column align="center"
+                       label="成员数量/上限">
         <template v-slot="scope">
-          <el-button
-            @click="memberDialogFun(scope.row)"
-            type="text"
-            size="default"
-            >{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button
-          >
+          <el-button @click="memberDialogFun(scope.row)"
+                     type="text"
+                     size="default">{{ scope.row.memberNum }}/{{ scope.row.memberNumLimit }}</el-button>
         </template>
       </el-table-column>
-      <el-table-column prop="adminName" align="center" label="操作人" />
-      <el-table-column
-        prop=""
-        align="center"
-        label="公会联系方式"
-      />
-      <el-table-column align="center" prop="idCard" label="公会长身份证件">
+      <el-table-column prop="adminName"
+                       align="center"
+                       label="操作人" />
+      <el-table-column prop=""
+                       align="center"
+                       label="公会联系方式" />
+      <el-table-column align="center"
+                       prop="idCard"
+                       label="公会长身份证件">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.idCard"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.idCard]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.idCard"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.idCard]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
-      <el-table-column prop="inviteErbanNo" align="center" label="邀请人ID" />
-      <el-table-column prop="inviteCheck" align="center" label="邀请人证明">
+      <el-table-column prop="inviteErbanNo"
+                       align="center"
+                       label="邀请人ID" />
+      <el-table-column prop="inviteCheck"
+                       align="center"
+                       label="邀请人证明">
         <template v-slot="scope">
-          <el-image
-            style="width: 100px; height: 100px"
-            :src="scope.row.inviteCheck"
-            :zoom-rate="1.1"
-            :preview-src-list="[scope.row.inviteCheck]"
-            fit="scale-down"
-            preview-teleported="true"
-            hide-on-click-modal="true"
-          />
+          <el-image style="width: 100px; height: 100px"
+                    :src="scope.row.inviteCheck"
+                    :zoom-rate="1.1"
+                    :preview-src-list="[scope.row.inviteCheck]"
+                    fit="scale-down"
+                    preview-teleported="true"
+                    hide-on-click-modal="true" />
         </template>
       </el-table-column>
       <!-- <el-table-column align="center" label="收款账户" width="300">
@@ -177,43 +192,37 @@
       <!-- <el-table-column prop="goldIncome" align="center" label="金币总收入" />
       <el-table-column prop="diamondRemain" align="center" label="钻石总收入" /> -->
 
-      <el-table-column align="center" label="操作" width="300">
+      <el-table-column align="center"
+                       label="操作"
+                       width="300">
         <template v-slot="scope">
-          <el-button
-            @click="ediClick(scope)"
-            class="primary"
-            type="primary"
-            size="default"
-            :disabled="!scope.row.enable"
-            >编辑</el-button
-          >
-          <el-button
-            @click="
+          <el-button @click="ediClick(scope)"
+                     class="primary"
+                     type="primary"
+                     size="default"
+                     :disabled="!scope.row.enable">编辑</el-button>
+          <el-button @click="
               delDialog = true;
               delDialogData = scope.row;
             "
-            :class="scope.row.enable ? 'danger' : 'info'"
-            :type="scope.row.enable ? 'danger' : 'info'"
-            size="default"
-            :disabled="!scope.row.enable"
-            >{{ scope.row.enable ? "移除" : "已解散" }}</el-button
-          >
+                     :class="scope.row.enable ? 'danger' : 'info'"
+                     :type="scope.row.enable ? 'danger' : 'info'"
+                     size="default"
+                     :disabled="!scope.row.enable">{{ scope.row.enable ? "移除" : "已解散" }}</el-button>
         </template>
       </el-table-column>
     </el-table>
     <!-- 新增弹窗 -->
-    <el-dialog v-model="addDialog" title="新增" width="28%" center>
+    <el-dialog v-model="addDialog"
+               title="新增"
+               width="28%"
+               center>
       <div style="margin-bottom: 25px">
-        <span
-          style="display: inline-block; margin-right: 20px; width: 100px"
-          class="col-sm-2 control-label"
-          >会长ID</span
-        >
-        <el-input
-          v-model="resource.id"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px; width: 100px"
+              class="col-sm-2 control-label">会长ID</span>
+        <el-input v-model="resource.id"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- <div style="margin-bottom: 25px">
         <span
@@ -242,220 +251,193 @@
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="addDialog = false">取消</el-button>
-          <el-button type="primary" @click="add()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="add()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 分页 -->
-    <el-pagination
-      style="margin-top: 10px"
-      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"
+                   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-dialog v-model="editDialog" title="编辑" width="28%" center>
+    <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.id"
-          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.id"
+                  style="width: 75%"
+                  class="input"
+                  disabled></el-input>
       </div>
       <!-- 会长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.leaderId"
-          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.leaderId"
+                  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.leaderNick"
-          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.leaderNick"
+                  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.guildNick"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">公会昵称</span>
+        <el-input v-model="ediObj.guildNick"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- 公会头像 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会头像</span>
+        <span class="left"
+              style="margin-right: 20px">公会头像</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
-          class="avatar-uploader"
-          action="/admin/tencent/cos/upload/file"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess2"
-          :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
-        >
-          <img v-if="ediObj.imageUrl2" :src="ediObj.imageUrl2" class="avatar" />
-          <el-icon v-else class="avatar-uploader-icon"><Plus /></el-icon>
+        <el-upload class="avatar-uploader"
+                   action="/admin/tencent/cos/upload/file"
+                   :show-file-list="false"
+                   :on-success="handleAvatarSuccess2"
+                   :before-upload="beforeAvatarUpload"
+                   :on-error="handleAvatarError">
+          <img v-if="ediObj.imageUrl2"
+               :src="ediObj.imageUrl2"
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
+            <Plus />
+          </el-icon>
         </el-upload>
       </div>
       <!-- 公会背景图 -->
       <div class="selectBox selectBoxImg">
-        <span class="left" style="margin-right: 20px">公会背景图</span>
+        <span class="left"
+              style="margin-right: 20px">公会背景图</span>
         <!-- action="/admin/tencent/cos/upload/file" -->
-        <el-upload
-          class="avatar-uploader"
-          action="/admin/tencent/cos/upload/file"
-          :show-file-list="false"
-          :on-success="handleAvatarSuccess"
-          :before-upload="beforeAvatarUpload"
-          :on-error="handleAvatarError"
-        >
-          <img v-if="ediObj.imageUrl1" :src="ediObj.imageUrl1" class="avatar" />
-          <el-icon v-else class="avatar-uploader-icon">
+        <el-upload class="avatar-uploader"
+                   action="/admin/tencent/cos/upload/file"
+                   :show-file-list="false"
+                   :on-success="handleAvatarSuccess"
+                   :before-upload="beforeAvatarUpload"
+                   :on-error="handleAvatarError">
+          <img v-if="ediObj.imageUrl1"
+               :src="ediObj.imageUrl1"
+               class="avatar" />
+          <el-icon v-else
+                   class="avatar-uploader-icon">
             <Plus />
           </el-icon>
         </el-upload>
       </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.guildNumber"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">成员数量上限</span>
+        <el-input v-model="ediObj.guildNumber"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="editDialog = false">取消</el-button>
-          <el-button type="primary" @click="editDialogClick()">
+          <el-button type="primary"
+                     @click="editDialogClick()">
             确认
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="delDialog" title="提示" width="30%" center>
+    <el-dialog v-model="delDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要解散该公会吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="delDialog = false">取消</el-button>
-          <el-button type="primary" @click="delClick()"> 确认 </el-button>
+          <el-button type="primary"
+                     @click="delClick()"> 确认 </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑收款账户弹窗 -->
-    <el-dialog
-      v-model="payAccountDialog"
-      :title="payAccountTitle"
-      width="28%"
-      center
-    >
+    <el-dialog v-model="payAccountDialog"
+               :title="payAccountTitle"
+               width="28%"
+               center>
       <!-- Payoneer -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >Payoneer</span
-        >
-        <el-input
-          v-model="payAccount.payoneer"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">Payoneer</span>
+        <el-input v-model="payAccount.payoneer"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- USDT-ERC20 -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >USDT-ERC20</span
-        >
-        <el-input
-          v-model="payAccount.usdt"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">USDT-ERC20</span>
+        <el-input v-model="payAccount.usdt"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <!-- PayPal -->
       <div style="margin-bottom: 25px; margin-top: 10px">
-        <span
-          style="display: inline-block; margin-right: 20px"
-          class="col-sm-2 control-label"
-          >PayPal</span
-        >
-        <el-input
-          v-model="payAccount.payPal"
-          style="width: 75%"
-          class="input"
-        ></el-input>
+        <span style="display: inline-block; margin-right: 20px"
+              class="col-sm-2 control-label">PayPal</span>
+        <el-input v-model="payAccount.payPal"
+                  style="width: 75%"
+                  class="input"></el-input>
       </div>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="payAccountDialog = false">取消</el-button>
-          <el-button type="primary" @click="payAccountClick()">
+          <el-button type="primary"
+                     @click="payAccountClick()">
             保存
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 编辑成员弹窗 -->
-    <el-dialog v-model="memberDialog" :title="memberTitle" width="36%" center>
+    <el-dialog v-model="memberDialog"
+               :title="memberTitle"
+               width="36%"
+               center>
       <!-- 新增用户 -->
       <div class="inquire">
         <span>平台ID</span>
-        <el-input
-          v-model="member.userID"
-          placeholder="请输入新增平台id"
-          class="input"
-        ></el-input>
-        <el-button type="primary" @click="addMemberFun()"> 新增 </el-button>
+        <el-input v-model="member.userID"
+                  placeholder="请输入新增平台id"
+                  class="input"></el-input>
+        <el-button type="primary"
+                   @click="addMemberFun()"> 新增 </el-button>
       </div>
       <!-- 内嵌表格 -->
-      <el-table
-        v-loading="loading"
-        :data="member.tableData"
-        border
-        style="width: 100%; margin-top: 25px"
-      >
-        <el-table-column align="center" label="用户平台ID">
+      <el-table v-loading="loading"
+                :data="member.tableData"
+                border
+                style="width: 100%; margin-top: 25px">
+        <el-table-column align="center"
+                         label="用户平台ID">
           <template v-slot="scope">
             {{ scope.row.erbanNo
             }}{{
@@ -468,54 +450,61 @@
             {{ scope.row.enable == false ? "(已离开)" : "" }}
           </template>
         </el-table-column>
-        <el-table-column prop="nick" align="center" label="用户昵称" />
-        <el-table-column prop="createTime" align="center" label="加入时间" />
-        <el-table-column prop="adminName" align="center" label="操作人" />
-        <el-table-column align="center" label="操作" width="300">
+        <el-table-column prop="nick"
+                         align="center"
+                         label="用户昵称" />
+        <el-table-column prop="createTime"
+                         align="center"
+                         label="加入时间" />
+        <el-table-column prop="adminName"
+                         align="center"
+                         label="操作人" />
+        <el-table-column align="center"
+                         label="操作"
+                         width="300">
           <template v-slot="scope">
-            <el-button
-              @click="setMemberFun(scope.row)"
-              :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
-              :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
-              size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
-              >{{
+            <el-button @click="setMemberFun(scope.row)"
+                       :class="scope.row.roleType == 2 ? 'danger' : 'primary'"
+                       :type="scope.row.roleType == 2 ? 'danger' : 'primary'"
+                       size="default"
+                       :disabled="scope.row.roleType == 1 ? true : false">{{
                 scope.row.roleType == 1
                   ? "会长"
                   : scope.row.roleType == 2
                   ? "取消管理员"
                   : "设为管理员"
-              }}</el-button
-            >
-            <el-button
-              @click="
+              }}</el-button>
+            <el-button @click="
                 memberRemoveObj = scope.row;
                 memberRemoveDialog = true;
               "
-              class="danger"
-              type="danger"
-              size="default"
-              :disabled="scope.row.roleType == 1 ? true : false"
-              >删除</el-button
-            >
+                       class="danger"
+                       type="danger"
+                       size="default"
+                       :disabled="scope.row.roleType == 1 ? true : false">删除</el-button>
           </template>
         </el-table-column>
       </el-table>
       <template #footer>
         <span class="dialog-footer">
-          <el-button type="primary" @click="memberDialog = false">
+          <el-button type="primary"
+                     @click="memberDialog = false">
             关闭
           </el-button>
         </span>
       </template>
     </el-dialog>
     <!-- 二次确认删除弹窗 -->
-    <el-dialog v-model="memberRemoveDialog" title="提示" width="30%" center>
+    <el-dialog v-model="memberRemoveDialog"
+               title="提示"
+               width="30%"
+               center>
       <span> 确定要删除该成员吗?</span>
       <template #footer>
         <span class="dialog-footer">
           <el-button @click="memberRemoveDialog = false">取消</el-button>
-          <el-button type="primary" @click="delmemberRemoveClick()">
+          <el-button type="primary"
+                     @click="delmemberRemoveClick()">
             确认
           </el-button>
         </span>
@@ -543,10 +532,11 @@ import { dateFormat } from "@/utils/system-helper";
 // @ts-ignore
 import { ElMessage } from "element-plus";
 import PartitionSelect from "@/views/common/partitionSelect.vue";
+import PartitionRegionSelect from "@/views/common/partitionRegionSelect.vue";
 export default {
   name: "GuildInfoNewCustomerService",
-  components: {PartitionSelect},
-  data() {
+  components: { PartitionSelect, PartitionRegionSelect },
+  data () {
     return {
       loading: false,
       delDialog: false,
@@ -558,6 +548,8 @@ export default {
         time: "",
         partitionId: undefined,
         partitionArr: [],
+        regionId: undefined,
+        regionArr: [],
       },
       //新增所需对象
       resource: {
@@ -608,7 +600,7 @@ export default {
   },
   methods: {
     // 查询接口
-    getData() {
+    getData () {
       this.loading = true;
       let time = this.inquire.time;
       let startTime = "";
@@ -622,6 +614,7 @@ export default {
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
         partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
         pageNum: this.currentPage,
@@ -633,7 +626,7 @@ export default {
       });
     },
     // 打开成员信息弹窗
-    memberDialogFun(val) {
+    memberDialogFun (val) {
       var than = this;
       than.memberTitle = `【${val.name}】成员信息`;
       than.memberNew = val;
@@ -645,7 +638,7 @@ export default {
       });
     },
     // 二次确认删除成员
-    delmemberRemoveClick() {
+    delmemberRemoveClick () {
       removeMember({
         guildMemberId: this.memberRemoveObj.guildMemberId,
       }).then((res) => {
@@ -671,7 +664,7 @@ export default {
       });
     },
     // 设置管理员
-    setMemberFun(val) {
+    setMemberFun (val) {
       setManager({
         guildMemberId: val.guildMemberId,
         status: val.roleType == 3 ? true : val.roleType == 2 ? false : null,
@@ -698,7 +691,7 @@ export default {
       });
     },
     // 新增成员
-    addMemberFun() {
+    addMemberFun () {
       addMember({
         erbanNo: this.member.userID,
         guildId: this.memberNew.id,
@@ -725,7 +718,7 @@ export default {
       });
     },
     // 打开收款账户弹窗
-    payAccountDialogFun(val) {
+    payAccountDialogFun (val) {
       this.payAccountTitle = `(${val.ownerNick}【ID:${val.ownerErbanNo}】)的收款账户`;
       this.payAccount.payoneer = val.payAccount.payoneer;
       this.payAccount.usdt = val.payAccount.usdt;
@@ -734,7 +727,7 @@ export default {
       this.payAccountNew = val;
     },
     // 保存收款账户
-    payAccountClick() {
+    payAccountClick () {
       savePayAccount({
         id: this.payAccountNew.payAccount.familyId,
         payPal: this.payAccount.payPal,
@@ -759,7 +752,7 @@ export default {
       });
     },
     // 导出
-    exportInfoFun() {
+    exportInfoFun () {
       let time = this.inquire.time;
       let startTime = "";
       let endTime = "";
@@ -771,12 +764,14 @@ export default {
         erbanNo: this.inquire.userId,
         referrer: this.inquire.referrer,
         familyName: this.inquire.nick,
+        partitionId: this.inquire.partitionId,
+        regionId: this.inquire.regionId == 0 ? undefined : this.inquire.regionId,
         // startDate: startTime,
         // endDate: endTime,
-      }).then((res) => {});
+      }).then((res) => { });
     },
     // 添加
-    add() {
+    add () {
       this.addDialog = false;
       create({
         erbanNo: this.resource.id,
@@ -799,7 +794,7 @@ export default {
       });
     },
     // 编辑按钮
-    ediClick(res) {
+    ediClick (res) {
       var obj = res.row;
       this.ediObj.leaderId = obj.ownerErbanNo;
       this.ediObj.leaderNick = obj.ownerNick;
@@ -811,7 +806,7 @@ export default {
       this.editDialog = true;
     },
     // 二次确认弹窗
-    editDialogClick() {
+    editDialogClick () {
       console.log(this.ediObj);
       update({
         id: this.ediObj.id,
@@ -839,7 +834,7 @@ export default {
       });
     },
     // 解散按钮
-    delClick() {
+    delClick () {
       console.log(this.delDialogData.id);
       var guildId = this.delDialogData.id;
       dismiss({ guildId }).then((res) => {
@@ -861,21 +856,21 @@ export default {
         this.delDialog = false;
       });
     },
-    beforeAvatarUpload() {
+    beforeAvatarUpload () {
       ElMessage({
         showClose: true,
         message: "上传中~",
         type: "warning",
       });
     },
-    handleAvatarError() {
+    handleAvatarError () {
       ElMessage({
         showClose: true,
         message: "上传失败！",
         type: "error",
       });
     },
-    handleAvatarSuccess(res, file) {
+    handleAvatarSuccess (res, file) {
       console.log(file);
       this.ediObj.imageUrl1 = file.response.data;
       ElMessage({
@@ -884,7 +879,7 @@ export default {
         type: "success",
       });
     },
-    handleAvatarSuccess2(res, file) {
+    handleAvatarSuccess2 (res, file) {
       console.log(file);
       this.ediObj.imageUrl2 = file.response.data;
       ElMessage({
@@ -894,10 +889,10 @@ export default {
       });
     },
     // 分页导航
-    handleSizeChange() {
+    handleSizeChange () {
       this.getData();
     },
-    handleCurrentChange() {
+    handleCurrentChange () {
       this.getData();
     },
   },