Merge branch 'milestone-20260404-后台整改需求' into dev

src/api/userPermissions.js

@@ -29,6 +29,15 @@ export function marketListApi(params) {
   });
 }
 
+// 获取地区列表(用户列表专用)
+export function marketUserListApi(params) {
+  return request({
+    url: base_url + "/admin/user/region/list/get",
+    method: "post",
+    data: params,
+  });
+}
+
 // 获取导出列表
 export function exportListApi(params) {
   return request({

src/views/UserPermissions/UserList.vue

@@ -34,9 +34,9 @@
             >
               <el-option 
                 v-for="origin in originList" 
-                :key="origin.origin_id" 
-                :label="origin.origin_name" 
-                :value="origin.origin_id" 
+                :key="origin.ID" 
+                :label="origin.Name" 
+                :value="origin.ID" 
               />
             </el-select>
           </div>
@@ -195,7 +195,7 @@ import { ref, reactive, onMounted } from 'vue';
 import { ElMessage } from 'element-plus';
 import router from '../../router';
 import { 
-  marketListApi, 
+  marketUserListApi, 
   getOriginListApi, 
   userListApi, 
   exportUserListApi 
@@ -260,11 +260,11 @@ const handleSortChange = ({ prop, order }) => {
 const fetchRegionList = async () => {
   try {
     isRegionLoading.value = true;
-    const data = await marketListApi({ 
+    const data = await marketUserListApi({ 
       token: token, 
       app_form: "en" 
     });
-    regionList.value = data.list || [];
+    regionList.value = data || [];
   } catch (error) {
     console.error('获取地区列表失败：', error);
     regionList.value = [];