From 476f76914289b2043016d01afcd778fdbb72ad1c Mon Sep 17 00:00:00 2001
From: khalil <khalil@chuhaiwl2023.com>
Date: Tue, 3 Jun 2025 12:07:27 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E5=88=86=E5=8C=BA=E4=B8=8E=E5=9C=B0=E5=8C=BA?=
 =?UTF-8?q?=E8=81=94=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anchorSalaryOperate.vue                   |   2 +
 src/views/users/UserCheckAdminView.vue        | 112 ++++++++++--------
 2 files changed, 63 insertions(+), 51 deletions(-)

diff --git a/src/views/guildOperationManagement/anchorSalaryOperate.vue b/src/views/guildOperationManagement/anchorSalaryOperate.vue
index 8a9d696..b95ded1 100644
--- a/src/views/guildOperationManagement/anchorSalaryOperate.vue
+++ b/src/views/guildOperationManagement/anchorSalaryOperate.vue
@@ -78,6 +78,8 @@
             label="公会长ID"
           >
           </el-table-column>
+          <el-table-column align="center" prop="agencyOwnerRegionDesc" label="公会长地区">
+          </el-table-column>
           <el-table-column align="center" prop="diamondFlow" label="钻石流水">
             <template v-slot="scope">
               {{
diff --git a/src/views/users/UserCheckAdminView.vue b/src/views/users/UserCheckAdminView.vue
index 8043e4a..84c2809 100644
--- a/src/views/users/UserCheckAdminView.vue
+++ b/src/views/users/UserCheckAdminView.vue
@@ -47,6 +47,7 @@
                         </div>
                         <div class="part form-group">
                             <div class="gender">性别: <span></span></div>
+                            <div class="phoneAreaCode">手机区号: <span></span></div>
                             <div class="phone">手机: <span></span></div>
                             <div class="email">email: <span></span></div>
                             <div class="birth">出生日期: <span></span></div>
@@ -142,14 +143,17 @@
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="editPhone" class="col-sm-3 control-label">手机:</label>
-                            <div class="col-sm-8 control-label">
+                            <label for="editPhone" class="col-sm-3 control-label">手机号:</label>
+                          <div class="col-sm-2 control-label">
+                            <select name="phoneAreaCode" id="phoneAreaCode" class="form-control validate[required]"></select>
+                          </div>
+                          <div class="col-sm-6 control-label">
                                 <input type="text" class="form-control" name="editPhone" id="editPhone">
                                 <a href="javascript:void(0)" id="removePhone">解绑</a>
                             </div>
                         </div>
                         <div class="form-group">
-                          <label for="editPhone" class="col-sm-3 control-label">邮箱:</label>
+                          <label for="editEmail" class="col-sm-3 control-label">邮箱:</label>
                           <div class="col-sm-8 control-label">
                             <input type="text" class="form-control" name="editEmail" id="editEmail">
                             <a href="javascript:void(0)" id="removeEmail">解绑</a>
@@ -307,6 +311,7 @@ export default {
     data() {
         return {
             partitionInfos: [],
+            phoneAreaCodes: [],
         };
     },
     setup() {
@@ -322,31 +327,12 @@ export default {
     created() {
         this.$nextTick(function () {
             this.initPartition();
+            this.initPhoneAreaCode();
             this.initData();
             $("#partitionId").on("change", function() {
-          var selectedValue = $(this).val();
-          $.ajax({
-                  type: "get",
-                  url: "/admin/regionInfo/listByPartitionId",
-                  data: { partitionId: selectedValue,containAll:false },
-                  dataType: "json",
-                  success: function (res) {
-                    var regionId = $("#regionId");
-                    regionId.empty();
-                    if(res.code == 200){
-                for (var i = 0; i < res.data.length; i++) {
-
-                      var option = $("<option>", {
-                    text: JSON.parse(res.data[i].name).zh,
-                    value:res.data[i].id
-                  });
-                  regionId.append(option);
-                  
-                }
-                    }
-                  }
-                })
-      });
+              var selectedValue = $(this).val();
+              this.initRegionInfo(selectedValue);
+            });
         });
     },
     methods: {
@@ -377,7 +363,7 @@ export default {
                     },
                     uniqueId: 'code',
                     toolbar: '#toolbar',
-                    url: '/admin/userCheckAdmin/getlist',
+                    url: '/admin/userCheckAdmin/list',
                     onLoadSuccess: function () {  //加载成功时执行
                         console.log("load success");
                     },
@@ -397,6 +383,7 @@ export default {
                         },
                         { field: 'account.uid', title: 'Uid', align: 'center', valign: 'middle' },
                         { field: 'users.nick', title: '用户昵称', align: 'center', valign: 'middle' },
+                        { field: 'users.phoneAreaCode', title: '区号', align: 'center', valign: 'middle' },
                         { field: 'users.phone', title: '手机号', align: 'center', valign: 'middle' },
                         { field: 'users.email', title: '邮箱', align: 'center', valign: 'middle' },
                         { field: 'users.userDesc', title: '简介', align: 'center', valign: 'middle' },
@@ -699,11 +686,12 @@ export default {
                     }
                     $("#editUser").ajaxSubmit(options);
                 });
+
                 $('#table').on('click', '.opt-edit', function () {
                     $('#imgUrl').val('');
                     $('#picUrl').attr('src', '');
                     $('#uploadPhotoFile').val('');
-                    $("#needSend").prop("checked", true);
+                    $("#notSend").prop("checked", true);
                     $('#msg').val('');
                     $('#msgDiv').show();
                     $.ajax({
@@ -722,9 +710,12 @@ export default {
                                 var avatar = users ? users.avatar : '';
                                 var gender = users ? users.gender : 1;
                                 var defUser = users ? users.defUser : 1;
-                                let partitionId = users.partitionId;
+                                const partitionId = users.partitionId;
+                                const regionId = users.regionId;
+                                $this.initRegionInfo(partitionId, regionId)
 
                                 $('#editNick').val(nick);
+                                $('#phoneAreaCode').val(account.phoneAreaCode);
                                 $('#editPhone').val(account.phone);
                                 $('#addImgUrl').attr('src', avatar);
                                 $('#editAvatar').val(avatar);
@@ -745,29 +736,7 @@ export default {
                                         '<td><button class="btn btn-danger" type="button" onclick="delPhoto(this)">删除</button></td></tr>');
                                     $photos.append($photo);
                                 });
-                                 // 获取选择地区
-                      $.ajax({
-                  type: "get",
-                  url: "/admin/regionInfo/listByPartitionId",
-                  data: { partitionId: partitionId,containAll:false },
-                  dataType: "json",
-                  success: function (res) {
-                    var regionId = $("#regionId");
-                    regionId.empty();
-                    if(res.code == 200){
-                for (var i = 0; i < res.data.length; i++) {
 
-                      var option = $("<option>", {
-                    text: JSON.parse(res.data[i].name).zh,
-                    value:res.data[i].id
-                  });
-                  regionId.append(option);
-                  
-                }
-                $("#regionId").val(users.regionId);
-                    }
-                  }
-                })
                             }
                             $('#editModal').modal('show');
                         }
@@ -916,6 +885,7 @@ export default {
                                 gender: $('#editGender').val(),
                                 avatar: $('#editAvatar').val(),
                                 uid: $('#editUid').val(),
+                                phoneAreaCode: $('#phoneAreaCode').val(),
                                 phone: $('#editPhone').val(),
                                 defUser: $('#editDefUser').val(),
                                 alipayAccount: $('#alipayAccount').val(),
@@ -1043,6 +1013,46 @@ export default {
                 );
             });
         },
+        initRegionInfo(partitionId, regionId) {
+          $.ajax({
+            type: "get",
+            url: "/admin/regionInfo/listByPartitionId",
+            data: { partitionId: partitionId, containAll:false },
+            dataType: "json",
+            success: function (res) {
+              var regionSelect = $("#regionId");
+              regionSelect.empty();
+              if(res.code === 200){
+                for (var i = 0; i < res.data.length; i++) {
+                  const regionInfo = res.data[i];
+                  const option = $("<option>", {  text: regionInfo.name, value:regionInfo.id, selected: regionId && regionId === regionInfo.id});
+                  regionSelect.append(option);
+                }
+              }
+            }
+          })
+        },
+      initPhoneAreaCode() {
+        $.ajax({
+          type: "get",
+          url: "/admin/userCheckAdmin/listPhoneAreaCode",
+          dataType: "json",
+          success: function (res) {
+            let data = res.data;
+            this.phoneAreaCodes = data;
+            buildSelectOption(
+                "#phoneAreaCode",
+                null,
+                data.map((v) => {
+                  return {
+                    value: v,
+                    text: v,
+                  };
+                })
+            );
+          }
+        });
+      },
     },
 
 };