From c4b96e1a4f7120a673f853d44cb863eedc629fdd Mon Sep 17 00:00:00 2001
From: linquan <349589071@qq.com>
Date: Wed, 23 Apr 2025 11:02:05 +0800
Subject: [PATCH] debug

---
 .env.production                               |    8 +-
 src/utils/game.ts                             |  606 ++--
 src/utils/utils.ts                            |  125 +-
 src/views/gameLoginUrl/routerList/index.vue   |  247 +-
 .../gameLoginUrl/serverGeneralList/index.vue  |    4 +-
 .../gameLoginUrl/serverVersion/index.vue      |   13 +-
 .../gameMail/send/component/editConfig.vue    |    9 +-
 src/views/gameMail/send/index.vue             |   13 +-
 src/views/gameManage/copyUnit/index.vue       |  831 +++--
 src/views/gameManage/gm/index.vue             |   12 +-
 src/views/gameManage/keep/index.vue           |   11 +-
 src/views/gameManage/live/index.vue           |   11 +-
 src/views/gameManage/migrate/index.vue        |  267 +-
 src/views/gameManage/register/index.vue       |   11 +-
 src/views/gameManage/shop/index.vue           |   11 +-
 src/views/gameNotice/pop/index.vue            |   11 +-
 src/views/gameOrder/count/index.vue           |   13 +-
 src/views/gameOrder/deposit/index.vue         |  322 +-
 src/views/gameOrder/orderLog/index.vue        |    9 +-
 src/views/gameOrder/shopInfo/index.vue        |    9 +-
 src/views/gameRole/account/index.vue          |   11 +-
 src/views/gameRole/online/index.vue           |   11 +-
 src/views/gameRole/role/index.vue             | 2727 ++++++++---------
 src/views/gameRole/scale/index.vue            |    9 +-
 src/views/gameRole/searchAccount/index.vue    |   11 +-
 src/views/gameRole/statics/index.vue          |  539 ++--
 26 files changed, 2928 insertions(+), 2923 deletions(-)

diff --git a/.env.production b/.env.production
index 752286b..d0d79ec 100644
--- a/.env.production
+++ b/.env.production
@@ -3,8 +3,8 @@ ENV = 'production'
 
 # public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可
 VITE_PUBLIC_PATH =
-VITE_outDir = 'dist'
+VITE_outDir = 'test87'
 # 线上环境接口地址
-VITE_API_URL = 'http://192.168.2.115:4111/'
-VITE_API_TITLE = '桃源记2内网115后台'
-VITE_API_VICETITLE = '内网115后台'
\ No newline at end of file
+VITE_API_URL = 'http://101.35.161.116:4111/'
+VITE_API_TITLE = '桃源记2后台'
+VITE_API_VICETITLE = '后台'
\ No newline at end of file
diff --git a/src/utils/game.ts b/src/utils/game.ts
index 8558eff..1a789fc 100644
--- a/src/utils/game.ts
+++ b/src/utils/game.ts
@@ -1,327 +1,353 @@
-import {gameGetAllCcdUrl, gameGetAllChannel, gameGetAllLoginUrl} from "/@/api/game";
-import {forEach} from "wangeditor/dist/utils/util";
-import {getServerName} from "/@/utils/utils";
-import {utils} from "sortablejs";
+import { gameGetAllCcdUrl, gameGetAllChannel, gameGetAllLoginUrl } from '/@/api/game';
+import { forEach } from 'wangeditor/dist/utils/util';
+import { getServerName } from '/@/utils/utils';
+import { utils } from 'sortablejs';
 // import {verifyNumberIntegerAndFloat} from "/@/utils/toolsValidate";
 
 export const ServerList = [
-  {
-    value: '1',
-    label: '一区：桃源野谷',
-  },
-  {
-    value: '2',
-    label: '二区：虎狼之穴',
-  },
-  {
-    value: '3',
-    label: '三区：袅袅炊烟',
-  },
-  {
-    value: '4',
-    label: '四区：豺狼虎豹',
-  },
-  {
-    value: '5',
-    label: '五区：鸡鸣犬吠',
-  },
-  {
-    value: '6',
-    label: '六区：妖兽横行',
-  },
-  {
-    value: '7',
-    label: '七区：五谷丰登',
-  },
-  {
-    value: '8',
-    label: '八区：上古四凶',
-  },
-  {
-    value: '9',
-    label: '九区：方兴未艾',
-  },
-  {
-    value: '10',
-    label: '十区：魑魅魍魉',
-  },
-  {
-    value: '11',
-    label: '十一区：桃花源记',
-  },
-  {
-    value: '12',
-    label: '十二区：先遣服',
-  },
-  {
-    value: '13',
-    label: '十三区：武陵人',
-  },
-  {
-    value: '14',
-    label: '十四区：桃谷沃野',
-  },
-  {
-    value: '15',
-    label: '十五区：桃源春色',
-  },
-  {
-    value: '16',
-    label: '十六区：桃源先遣服',
-  },
+	{
+		value: '1',
+		label: '一区：桃源野谷',
+	},
+	{
+		value: '2',
+		label: '二区：虎狼之穴',
+	},
+	{
+		value: '3',
+		label: '三区：袅袅炊烟',
+	},
+	{
+		value: '4',
+		label: '四区：豺狼虎豹',
+	},
+	{
+		value: '5',
+		label: '五区：鸡鸣犬吠',
+	},
+	{
+		value: '6',
+		label: '六区：妖兽横行',
+	},
+	{
+		value: '7',
+		label: '七区：五谷丰登',
+	},
+	{
+		value: '8',
+		label: '八区：上古四凶',
+	},
+	{
+		value: '9',
+		label: '九区：方兴未艾',
+	},
+	{
+		value: '10',
+		label: '十区：魑魅魍魉',
+	},
+	{
+		value: '11',
+		label: '十一区：桃花源记',
+	},
+	{
+		value: '12',
+		label: '十二区：先遣服',
+	},
+	{
+		value: '13',
+		label: '十三区：武陵人',
+	},
+	{
+		value: '14',
+		label: '十四区：桃谷沃野',
+	},
+	{
+		value: '15',
+		label: '十五区：桃源春色',
+	},
+	{
+		value: '16',
+		label: '十六区：桃源先遣服',
+	},
 ];
 
 export const AllOfServerList = [
-  {
-    value: '',
-    label: '全部服务器',
-  },
-  {
-    value: '1',
-    label: '一区：桃源野谷',
-  },
-  {
-    value: '2',
-    label: '二区：虎狼之穴',
-  },
-  {
-    value: '3',
-    label: '三区：袅袅炊烟',
-  },
-  {
-    value: '4',
-    label: '四区：豺狼虎豹',
-  },
-  {
-    value: '5',
-    label: '五区：鸡鸣犬吠',
-  },
-  {
-    value: '6',
-    label: '六区：妖兽横行',
-  },
-  {
-    value: '7',
-    label: '七区：五谷丰登',
-  },
-  {
-    value: '8',
-    label: '八区：上古四凶',
-  },
-  {
-    value: '9',
-    label: '九区：方兴未艾',
-  },
-  {
-    value: '10',
-    label: '十区：魑魅魍魉',
-  },
-  {
-    value: '11',
-    label: '十一区：桃花源记',
-  },
-  {
-    value: '12',
-    label: '十二区：先遣服',
-  },
-  {
-    value: '13',
-    label: '十三区：武陵人',
-  },
-  {
-    value: '14',
-    label: '十四区：桃谷沃野',
-  },
-  {
-    value: '15',
-    label: '十五区：桃源春色',
-  },
-  {
-    value: '16',
-    label: '十六区：桃源先遣服',
-  },
+	{
+		value: '',
+		label: '全部服务器',
+	},
+	{
+		value: '1',
+		label: '一区：桃源野谷',
+	},
+	{
+		value: '2',
+		label: '二区：虎狼之穴',
+	},
+	{
+		value: '3',
+		label: '三区：袅袅炊烟',
+	},
+	{
+		value: '4',
+		label: '四区：豺狼虎豹',
+	},
+	{
+		value: '5',
+		label: '五区：鸡鸣犬吠',
+	},
+	{
+		value: '6',
+		label: '六区：妖兽横行',
+	},
+	{
+		value: '7',
+		label: '七区：五谷丰登',
+	},
+	{
+		value: '8',
+		label: '八区：上古四凶',
+	},
+	{
+		value: '9',
+		label: '九区：方兴未艾',
+	},
+	{
+		value: '10',
+		label: '十区：魑魅魍魉',
+	},
+	{
+		value: '11',
+		label: '十一区：桃花源记',
+	},
+	{
+		value: '12',
+		label: '十二区：先遣服',
+	},
+	{
+		value: '13',
+		label: '十三区：武陵人',
+	},
+	{
+		value: '14',
+		label: '十四区：桃谷沃野',
+	},
+	{
+		value: '15',
+		label: '十五区：桃源春色',
+	},
+	{
+		value: '16',
+		label: '十六区：桃源先遣服',
+	},
 ];
 
 export const AllServerList = [
-  {
-    value: '0',
-    label: '一服',
-  }
+	{
+		value: '0',
+		label: '一服',
+	},
 ];
 
 export const ChannelList = [
-  // {
-  //     value: "000000000000",
-  //     label: '母包渠道',
-  // },
-  // {
-  //     value: '000001000000',
-  //     label: 'peach',
-  // },
-  {
-    value: '000002000000',
-    label: 'taptap',
-  },
-  // {
-  //     value: '000003000000',
-  //     label: 'quick-母包',
-  // },
-  {
-    value: '000003000015',
-    label: '小米',
-  },
-  {
-    value: '000003000017',
-    label: 'VIVO',
-  },
-  {
-    value: '000003000023',
-    label: 'OPPO',
-  },
-  {
-    value: '000003000024',
-    label: '华为',
-  },
-  {
-    value: '000003000027',
-    label: '4399',
-  },
-  {
-    value: '000003002376',
-    label: '荣耀',
-  },
-  {
-    value: '000004000000',
-    label: 'hykb',
-  }
+	// {
+	//     value: "000000000000",
+	//     label: '母包渠道',
+	// },
+	// {
+	//     value: '000001000000',
+	//     label: 'peach',
+	// },
+	{
+		value: '000002000000',
+		label: 'taptap',
+	},
+	// {
+	//     value: '000003000000',
+	//     label: 'quick-母包',
+	// },
+	{
+		value: '000003000015',
+		label: '小米',
+	},
+	{
+		value: '000003000017',
+		label: 'VIVO',
+	},
+	{
+		value: '000003000023',
+		label: 'OPPO',
+	},
+	{
+		value: '000003000024',
+		label: '华为',
+	},
+	{
+		value: '000003000027',
+		label: '4399',
+	},
+	{
+		value: '000003002376',
+		label: '荣耀',
+	},
+	{
+		value: '000004000000',
+		label: 'hykb',
+	},
 ];
 
 export const AllChannelList = [
-  {
-    value: "",
-    label: '所有渠道',
-  },
-  // {
-  //     value: "000000000000",
-  //     label: '母包渠道',
-  // },
-  // {
-  //     value: '000001000000',
-  //     label: 'peach',
-  // },
-  {
-    value: '000002000000',
-    label: 'taptap',
-  },
-  {
-    value: '000002999999',
-    label: 'tap先行服',
-  },
-  // {
-  //     value: '000003000000',
-  //     label: 'quick-母包',
-  // },
-  {
-    value: '000003000015',
-    label: '小米',
-  },
-  {
-    value: '000003000017',
-    label: 'VIVO',
-  },
-  {
-    value: '000003000023',
-    label: 'OPPO',
-  },
-  {
-    value: '000003000024',
-    label: '华为',
-  },
-  {
-    value: '000003000027',
-    label: '4399',
-  },
-  {
-    value: '000003002376',
-    label: '荣耀',
-  },
-  {
-    value: '000004000000',
-    label: 'hykb',
-  }
+	{
+		value: '',
+		label: '所有渠道',
+	},
+	// {
+	//     value: "000000000000",
+	//     label: '母包渠道',
+	// },
+	// {
+	//     value: '000001000000',
+	//     label: 'peach',
+	// },
+	{
+		value: '000002000000',
+		label: 'taptap',
+	},
+	{
+		value: '000002999999',
+		label: 'tap先行服',
+	},
+	// {
+	//     value: '000003000000',
+	//     label: 'quick-母包',
+	// },
+	{
+		value: '000003000015',
+		label: '小米',
+	},
+	{
+		value: '000003000017',
+		label: 'VIVO',
+	},
+	{
+		value: '000003000023',
+		label: 'OPPO',
+	},
+	{
+		value: '000003000024',
+		label: '华为',
+	},
+	{
+		value: '000003000027',
+		label: '4399',
+	},
+	{
+		value: '000003002376',
+		label: '荣耀',
+	},
+	{
+		value: '000004000000',
+		label: 'hykb',
+	},
 ];
 
 export const Platforms = [
-  {
-    value: 1,
-    label: 'Android',
-  },
-  {
-    value: 2,
-    label: 'Ios',
-  }
+	{
+		value: 1,
+		label: 'Android',
+	},
+	{
+		value: 2,
+		label: 'Ios',
+	},
 ];
 
 export const CompareType = [
-  {
-    value: 1,
-    label: '=',
-  },
-  {
-    value: 2,
-    label: '<=',
-  },
-  {
-    value: 3,
-    label: '<',
-  },
-  {
-    value: 4,
-    label: '>',
-  },
-  {
-    value: 5,
-    label: '>=',
-  }
+	{
+		value: 1,
+		label: '=',
+	},
+	{
+		value: 2,
+		label: '<=',
+	},
+	{
+		value: 3,
+		label: '<',
+	},
+	{
+		value: 4,
+		label: '>',
+	},
+	{
+		value: 5,
+		label: '>=',
+	},
+];
+
+export const ServerCategorize = [
+	{
+		value: 0,
+		label: '全部',
+	},
+	{
+		value: 1,
+		label: 'ios',
+	},
+	{
+		value: 2,
+		label: '官服',
+	},
+	{
+		value: 4,
+		label: '硬核',
+	},
+	{
+		value: 3,
+		label: '其他',
+	}
 ];
 
 export async function channelList(): Promise<object[]> {
-  const data = await gameGetAllChannel({});
-  return data.data.List ?? [];
+	const data = await gameGetAllChannel({});
+	return data.data.List ?? [];
 }
 
 export async function allChannelList(): Promise<object[]> {
-  const data = await gameGetAllChannel({});
-  return [{
-    value: '',
-    label: '所有渠道',
-  }].concat(data.data.List ?? []);
+	const data = await gameGetAllChannel({});
+	return [
+		{
+			value: '',
+			label: '所有渠道',
+		},
+	].concat(data.data.List ?? []);
 }
 
 export async function serverList(): Promise<object[]> {
-  const data = await gameGetAllLoginUrl({});
-  data.data.loginUrlList.forEach(res => {
-    res.name = getServerName(res)
-  })
-  data.data.loginUrlList.sort((a, b) => Number(a.platform * 10000 + a.area) - Number(b.platform * 10000 + b.area));
-  return data.data.loginUrlList ?? [];
+	const data = await gameGetAllLoginUrl({});
+	data.data.loginUrlList.forEach((res) => {
+		res.name = getServerName(res);
+	});
+	data.data.loginUrlList.sort((a, b) => a.id -  b.id);
+	return data.data.loginUrlList ?? [];
 }
 
 export async function allServerList(): Promise<object[]> {
-  const data = await gameGetAllLoginUrl({});
-  data.data.loginUrlList.forEach(res => {
-    res.name = getServerName(res)
-  })
-  data.data.loginUrlList.sort((a, b) => Number(a.platform * 10000 + a.area) - Number(b.platform * 10000 + b.area));
-  return [{
-    id: '',
-    name: '全部服务器'
-  }].concat(data.data.loginUrlList ?? []);
+	const data = await gameGetAllLoginUrl({});
+	data.data.loginUrlList.forEach((res) => {
+		res.name = getServerName(res);
+	});
+	data.data.loginUrlList.sort((a, b) => a.id -  b.id);
+	return [
+		{
+			id: '',
+			name: '全部服务器',
+		},
+	].concat(data.data.loginUrlList ?? []);
 }
 
 export async function allCcdList(): Promise<object[]> {
-  const data = await gameGetAllCcdUrl({});
-  console.log("allCcdList: ", data);
-  return data.data.list ?? [];
+	const data = await gameGetAllCcdUrl({});
+	console.log('allCcdList: ', data);
+	return data.data.list ?? [];
 }
-
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index f45ae03..133fb36 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -1,89 +1,92 @@
 export function contentReplace(str: string) {
-  if (str === "") {
-    return str;
-  }
-  str = str.replace(/\n/gi, '<br/>');
-  str = str.replaceAll(/(\[color=.*?])/gi, replacer);
-  str = str.replace(/\[color=/gi, '<font color="');
-  str = str.replace(/\[\/color\]/gi, "<\/font>");
-  str = str.replaceAll(/(\[url=.*?])/gi, replacer);
-  str = str.replace(/\[url=/gi, '<a target="_blank" href="');
-  str = str.replace(/\[\/url\]/gi, "<\/a>");
-  str = str.replace(/]/gi, ">");
-  str = str.replace(/\[/gi, "<");
-  return str;
+	if (str === '') {
+		return str;
+	}
+	str = str.replace(/\n/gi, '<br/>');
+	str = str.replaceAll(/(\[color=.*?])/gi, replacer);
+	str = str.replace(/\[color=/gi, '<font color="');
+	str = str.replace(/\[\/color\]/gi, '</font>');
+	str = str.replaceAll(/(\[url=.*?])/gi, replacer);
+	str = str.replace(/\[url=/gi, '<a target="_blank" href="');
+	str = str.replace(/\[\/url\]/gi, '</a>');
+	str = str.replace(/]/gi, '>');
+	str = str.replace(/\[/gi, '<');
+	return str;
 }
 
 function replacer(match: any, p: any, offset: any, string: any) {
-  // p是颜色样式
-  console.log("replacer: ", p);
-  return p.replace(/]/i, '">');
+	// p是颜色样式
+	console.log('replacer: ', p);
+	return p.replace(/]/i, '">');
 }
 
 export function random(len: number) {
-  return Math.floor(Math.random() * len);
+	return Math.floor(Math.random() * len);
 }
 
 export function zeroFill(Date: any) {
-  Date = Number(Date);
-  return Date < 10 ? "0" + Date : Date + "";
+	Date = Number(Date);
+	return Date < 10 ? '0' + Date : Date + '';
 }
 
 export function zero4Fill(Date: any) {
-  Date = Number(Date);
-  return Date < 1000 ? "0" + Date : Date + "";
+	Date = Number(Date);
+	return Date < 1000 ? '0' + Date : Date + '';
 }
 
-
 export function getDaysBetween(date1, date2) {
-  var startDate = Date.parse(date1);
-  var endDate = Date.parse(date2);
-  if (startDate > endDate) {
-    return 0;
-  }
-  if (startDate == endDate) {
-    return 1;
-  }
-  var days = (endDate - startDate) / 86400000 + 1;
-  return days;
+	var startDate = Date.parse(date1);
+	var endDate = Date.parse(date2);
+	if (startDate > endDate) {
+		return 0;
+	}
+	if (startDate == endDate) {
+		return 1;
+	}
+	var days = (endDate - startDate) / 86400000 + 1;
+	return days;
 }
 
 export function getCookie(cookie, cname) {
-  var name = cname + "=";
-  var ca = cookie.split(';');
-  for (var i = 0; i < ca.length; i++) {
-    var c = ca[i].trim();
-    if (c.indexOf(name) == 0) return c.substring(name.length, c.length);
-  }
-  return "";
+	var name = cname + '=';
+	var ca = cookie.split(';');
+	for (var i = 0; i < ca.length; i++) {
+		var c = ca[i].trim();
+		if (c.indexOf(name) == 0) return c.substring(name.length, c.length);
+	}
+	return '';
 }
 
 export function getServerName(item) {
-  return (item.platform == 1 ? 'ios ' : (item.platform == 2 ? 'an ' : item.platform == 3 ? '先行 ' : '')) + item.id + ' ' + item.name
+	return (item.platform == 1 ? 'ios ' : item.platform == 2 ? 'an ' : item.platform == 3 ? '先行 ' : '') + item.id + ' ' + item.remark;
 }
 
 export function allGSwitchServer(serverSwitch, servers) {
-  switch (serverSwitch) {
-    case 1:
-      return servers.filter(r => (r.id > 1000 && r.id < 2000) || r.id == "");
-    case 2:
-      return servers.filter(r => (r.id > 2000) || r.id == "");
-    case 3:
-      return servers.filter(r => (r.id < 1000) || r.id == "");
-    default:
-      return servers;
-  }
+	switch (serverSwitch) {
+		case 1:
+			return servers.filter((r) => (r.id > 1000 && r.id < 2000) || r.id == '');
+		case 2:
+			return servers.filter((r) => (r.id > 2000 && r.channel.indexOf(';;') == -1) || r.id == '');
+		case 3:
+			return servers.filter((r) => r.id < 1000 || r.id == '');
+		case 4:
+			return servers.filter((r) => (r.id > 2000 && r.channel.indexOf(';;') != -1) || r.id == '');
+		default:
+			return servers;
+	}
 }
 
 export function gSwitchServer(serverSwitch, servers) {
-  switch (serverSwitch) {
-    case 1:
-      return servers.filter(r => r.id > 1000 && r.id < 2000);
-    case 2:
-      return servers.filter(r => r.id > 2000);
-    case 3:
-      return servers.filter(r => r.id < 1000);
-    default:
-      return servers;
-  }
-}
\ No newline at end of file
+	switch (serverSwitch) {
+		case 1:
+			return servers.filter((r) => r.id > 1000 && r.id < 2000);
+		case 2:
+			return servers.filter((r) => r.id > 2000 && r.channel.indexOf(';;') == -1);
+		case 3:
+			return servers.filter((r) => r.id < 1000);
+		case 4:
+			return servers.filter((r) => r.id > 2000 && r.channel.indexOf(';;') != -1);
+		default:
+			return servers;
+	}
+}
diff --git a/src/views/gameLoginUrl/routerList/index.vue b/src/views/gameLoginUrl/routerList/index.vue
index ebefe03..5d0e0af 100644
--- a/src/views/gameLoginUrl/routerList/index.vue
+++ b/src/views/gameLoginUrl/routerList/index.vue
@@ -1,148 +1,159 @@
 <template>
-  <div>
-    <!--    <el-card shadow="hover" header="">-->
-    <!--      <div class="mb15">-->
-    <el-form class="flex-warp" label-position="right">
+	<div>
+		<!--    <el-card shadow="hover" header="">-->
+		<!--      <div class="mb15">-->
+		<el-form class="flex-warp" label-position="right">
+			<el-form-item>
+				<el-button type="success" class="ml10" @click="onOpenAddDic">
+					<el-icon>
+						<ele-FolderAdd />
+					</el-icon>
+					新增参数
+				</el-button>
+				<el-button type="success" class="ml10" @click="reloadServer">
+					<el-icon>
+						<ele-FolderAdd />
+					</el-icon>
+					重载配置
+				</el-button>
+			</el-form-item>
       <el-form-item>
-        <el-button type="success" class="ml10" @click="onOpenAddDic">
-          <el-icon>
-            <ele-FolderAdd/>
-          </el-icon>
-          新增参数
-        </el-button>
-        <el-button type="success" class="ml10" @click="reloadServer">
-          <el-icon>
-            <ele-FolderAdd/>
-          </el-icon>
-          重载配置
+        <el-button type="success" class="ml10" @click="countList">
+          刷新列表
         </el-button>
       </el-form-item>
-      <el-table :data="tableData.data" style="width: 100%" stripe border>
-        <el-table-column prop="id" label="ID" width="60">
-          <template #default="scope">
-            {{ scope.row.id }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="realmIp" label="realmIp" width="180"/>
-        <el-table-column prop="realmPort" label="realmPort" width="120"/>
-        <el-table-column prop="realmNum" label="realmNum" width="120"/>
-        <el-table-column prop="realmStep" label="realmStep" width="120"/>
-        <el-table-column prop="routerIp" label="routerIp" width="180"/>
-        <el-table-column prop="routerPort" label="routerPort" width="120"/>
-        <el-table-column prop="routerNum" label="routerNum" width="120"/>
-        <el-table-column prop="routerStep" label="routerStep" width="120"/>
-        <el-table-column>
-          <template #default="scope">
-            <el-button size="small" type="success" @click="onOpenEditDic(scope.row)">修改</el-button>
-            <!--                <el-button size="small" type="danger" @click="delLoginUrl(scope.row.id)">删除</el-button>-->
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-row justify="space-evenly">
-        <el-pagination :hide-on-single-page="true" v-model:page-size="tableData.params.pageSize" :pager-count="5"
-                       v-model:current-page="tableData.params.pageNum" layout="total, prev, pager, next"
-                       :total="tableData.total"
-                       @current-change="handleCurrentChange"/>
-      </el-row>
-    </el-form>
+			<el-table :data="tableData.data" style="width: 100%" stripe border>
+				<el-table-column prop="id" label="ID" width="60">
+					<template #default="scope">
+						{{ scope.row.id }}
+					</template>
+				</el-table-column>
+				<el-table-column prop="realmIp" label="realmIp" width="180" />
+				<el-table-column prop="realmPort" label="realmPort" width="120" />
+				<el-table-column prop="realmNum" label="realmNum" width="120" />
+				<el-table-column prop="realmStep" label="realmStep" width="120" />
+				<el-table-column prop="routerIp" label="routerIp" width="180" />
+				<el-table-column prop="routerPort" label="routerPort" width="120" />
+				<el-table-column prop="routerNum" label="routerNum" width="120" />
+				<el-table-column prop="routerStep" label="routerStep" width="120" />
+				<el-table-column>
+					<template #default="scope">
+						<el-button size="small" type="success" @click="onOpenEditDic(scope.row)">修改</el-button>
+						<!--                <el-button size="small" type="danger" @click="delLoginUrl(scope.row.id)">删除</el-button>-->
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-row justify="space-evenly">
+				<el-pagination
+					:hide-on-single-page="true"
+					v-model:page-size="tableData.params.pageSize"
+					:pager-count="5"
+					v-model:current-page="tableData.params.pageNum"
+					layout="total, prev, pager, next"
+					:total="tableData.total"
+					@current-change="handleCurrentChange"
+				/>
+			</el-row>
+		</el-form>
 
-    <EditConfig ref="editDicRef" @countList="countList"/>
-  </div>
+		<EditConfig ref="editDicRef" @countList="countList" />
+	</div>
 </template>
 
 <script lang="ts">
-import {toRefs, reactive, onMounted, defineComponent, ref} from 'vue';
+import { toRefs, reactive, onMounted, defineComponent, ref } from 'vue';
 import EditConfig from '/@/views/gameLoginUrl/routerList/component/editConfig.vue';
-import {gameReloadServer, gameGetRouter} from "/@/api/game";
-import {PLATFORM} from "/@/api/common/consts";
+import { gameReloadServer, gameGetRouter } from '/@/api/game';
+import { PLATFORM } from '/@/api/common/consts';
 
 // 定义接口来定义对象的类型
 interface TableData {
-  id: number;
-  ip: string;
+	id: number;
+	ip: string;
 }
 
 interface TableDataState {
-  tableData: {
-    data: Array<TableData>;
-    total: number;
-    params: {
-      pageNum: number;
-      pageSize: number;
-    };
-  };
-  platform: Array<{ label: string, value: string }>
+	tableData: {
+		data: Array<TableData>;
+		total: number;
+		params: {
+			pageNum: number;
+			pageSize: number;
+		};
+	};
+	platform: Array<{ label: string; value: string }>;
 }
 
 export default defineComponent({
-  name: 'apiV1GameRouterList',
-  components: {EditConfig},
-  setup() {
-    const editDicRef = ref();
-    const state = reactive<TableDataState>({
-      platform: PLATFORM,
-      tableData: {
-        data: [],
-        total: 0,
-        params: {
-          pageNum: 1,
-          pageSize: 10,
-        },
-      },
-    });
-    // 打开新增字典弹窗
-    const onOpenAddDic = () => {
-      editDicRef.value.openDialog();
-    };
-    // 打开修改字典弹窗
-    const onOpenEditDic = (row: TableData) => {
-      editDicRef.value.openDialog(row);
-    };
-    const countList = () => {
-      gameGetRouter(state.tableData.params).then(res => {
-        console.log("countList:", res);
-        state.tableData.total = res.data.total || 1;
-        state.tableData.data = res.data.list ?? [];
-        console.log("countList:", state.tableData);
-      })
-    };
+	name: 'apiV1GameRouterList',
+	components: { EditConfig },
+	setup() {
+		const editDicRef = ref();
+		const state = reactive<TableDataState>({
+			platform: PLATFORM,
+			tableData: {
+				data: [],
+				total: 0,
+				params: {
+					pageNum: 1,
+					pageSize: 10,
+				},
+			},
+		});
+		// 打开新增字典弹窗
+		const onOpenAddDic = () => {
+			editDicRef.value.openDialog();
+		};
+		// 打开修改字典弹窗
+		const onOpenEditDic = (row: TableData) => {
+			editDicRef.value.openDialog(row);
+		};
+		const countList = () => {
+			gameGetRouter(state.tableData.params).then((res) => {
+				console.log('countList:', res);
+				state.tableData.total = res.data.total || 1;
+				state.tableData.data = res.data.list ?? [];
+				console.log('countList:', state.tableData);
+			});
+		};
 
-    const reloadServer = () => {
-      gameReloadServer({}).then(res => {
-      })
-    };
-    const handleCurrentChange = (val: number) => {
-      state.tableData.params.pageNum = val;
-      countList();
-    };
-    onMounted(() => {
-      countList();
-    });
-    return {
-      editDicRef,
-      handleCurrentChange,
-      countList,
-      onOpenAddDic,
-      onOpenEditDic,
-      // delLoginUrl,
-      reloadServer,
-      ...toRefs(state),
-    };
-  },
+		const reloadServer = () => {
+			gameReloadServer({}).then((res) => {
+				console.log('reloadServer:', res);
+			});
+		};
+		const handleCurrentChange = (val: number) => {
+			state.tableData.params.pageNum = val;
+			countList();
+		};
+		onMounted(() => {
+			countList();
+		});
+		return {
+			editDicRef,
+			handleCurrentChange,
+			countList,
+			onOpenAddDic,
+			onOpenEditDic,
+			// delLoginUrl,
+			reloadServer,
+			...toRefs(state),
+		};
+	},
 });
 </script>
 <style scoped lang="scss">
 .el-form-item {
-  display: -moz-flex;
-  vertical-align: middle;
-  margin-right: 32px;
+	display: -moz-flex;
+	vertical-align: middle;
+	margin-right: 32px;
 }
 
 ::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
-  background: #ffffd5;
+	background: #ffffd5;
 }
 
 ::v-deep .el-table .el-table--enable-row-hover .el-table__body tr:hover > td {
-  background: inherit;
+	background: inherit;
 }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/gameLoginUrl/serverGeneralList/index.vue b/src/views/gameLoginUrl/serverGeneralList/index.vue
index cc57dfc..b9e6ba8 100644
--- a/src/views/gameLoginUrl/serverGeneralList/index.vue
+++ b/src/views/gameLoginUrl/serverGeneralList/index.vue
@@ -5,7 +5,7 @@
     <el-form class="flex-warp" label-position="right">
       <el-form-item>
         <el-button type="success" class="ml10" @click="countList">
-          加载配置
+          刷新列表
         </el-button>
       </el-form-item>
       <el-form-item>
@@ -14,7 +14,7 @@
     </el-form>
 
     <el-form class="" label-position="right">
-      <el-form-item label="后台充值地址" prop="backstageRechargeUrl">
+      <el-form-item label="充值统一地址" prop="backstageRechargeUrl">
         {{ tableData.data[0].backstageRechargeUrl }}
       </el-form-item>
       <el-form-item label="gm白名单地址" prop="gmWhiteListUrl">
diff --git a/src/views/gameLoginUrl/serverVersion/index.vue b/src/views/gameLoginUrl/serverVersion/index.vue
index 76ba935..fdd802a 100644
--- a/src/views/gameLoginUrl/serverVersion/index.vue
+++ b/src/views/gameLoginUrl/serverVersion/index.vue
@@ -5,13 +5,10 @@
         <el-form :inline="true">
           <el-form-item label="选择服务器" prop="serverId">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.param.serverId" class="m-2" placeholder="选择服务器" size="large" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
           </el-form-item>
 
@@ -39,7 +36,7 @@
 
 <script lang="ts">
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
-import {allServerList, ServerList} from "/@/utils/game";
+import {allServerList, ServerCategorize, ServerList} from "/@/utils/game";
 import {getServerVersion} from "/@/api/game";
 import {allGSwitchServer} from "/@/utils/utils";
 
@@ -61,6 +58,7 @@ interface TableDataState {
     }
   };
   servers: object[]
+  serverCategorize: object[]
 }
 
 export default defineComponent({
@@ -74,7 +72,8 @@ export default defineComponent({
           serverId: ""
         }
       },
-      servers: ServerList
+      servers: ServerList,
+      serverCategorize: ServerCategorize
     });
     const onlineList = () => {
       state.tableData.TotalNumber = 0;
diff --git a/src/views/gameMail/send/component/editConfig.vue b/src/views/gameMail/send/component/editConfig.vue
index cef6f39..053cabf 100644
--- a/src/views/gameMail/send/component/editConfig.vue
+++ b/src/views/gameMail/send/component/editConfig.vue
@@ -4,9 +4,7 @@
       <el-form label-width="100px" label-position="right">
         <el-form-item label="服务器:">
           <el-select v-model="tableData.param.serverId" multiple class="m-2" disabled size="large">
-            <el-option v-for="item in servers" :key="item.id+''"
-                       :label="(item.platform==1?'ios ':(item.platform==2?'an ':'先行 '))+ item.id + ' ' +item.name"
-                       :value="item.id+''"/>
+            <el-option v-for="item in servers" :key="item.id+''" :label="item.name" :value="item.id+''"/>
           </el-select>
         </el-form-item>
         <el-form-item label="标题:">
@@ -15,9 +13,6 @@
         <el-form-item label="发件人署名:">
           {{ tableData.param.from }}
         </el-form-item>
-        <!--                <el-form-item label="问候语:">-->
-        <!--                    {{tableData.param.greetings}}-->
-        <!--                </el-form-item>-->
         <el-form-item label="内容:">
           {{ tableData.param.content }}
         </el-form-item>
@@ -102,7 +97,7 @@ export default defineComponent({
     const state = reactive<TableDataState>({
       serverSwitch: 0,
       ItemConfig: AllItemConfigCategory,
-      channel: [{label: "全渠道", value: ""}, {label: "母包渠道-0", value: "0"}],
+      channel: [{label: "全渠道", value: ""}, {label: "母包渠道-0", value: "000000000000"}],
       isShowDialog: false,
       tableData: {
         param: {
diff --git a/src/views/gameMail/send/index.vue b/src/views/gameMail/send/index.vue
index fe9257f..154e2d9 100644
--- a/src/views/gameMail/send/index.vue
+++ b/src/views/gameMail/send/index.vue
@@ -3,13 +3,10 @@
     <el-form size="default" label-width="100px">
       <el-form-item label="服务器" prop="serverId">
         <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-          <el-option label="全部" :value="0"/>
-          <el-option label="ios" :value="1"/>
-          <el-option label="安卓" :value="2"/>
-          <el-option label="其他" :value="3"/>
+          <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
         </el-select>
         <el-select v-model="queryParams.serverId" multiple class="m-2" placeholder="选择服务器" size="large">
-          <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+          <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
         </el-select>
       </el-form-item>
       <!--            <el-form-item label="附件" prop="type">-->
@@ -260,7 +257,7 @@
 import {reactive, toRefs, defineComponent, ref, unref, onMounted} from 'vue';
 import {gameMailSend, gameGetModel, gameUpdateModel} from '/@/api/game';
 import EditConfig from '/@/views/gameMail/send/component/editConfig.vue';
-import {serverList} from "/@/utils/game";
+import {ServerCategorize, serverList} from "/@/utils/game";
 import AllItemConfigCategory from "/@/api/config/AllItemConfigCategory.json";
 import {ElMessage, ElMessageBox} from "element-plus";
 import {Session} from "/@/utils/storage";
@@ -301,6 +298,7 @@ interface TableDataState {
   editModelVisible: boolean;
   sendMail: boolean;
   serverSwitch: number;
+  serverCategorize: object;
 }
 
 export default defineComponent({
@@ -341,11 +339,12 @@ export default defineComponent({
       dropModels: [],
       contentModels: [],
       sendMail: true,
+      serverCategorize: ServerCategorize
     });
     onMounted(() => {
       serverList().then(value => {
         state.servers = value;
-        state.queryParams.serverId[0] = "" + value[0].id;
+        state.queryParams.serverId[0] = value[0].id;
         // console.log(" server : ", state.servers);
       });
       getMailModel(1);
diff --git a/src/views/gameManage/copyUnit/index.vue b/src/views/gameManage/copyUnit/index.vue
index 208718e..8bfe18f 100644
--- a/src/views/gameManage/copyUnit/index.vue
+++ b/src/views/gameManage/copyUnit/index.vue
@@ -1,203 +1,197 @@
 <template>
-  <div class="game-order-container">
-    <el-card shadow="hover" header="复制账号">
-      <template #header>
-        复制账号
-        <el-button v-show="item.copyShow == false" @click="item.copyShow = true" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.copyShow == true" @click="item.copyShow = false" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.copyShow">
-        <div class="game-order-search mb15">
-
-          <el-form label-position="right" label-width="300px" style="max-width: 520px">
-            <el-form-item label="原账号">
-              <el-input v-model="tableData.data.SrcName" placeholder="请填写uid" class="w-50 m-2" clearable/>
-            </el-form-item>
-            <!--            <el-form-item label="原账号服务器">
-                          <el-select v-model="tableData.data.SrcServer" class="m-2" placeholder="选择服务器" filterable>
-                            <el-option v-for="item in servers" :key="item.id" :label="item.name" :value="item.id"/>
-                          </el-select>
-                        </el-form-item>-->
-            <el-form-item>
-              <el-button size="large" type="primary" class="ml10" @click="copyUnit">
-                复制
-              </el-button>
-            </el-form-item>
-            <el-form-item>
-              <el-button size="default" type="primary" @click="onDownload(filename)" v-if="!disabled"
-                         :loading="loading">
-                <div v-if="loading">正在复制账号</div>
-                <div v-else>下载账号json数据</div>
-              </el-button>
-            </el-form-item>
-            <el-form-item inlist="true">
-              <el-button size="default" type="primary" @click="onDownload(storeFilename)" v-if="!disabled"
-                         :loading="loading1">
-                <div v-if="loading1">正在复制仓库</div>
-                <div v-else>下载仓库json数据</div>
-              </el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-    </el-card>
-
-    <el-card shadow="hover" header="载入账号信息">
-      <template #header>
-        上载账号信息
-        <el-button v-show="item.copyShow == false" @click="item.copyShow = true" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.copyShow == true" @click="item.copyShow = false" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.copyShow">
-        <div class="game-order-search mb15">
-          <el-form label-position="right" label-width="300px" style="max-width: 520px">
-            <el-upload
-                class="upload-demo"
-                :action="baseURL+'api/v1/pub/upload/singleFile'"
-                :on-preview="handlePreview"
-                :on-remove="handleRemove"
-                :on-change="handleChange"
-                :before-remove="beforeRemove"
-                multiple
-                :limit="2"
-                :on-exceed="handleExceed"
-                :file-list="fileList">
-              <el-button size="small" type="primary">点击上传</el-button>
-              <div slot="tip" class="el-upload__tip">只能上传Json文件</div>
-            </el-upload>
-            <el-form-item label="文件名称">
-              <el-select v-model="tableData.data.filename" class="m-2" placeholder="选择载入文件" filterable>
-                <el-option v-for="item in tableData.fileNames" :key="item" :label="item" :value="item"/>
+	<div class="game-order-container">
+		<el-card shadow="hover" header="复制账号">
+			<template #header>
+				复制账号
+				<el-button v-show="item.copyShow == false" @click="item.copyShow = true" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.copyShow == true" @click="item.copyShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.copyShow">
+				<div class="game-order-search mb15">
+					<el-form label-position="right" label-width="300px" style="max-width: 520px">
+						<el-form-item label="原账号">
+							<el-input v-model="tableData.data.SrcName" placeholder="请填写uid" class="w-50 m-2" clearable />
+						</el-form-item>
+<!--						<el-form-item label="原账号服务器">-->
+<!--							<el-select v-model="tableData.data.SrcServer" class="m-2" placeholder="选择服务器" filterable>-->
+<!--								<el-option v-for="item in servers" :key="item.id" :label="item.name" :value="item.id" />-->
+<!--							</el-select>-->
+<!--						</el-form-item>-->
+            <el-form-item label="原账号服务器" prop="SrcServer">
+              <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+                <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
               </el-select>
-              <!--              <el-input v-model="tableData.data.filename" placeholder="请填写filename" class="w-50 m-2" clearable/>-->
-            </el-form-item>
-            <el-form-item label="仓库文件名称">
-              <el-select v-model="tableData.data.storeFilename" class="m-2" placeholder="选择载入文件" filterable>
-                <el-option v-for="item in tableData.fileNames" :key="item" :label="item" :value="item"/>
+              <el-select v-model="tableData.data.SrcServer" class="m-2" placeholder="选择服务器" size="large" filterable>
+                <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
               </el-select>
-              <!--              <el-input v-model="tableData.data.filename" placeholder="请填写filename" class="w-50 m-2" clearable/>-->
-            </el-form-item>
-            <el-form-item label="目标账号">
-              <el-input v-model="tableData.data.DestName" placeholder="请填写uid" class="w-50 m-2" clearable/>
             </el-form-item>
-            <!--            <el-form-item label="目标服务器">-->
-            <!--              <el-select v-model="tableData.data.DestServer" class="m-2" placeholder="选择服务器" filterable>-->
-            <!--                <el-option v-for="item in servers" :key="item.id" :label="item.name" :value="item.id"/>-->
-            <!--              </el-select>-->
-            <!--            </el-form-item>-->
-            <el-form-item>
-              <el-button size="large" type="primary" class="ml10" @click="updateUnit">
-                更新
-              </el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-    </el-card>
-    <el-card shadow="hover" header="删除账号">
-      <template #header>
-        删除账号
-        <el-button v-show="item.delShow == false" @click="item.delShow = true" class="button-caret" type="text">
-          <el-icon>
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.delShow == true" @click="item.delShow = false" class="button-caret" type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.delShow">
-        <div class="game-order-search mb15">
-          <el-form label-position="right" label-width="300px" style="max-width: 520px">
-            <el-form-item label="账号">
-              <el-input v-model="tableData.del.SrcName" placeholder="" class="w-50 m-2" clearable/>
-            </el-form-item>
-            <el-form-item label="账号服务器">
+						<el-form-item>
+							<el-button size="large" type="primary" class="ml10" @click="copyUnit"> 复制 </el-button>
+						</el-form-item>
+						<el-form-item>
+							<el-button size="default" type="primary" @click="onDownload(filename)" v-if="!disabled" :loading="loading">
+								<div v-if="loading">正在复制账号</div>
+								<div v-else>下载账号json数据</div>
+							</el-button>
+						</el-form-item>
+						<el-form-item inlist="true">
+							<el-button size="default" type="primary" @click="onDownload(storeFilename)" v-if="!disabled" :loading="loading1">
+								<div v-if="loading1">正在复制仓库</div>
+								<div v-else>下载仓库json数据</div>
+							</el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+			</div>
+		</el-card>
+
+		<el-card shadow="hover" header="载入账号信息">
+			<template #header>
+				上载账号信息
+				<el-button v-show="item.copyShow == false" @click="item.copyShow = true" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.copyShow == true" @click="item.copyShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.copyShow">
+				<div class="game-order-search mb15">
+					<el-form label-position="right" label-width="300px" style="max-width: 520px">
+						<el-upload
+							class="upload-demo"
+							:action="baseURL + 'api/v1/pub/upload/singleFile'"
+							:on-preview="handlePreview"
+							:on-remove="handleRemove"
+							:on-change="handleChange"
+							:before-remove="beforeRemove"
+							multiple
+							:limit="2"
+							:on-exceed="handleExceed"
+							:file-list="fileList"
+						>
+							<el-button size="small" type="primary">点击上传</el-button>
+							<div slot="tip" class="el-upload__tip">只能上传Json文件</div>
+						</el-upload>
+						<el-form-item label="文件名称">
+							<el-select v-model="tableData.data.filename" class="m-2" placeholder="选择载入文件" filterable>
+								<el-option v-for="item in tableData.fileNames" :key="item" :label="item" :value="item" />
+							</el-select>
+							<!--              <el-input v-model="tableData.data.filename" placeholder="请填写filename" class="w-50 m-2" clearable/>-->
+						</el-form-item>
+						<el-form-item label="仓库文件名称">
+							<el-select v-model="tableData.data.storeFilename" class="m-2" placeholder="选择载入文件" filterable>
+								<el-option v-for="item in tableData.fileNames" :key="item" :label="item" :value="item" />
+							</el-select>
+							<!--              <el-input v-model="tableData.data.filename" placeholder="请填写filename" class="w-50 m-2" clearable/>-->
+						</el-form-item>
+						<el-form-item label="目标账号">
+							<el-input v-model="tableData.data.DestName" placeholder="请填写uid" class="w-50 m-2" clearable />
+						</el-form-item>
+            <el-form-item label="目标服务器" prop="DestServer">
               <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-                <el-option label="全部" :value="0"/>
-                <el-option label="ios" :value="1"/>
-                <el-option label="安卓" :value="2"/>
-                <el-option label="其他" :value="3"/>
+                <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
               </el-select>
-              <el-select v-model="tableData.del.serverId" class="m-2" placeholder="选择服务器" filterable>
-                <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id+''"/>
+              <el-select v-model="tableData.data.DestServer" class="m-2" placeholder="选择服务器" size="large" filterable>
+                <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id"/>
               </el-select>
             </el-form-item>
-            <el-form-item>
-              <el-button type="primary" class="ml10" @click="delAccount">
-                删除账号
-              </el-button>
-            </el-form-item>
-          </el-form>
-        </div>
-      </div>
-    </el-card>
-    <el-card shadow="hover">
-      <template #header>
-        修改登录密码
-        <el-button v-show="item.pwdShow == false" @click="item.pwdShow = true" class="button-caret" type="text">
-          <el-icon>
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.pwdShow == true" @click="item.pwdShow = false" class="button-caret" type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div class="game-order-search mb15" v-show="item.pwdShow">
-        <el-form label-position="right" label-width="300px" style="max-width: 520px">
-          <el-form-item label="account:">
-            <el-input v-model="tableData.password.account" placeholder="" class="w-50 m-2" size="large"
-                      clearable/>
-          </el-form-item>
-          <el-form-item label="账号服务器">
-            <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
-            </el-select>
-            <el-select v-model="tableData.password.serverId" class="m-2" placeholder="选择服务器" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id+''"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="密码:">
-            <el-input v-model="tableData.password.pwd" placeholder="" class="w-50 m-2" size="large"
-                      clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="large" type="primary" class="ml10" @click="resetPwd">
-              修改登录密码
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
-    <!--    <el-card shadow="hover">
+						<!--            <el-form-item label="目标服务器">-->
+						<!--              <el-select v-model="tableData.data.DestServer" class="m-2" placeholder="选择服务器" filterable>-->
+						<!--                <el-option v-for="item in servers" :key="item.id" :label="item.name" :value="item.id"/>-->
+						<!--              </el-select>-->
+						<!--            </el-form-item>-->
+						<el-form-item>
+							<el-button size="large" type="primary" class="ml10" @click="updateUnit"> 更新 </el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+			</div>
+		</el-card>
+		<el-card shadow="hover" header="删除账号">
+			<template #header>
+				删除账号
+				<el-button v-show="item.delShow == false" @click="item.delShow = true" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.delShow == true" @click="item.delShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.delShow">
+				<div class="game-order-search mb15">
+					<el-form label-position="right" label-width="300px" style="max-width: 520px">
+						<el-form-item label="账号">
+							<el-input v-model="tableData.del.SrcName" placeholder="" class="w-50 m-2" clearable />
+						</el-form-item>
+						<el-form-item label="账号服务器">
+							<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+								<el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value" />
+							</el-select>
+							<el-select v-model="tableData.del.serverId" class="m-2" placeholder="选择服务器" filterable>
+								<el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id" />
+							</el-select>
+						</el-form-item>
+						<el-form-item>
+							<el-button type="primary" class="ml10" @click="delAccount"> 删除账号 </el-button>
+						</el-form-item>
+					</el-form>
+				</div>
+			</div>
+		</el-card>
+		<el-card shadow="hover">
+			<template #header>
+				修改登录密码
+				<el-button v-show="item.pwdShow == false" @click="item.pwdShow = true" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.pwdShow == true" @click="item.pwdShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div class="game-order-search mb15" v-show="item.pwdShow">
+				<el-form label-position="right" label-width="300px" style="max-width: 520px">
+					<el-form-item label="account:">
+						<el-input v-model="tableData.password.account" placeholder="" class="w-50 m-2" size="large" clearable />
+					</el-form-item>
+					<el-form-item label="账号服务器">
+						<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+							<el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+						<el-select v-model="tableData.password.serverId" class="m-2" placeholder="选择服务器" filterable>
+							<el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="密码:">
+						<el-input v-model="tableData.password.pwd" placeholder="" class="w-50 m-2" size="large" clearable />
+					</el-form-item>
+					<el-form-item>
+						<el-button size="large" type="primary" class="ml10" @click="resetPwd"> 修改登录密码 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-card>
+		<!--    <el-card shadow="hover">
           <template #header>
             删除资源
             <el-button v-show="item.resourceShow == false" @click="item.resourceShow = true" class="button-caret"
@@ -231,250 +225,253 @@
             </el-form>
           </div>
         </el-card>-->
-  </div>
-
+	</div>
 </template>
 
 <script lang="ts">
-import {toRefs, reactive, onMounted, defineComponent, warn,} from 'vue';
+import { toRefs, reactive, onMounted, defineComponent, warn } from 'vue';
 import {
-  gameGMClearResource,
-  gameGMCopyUnit,
-  gameGMEditUnit,
-  gameGMUpdateUnit,
-  gameGMDelAccount,
-  gameResetPwd, giftExchangeExists
-} from "/@/api/game";
-import {AllServerList, serverList} from "/@/utils/game";
-import {ElMessage, ElMessageBox} from "element-plus/es";
-import {gSwitchServer} from "/@/utils/utils";
+	gameGMClearResource,
+	gameGMCopyUnit,
+	gameGMUpdateUnit,
+	gameGMDelAccount,
+	gameResetPwd,
+	giftExchangeExists,
+} from '/@/api/game';
+import { AllServerList, ServerCategorize, serverList } from '/@/utils/game';
+import { ElMessage, ElMessageBox } from 'element-plus/es';
+import { gSwitchServer } from '/@/utils/utils';
 
-const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL
+const baseURL: string | undefined | boolean = import.meta.env.VITE_API_URL;
 
 interface TableData {
-  filename: string
-  storeFilename: string
-  SrcName: number
-  SrcServer: number
-  DestName: string
-  DestServer: number
+	filename: string;
+	storeFilename: string;
+	SrcName: number;
+	SrcServer: number;
+	DestName: string;
+	DestServer: number;
 }
 
 interface DelData {
-  SrcName: string
-  serverId: number
+	SrcName: string;
+	serverId: number;
 }
 
 interface TableDataState {
-  item: { copyShow: boolean, delShow: boolean, pwdShow: boolean, resourceShow: boolean }
-  tableData: {
-    data: TableData
-    del: DelData
-    password: {
-      account: string
-      serverId: number
-      pwd: string
-    };
-    resource: {
-      account: string,
-      serverId: number
-    }
-    fileNames: string[];
-  };
-  servers: object[];
-  disabled: boolean,
-  loading: boolean,
-  loading1: boolean,
-  fileList: object[];
-  filename: string;
-  storeFilename: string;
-  serverSwitch: number;
+	item: { copyShow: boolean; delShow: boolean; pwdShow: boolean; resourceShow: boolean };
+	tableData: {
+		data: TableData;
+		del: DelData;
+		password: {
+			account: string;
+			serverId: number;
+			pwd: string;
+		};
+		resource: {
+			account: string;
+			serverId: number;
+		};
+		fileNames: string[];
+	};
+	servers: object[];
+	disabled: boolean;
+	loading: boolean;
+	loading1: boolean;
+	fileList: object[];
+	filename: string;
+	storeFilename: string;
+	serverSwitch: number;
+	serverCategorize: object;
 }
 
 var timeInterval;
 var timeInterval1;
 export default defineComponent({
-  name: 'apiV1GameCopyUnit',
-  setup() {
-    // const {proxy} = getCurrentInstance() as any;
-
-    const state = reactive<TableDataState>({
-      serverSwitch: 0,
-      fileList: [],
-      baseURL: baseURL,
-      item: {copyShow: true, delShow: false, pwdShow: false, resourceShow: false},
-      tableData: {
-        data: {
-          SrcName: "", SrcServer: ""
-        },
-        del: {
-          SrcName: "",
-          serverId: "",
-        },
-        password: {
-          account: "",
-          serverId: "",
-          pwd: "",
-        },
-        resource: {
-          account: "",
-        },
-        fileNames: []
-      },
-      servers: AllServerList,
-      disabled: true,
-      loading: false,
-      loading1: false,
-      filename: "",
-      storeFilename: ""
-    });
-    const handleRemove = (file, fileList) => {
-      console.log("handleRemove: ", file, fileList);
-    };
-    const handlePreview = (file) => {
-      console.log("handlePreview: ", file);
-    };
-    const handleExceed = (files, fileList) => {
-      console.log("handleExceed: ", files, fileList);
-      warn(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-    };
-    const handleChange = (files, fileList) => {
-      console.log("handleChange: ", files, fileList);
-      if (state.tableData.fileNames.indexOf(files.name) >= 0) {
-        return;
-      }
-      warn(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
-      state.tableData.data.filename = files.name;
-      state.tableData.fileNames.push(files.name);
-    };
-    const beforeRemove = (file, fileList) => {
-      console.log("beforeRemove: ", file, fileList);
-      return confirm(`确定移除 ${file.name}？ ${fileList.length}`,);
-    };
-    const copyUnit = () => {
-      console.log("state.tableData.data: ", state.tableData.data);
-      // ElMessage.success('暂停使用');
-      // return
-      gameGMCopyUnit({
-        SrcName: state.tableData.data.SrcName,
-        SrcServer: state.tableData.data.SrcServer
-      }).then((res) => {
-        ElMessage.success('修改成功');
-        console.log("copy: ", res);
-        state.tableData.data.filename = res.data.filename;
-        state.tableData.data.storeFilename = res.data.storeFilename;
-        state.tableData.fileNames.push(res.data.filename);
-        state.tableData.fileNames.push(res.data.storeFilename);
-        if (res.data.filename != "") {
-          state.filename = res.data.filename;
-          state.storeFilename = res.data.storeFilename;
-          state.loading = true
-          state.loading1 = true
-          state.disabled = false
-          console.log("gameRandomGenerateCode: ", res, state.filename, state.storeFilename);
-          timeInterval = setInterval(function () {
-            checkGiftExchangeExists();
-          }, 1000);
-          timeInterval1 = setInterval(function () {
-            checkGiftExchangeExists1();
-          }, 1000);
-        }
-      }).finally(() => {
-      })
-    };
-
-    const updateUnit = () => {
-      console.log("state.tableData.data: ", state.tableData.data);
-      // ElMessage.success('暂停使用');
-      // return
-      gameGMUpdateUnit({
-        filename: state.tableData.data.filename,
-        storeFilename: state.tableData.data.storeFilename,
-        DestName: state.tableData.data.DestName,
-      }).then((res) => {
-        ElMessage.success('修改成功');
-        console.log("update: ", res);
-      }).finally(() => {
-      })
-    };
-    const delAccount = () => {
-      console.log("state.tableData.data: ", state.tableData.del);
-      ElMessageBox.confirm(`此操作将删除账号：“${state.tableData.del.SrcName}”，是否继续?`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
-        gameGMDelAccount(state.tableData.del).then(() => {
-          ElMessage.success('删除成功');
-        }).finally(() => {
-        })
-      })
-    };
-    const resetPwd = () => {
-      gameResetPwd(state.tableData.password).then(() => {
-        ElMessage.success('修改密码成功！');
-      }).finally(() => {
-      })
-    };
-    const clearResource = () => {
-      console.log("state.tableData.resource: ", state.tableData.resource);
-      gameGMClearResource(state.tableData.resource).then(() => {
-        ElMessage.success('删除成功');
-      }).finally(() => {
-      })
-    };
-    onMounted(() => {
-      //	initTableData();
-      serverList().then(res => {
-        state.servers = res;
-        // console.log(" server : ", state.servers);
-      })
-    });
-    const checkGiftExchangeExists = () => {
-      giftExchangeExists({"file": state.filename}).then(response => {
-        console.log("checkGiftExchangeExists", state.filename, response);
-        if (response.data.state == 1) {
-          clearInterval(timeInterval);
-          state.loading = false
-        }
-      })
-    };
-    const checkGiftExchangeExists1 = () => {
-      giftExchangeExists({"file": state.storeFilename}).then(response => {
-        console.log("checkGiftExchangeExists1", state.storeFilename, response);
-        if (response.data.state == 1) {
-          clearInterval(timeInterval1);
-          state.loading1 = false
-        }
-      })
-    };
-    const onDownload = (file: string) => {
-      if (file) {
-        window.open(baseURL + 'upload_file?filename=' + file);
-      }
+	name: 'apiV1GameCopyUnit',
+	setup() {
+		const state = reactive<TableDataState>({
+			serverSwitch: 0,
+			fileList: [],
+			baseURL: baseURL,
+			item: { copyShow: true, delShow: false, pwdShow: false, resourceShow: false },
+			tableData: {
+				data: {
+					SrcName: '',
+					SrcServer: '',
+				},
+				del: {
+					SrcName: '',
+					serverId: '',
+				},
+				password: {
+					account: '',
+					serverId: '',
+					pwd: '',
+				},
+				resource: {
+					account: '',
+				},
+				fileNames: [],
+			},
+			servers: AllServerList,
+			disabled: true,
+			loading: false,
+			loading1: false,
+			filename: '',
+			storeFilename: '',
+			serverCategorize: ServerCategorize,
+		});
+		const handleRemove = (file, fileList) => {
+			console.log('handleRemove: ', file, fileList);
+		};
+		const handlePreview = (file) => {
+			console.log('handlePreview: ', file);
+		};
+		const handleExceed = (files, fileList) => {
+			console.log('handleExceed: ', files, fileList);
+			warn(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+		};
+		const handleChange = (files, fileList) => {
+			console.log('handleChange: ', files, fileList);
+			if (state.tableData.fileNames.indexOf(files.name) >= 0) {
+				return;
+			}
+			warn(`当前限制选择 1 个文件，本次选择了 ${files.length} 个文件，共选择了 ${files.length + fileList.length} 个文件`);
+			state.tableData.data.filename = files.name;
+			state.tableData.fileNames.push(files.name);
+		};
+		const beforeRemove = (file, fileList) => {
+			console.log('beforeRemove: ', file, fileList);
+			return confirm(`确定移除 ${file.name}？ ${fileList.length}`);
+		};
+		const copyUnit = () => {
+			console.log('state.tableData.data: ', state.tableData.data);
+			// ElMessage.success('暂停使用');
+			// return
+			gameGMCopyUnit({
+				SrcName: state.tableData.data.SrcName,
+				SrcServer: state.tableData.data.SrcServer,
+			}).then((res) => {
+					ElMessage.success('修改成功');
+					console.log('copy: ', res);
+					state.tableData.data.filename = res.data.filename;
+					state.tableData.data.storeFilename = res.data.storeFilename;
+					state.tableData.fileNames.push(res.data.filename);
+					state.tableData.fileNames.push(res.data.storeFilename);
+					if (res.data.filename != '') {
+						state.filename = res.data.filename;
+						state.storeFilename = res.data.storeFilename;
+						state.loading = true;
+						state.loading1 = true;
+						state.disabled = false;
+						console.log('gameRandomGenerateCode: ', res, state.filename, state.storeFilename);
+						timeInterval = setInterval(function () {
+							checkGiftExchangeExists();
+						}, 1000);
+						timeInterval1 = setInterval(function () {
+							checkGiftExchangeExists1();
+						}, 1000);
+					}
+				})
+				.finally(() => {});
+		};
 
-      // state.disabled = true;
-    }
-    // 打开修改字典弹窗
-    const switchServer = () => {
-      return gSwitchServer(state.serverSwitch, state.servers)
+		const updateUnit = () => {
+			console.log('state.tableData.data: ', state.tableData.data);
+			// ElMessage.success('暂停使用');
+			// return
+			gameGMUpdateUnit({
+				filename: state.tableData.data.filename,
+				storeFilename: state.tableData.data.storeFilename,
+				DestName: state.tableData.data.DestName,
+			})
+				.then((res) => {
+					ElMessage.success('修改成功');
+					console.log('update: ', res);
+				})
+				.finally(() => {});
+		};
+		const delAccount = () => {
+			console.log('state.tableData.data: ', state.tableData.del);
+			ElMessageBox.confirm(`此操作将删除账号：“${state.tableData.del.SrcName}”，是否继续?`, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			}).then(() => {
+				gameGMDelAccount(state.tableData.del)
+					.then(() => {
+						ElMessage.success('删除成功');
+					})
+					.finally(() => {});
+			});
+		};
+		const resetPwd = () => {
+			gameResetPwd(state.tableData.password)
+				.then(() => {
+					ElMessage.success('修改密码成功！');
+				})
+				.finally(() => {});
+		};
+		const clearResource = () => {
+			console.log('state.tableData.resource: ', state.tableData.resource);
+			gameGMClearResource(state.tableData.resource)
+				.then(() => {
+					ElMessage.success('删除成功');
+				})
+				.finally(() => {});
+		};
+		onMounted(() => {
+			//	initTableData();
+			serverList().then((res) => {
+				state.servers = res;
+				// console.log(" server : ", state.servers);
+			});
+		});
+		const checkGiftExchangeExists = () => {
+			giftExchangeExists({ file: state.filename }).then((response) => {
+				console.log('checkGiftExchangeExists', state.filename, response);
+				if (response.data.state == 1) {
+					clearInterval(timeInterval);
+					state.loading = false;
+				}
+			});
+		};
+		const checkGiftExchangeExists1 = () => {
+			giftExchangeExists({ file: state.storeFilename }).then((response) => {
+				console.log('checkGiftExchangeExists1', state.storeFilename, response);
+				if (response.data.state == 1) {
+					clearInterval(timeInterval1);
+					state.loading1 = false;
+				}
+			});
+		};
+		const onDownload = (file: string) => {
+			if (file) {
+				window.open(baseURL + 'upload_file?filename=' + file);
+			}
 
-    };
-    return {
-      switchServer,
-      onDownload,
-      handleRemove,
-      handleChange,
-      handlePreview,
-      handleExceed,
-      beforeRemove,
-      resetPwd,
-      copyUnit,
-      updateUnit,
-      delAccount,
-      clearResource,
-      ...toRefs(state),
-    };
-  },
+			// state.disabled = true;
+		};
+		// 打开修改字典弹窗
+		const switchServer = () => {
+			return gSwitchServer(state.serverSwitch, state.servers);
+		};
+		return {
+			switchServer,
+			onDownload,
+			handleRemove,
+			handleChange,
+			handlePreview,
+			handleExceed,
+			beforeRemove,
+			resetPwd,
+			copyUnit,
+			updateUnit,
+			delAccount,
+			clearResource,
+			...toRefs(state),
+		};
+	},
 });
 </script>
diff --git a/src/views/gameManage/gm/index.vue b/src/views/gameManage/gm/index.vue
index 32b1ea6..55284fc 100644
--- a/src/views/gameManage/gm/index.vue
+++ b/src/views/gameManage/gm/index.vue
@@ -11,14 +11,11 @@
           </el-form-item>
           <el-form-item label="区服" v-if="tableData.data.type==2">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.data.serverId" class="w-50 m-2" placeholder="选择区服" size="large"
                        filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-form-item label="渠道" v-if="tableData.data.type==2">
@@ -80,7 +77,7 @@
 <script lang="ts">
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {gameChangeGm, gameGmSearch, gameListGm, gameSetclientgm} from "/@/api/game";
-import {channelList, serverList} from "/@/utils/game";
+import {channelList, ServerCategorize, serverList} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 import {ElMessage} from "element-plus/es";
 
@@ -113,6 +110,7 @@ interface TableDataState {
   channels: object;
   gmStates: object;
   serverSwitch: number;
+  serverCategorize: object;
 }
 
 export default defineComponent({
@@ -155,7 +153,7 @@ export default defineComponent({
           label: '黑名单',
         },
       ],
-
+      serverCategorize: ServerCategorize,
     });
     const gmSearch = () => {
       let query = {type: state.tableData.data.type, uid: state.tableData.data.uid};
diff --git a/src/views/gameManage/keep/index.vue b/src/views/gameManage/keep/index.vue
index b08a453..07c2d58 100644
--- a/src/views/gameManage/keep/index.vue
+++ b/src/views/gameManage/keep/index.vue
@@ -17,13 +17,10 @@
           </el-form-item>
           <el-form-item label="选择服务器" prop="serverId">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="queryParams.server" class="m-2" placeholder="选择服务器" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-form-item label="注册日期" prop="createTime">
@@ -229,7 +226,7 @@
 import {ElMessage} from 'element-plus';
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {keepAccount} from "/@/api/game/index";
-import {allChannelList, allServerList} from "/@/utils/game";
+import {allChannelList, allServerList, ServerCategorize} from "/@/utils/game";
 import {DATE_LIST_KEEP, DATE_NAMES} from "/@/api/common/consts";
 import {gSwitchServer} from "/@/utils/utils";
 
@@ -269,6 +266,7 @@ interface TableDataState {
   dateNames: object;
   dateList: object;
   serverSwitch: number;
+  serverCategorize: object;
 }
 
 export default defineComponent({
@@ -294,6 +292,7 @@ export default defineComponent({
       channels: [],
       dateNames: DATE_NAMES,
       dateList: DATE_LIST_KEEP,
+      serverCategorize: ServerCategorize,
     });
 
     const getRemain = () => {
diff --git a/src/views/gameManage/live/index.vue b/src/views/gameManage/live/index.vue
index 1aa1ee4..2135f50 100644
--- a/src/views/gameManage/live/index.vue
+++ b/src/views/gameManage/live/index.vue
@@ -17,13 +17,10 @@
           </el-form-item>
           <el-form-item label="选择区服" prop="server">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="queryParams.server" class="m-2" placeholder="选择区服" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-form-item label="起始日期" prop="createTime" v-show="queryParams.modelType==1">
@@ -139,7 +136,7 @@
 //import { ElMessageBox, ElMessage } from 'element-plus';
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {liveAccount, registerCount} from "/@/api/game/index";
-import {allChannelList, allServerList} from "/@/utils/game";
+import {allChannelList, allServerList, ServerCategorize} from "/@/utils/game";
 import {ElMessage} from "element-plus";
 import {gSwitchServer, getDaysBetween} from "/@/utils/utils";
 import {DATE_NAMES1} from "/@/api/common/consts";
@@ -183,6 +180,7 @@ interface TableDataState {
   allChannels: object[];
   channels: object[];
   dateNames: object;
+  serverCategorize: object;
 }
 
 export default defineComponent({
@@ -212,6 +210,7 @@ export default defineComponent({
       allChannels: [],
       channels: [],
       dateNames: DATE_NAMES1,
+      serverCategorize: ServerCategorize,
     });
 
     const getRemain = () => {
diff --git a/src/views/gameManage/migrate/index.vue b/src/views/gameManage/migrate/index.vue
index 191384e..91f5876 100644
--- a/src/views/gameManage/migrate/index.vue
+++ b/src/views/gameManage/migrate/index.vue
@@ -1,151 +1,148 @@
 <template>
-  <div class="game-account-container">
-    <el-card shadow="hover">
-      <div class="game-account-search mb15">
-        <el-form :inline="true">
-          <el-form-item label="源UID:">
-            <el-input size="default" v-model="tableData.param.srcUid" placeholder="输入源UID" class="w-50 m-2"
-                      clearable/>
-          </el-form-item>
-          <el-form-item label="源服务器" prop="serverId">
-            <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
-            </el-select>
-            <el-select v-model="tableData.param.srcServer" class="m-2" placeholder="选择区服" size="large" filterable>
-              <el-option v-for="item in servers" :key="item.id+''"
-                         :label="(item.platform==1?'ios ':(item.platform==2?'an ':'先行 '))+item.id + ' ' +item.name"
-                         :value="item.id+''"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="转移UID:">
-            <el-input size="default" v-model="tableData.param.destUid" placeholder="输入转移UID"
-                      class="w-50 m-2" clearable/>
-          </el-form-item>
-          <el-form-item label="转移服务器" prop="serverId">
-            <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
-            </el-select>
-            <el-select v-model="tableData.param.destServer" class="m-2" placeholder="选择区服" size="large" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="roleList">
-              <el-icon>
-                <ele-Search/>
-              </el-icon>
-              查询
-            </el-button>
-            <el-button size="default" type="primary" class="ml10" @click="roleList">
-              确定迁移
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="tableData.data" style="width: 100%">
-        <el-table-column type="index" label="序号" width="60"/>
-        <el-table-column prop="uid" label="uid" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="account" label="账号" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="name" label="桃谷名字" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="boom" label="繁荣度" show-overflow-tooltip></el-table-column>
-        <el-table-column prop="villageScale" label="规模" show-overflow-tooltip></el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+	<div class="game-account-container">
+		<el-card shadow="hover">
+			<div class="game-account-search mb15">
+				<el-form :inline="true">
+					<el-form-item label="源UID:">
+						<el-input size="default" v-model="tableData.param.srcUid" placeholder="输入源UID" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item label="源服务器" prop="serverId">
+						<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+							<el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+						<el-select v-model="tableData.param.srcServer" class="m-2" placeholder="选择区服" size="large" filterable>
+							<el-option
+								v-for="item in servers"
+								:key="item.id + ''"
+								:label="(item.platform == 1 ? 'ios ' : item.platform == 2 ? 'an ' : '先行 ') + item.id + ' ' + item.name"
+								:value="item.id + ''"
+							/>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="转移UID:">
+						<el-input size="default" v-model="tableData.param.destUid" placeholder="输入转移UID" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item label="转移服务器" prop="serverId">
+						<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+							<el-option label="全部" :value="0" />
+							<el-option label="ios" :value="1" />
+							<el-option label="安卓" :value="2" />
+							<el-option label="其他" :value="3" />
+						</el-select>
+						<el-select v-model="tableData.param.destServer" class="m-2" placeholder="选择区服" size="large" filterable>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="roleList">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+						<el-button size="default" type="primary" class="ml10" @click="roleList"> 确定迁移 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-table :data="tableData.data" style="width: 100%">
+				<el-table-column type="index" label="序号" width="60" />
+				<el-table-column prop="uid" label="uid" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="account" label="账号" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="name" label="桃谷名字" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="boom" label="繁荣度" show-overflow-tooltip></el-table-column>
+				<el-table-column prop="villageScale" label="规模" show-overflow-tooltip></el-table-column>
+			</el-table>
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts">
-import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
-import {serverList} from "/@/utils/game";
-import {gameAccountList} from "/@/api/game";
-import {gSwitchServer} from "/@/utils/utils";
+import { toRefs, reactive, onMounted, defineComponent } from 'vue';
+import { ServerCategorize, serverList } from '/@/utils/game';
+import { gameAccountList } from '/@/api/game';
+import { gSwitchServer } from '/@/utils/utils';
 
 // 定义接口来定义对象的类型
 interface TableData {
-  uid: number;
-  account: string;
-  name: string;
-  boom: number;
-  villageScale: number;
+	uid: number;
+	account: string;
+	name: string;
+	boom: number;
+	villageScale: number;
 }
 
 interface TableDataState {
-  serverSwitch: number;
-  tableData: {
-    data: Array<TableData>;
-    param: {
-      srcUid: number;
-      srcServer: string;
-      destUid: number;
-      destServer: string
-    }
-  };
-  servers: object[]
+	serverSwitch: number;
+	tableData: {
+		data: Array<TableData>;
+		param: {
+			srcUid: number;
+			srcServer: string;
+			destUid: number;
+			destServer: string;
+		};
+	};
+	servers: object[];
+	serverCategorize: object[];
 }
 
 export default defineComponent({
-  name: 'apiV1GameAccountList',
-  setup() {
-    const state = reactive<TableDataState>({
-      serverSwitch: 0,
-      tableData: {
-        data: [],
-        param: {
-          srcUid: 0,
-          srcServer: "",
-          destUid: 0,
-          destServer: ""
-        },
-      },
-      servers: []
-    });
-    const switchServer = () => {
-      return gSwitchServer(state.serverSwitch, state.servers)
+	name: 'apiV1GameAccountList',
+	setup() {
+		const state = reactive<TableDataState>({
+			serverSwitch: 0,
+			tableData: {
+				data: [],
+				param: {
+					srcUid: 0,
+					srcServer: '',
+					destUid: 0,
+					destServer: '',
+				},
+			},
+			servers: [],
+			serverCategorize: ServerCategorize,
+		});
+		const switchServer = () => {
+			return gSwitchServer(state.serverSwitch, state.servers);
+		};
+		const roleList = () => {
+			const data: Array<TableData> = [];
+			gameAccountList(state.tableData.param).then((res) => {
+				const list = res.data.list ?? [];
+				list.map((item: TableData) => {
+					data.push({
+						uid: item.uid,
+						account: item.account,
+						name: item.name,
+						boom: item.boom,
+						villageScale: item.villageScale,
+					});
+				});
+				state.tableData.data = data;
+			});
+		};
 
-    };
-    const roleList = () => {
-      const data: Array<TableData> = [];
-      gameAccountList(state.tableData.param).then(res => {
-        const list = res.data.list ?? []
-        list.map((item: TableData) => {
-          data.push({
-            uid: item.uid,
-            account: item.account,
-            name: item.name,
-            boom: item.boom,
-            villageScale: item.villageScale,
-          });
-        });
-        state.tableData.data = data;
-      })
-    };
-
-    // // 分页改变
-    // const onHandleSizeChange = (val: number) => {
-    // 	state.tableData.param.pageSize = val;
-    // };
-    // // 分页改变
-    // const onHandleCurrentChange = (val: number) => {
-    // 	state.tableData.param.pageNum = val;
-    // };
-    // 页面加载时
-    onMounted(() => {
-      serverList().then(value => {
-        state.servers = value;
-        // console.log(" server : ", state.servers);
-      });
-    });
-    return {
-      switchServer,
-      roleList,
-      ...toRefs(state),
-    };
-  },
+		// // 分页改变
+		// const onHandleSizeChange = (val: number) => {
+		// 	state.tableData.param.pageSize = val;
+		// };
+		// // 分页改变
+		// const onHandleCurrentChange = (val: number) => {
+		// 	state.tableData.param.pageNum = val;
+		// };
+		// 页面加载时
+		onMounted(() => {
+			serverList().then((value) => {
+				state.servers = value;
+				// console.log(" server : ", state.servers);
+			});
+		});
+		return {
+			switchServer,
+			roleList,
+			...toRefs(state),
+		};
+	},
 });
 </script>
diff --git a/src/views/gameManage/register/index.vue b/src/views/gameManage/register/index.vue
index 6dc67dd..adeb8f6 100644
--- a/src/views/gameManage/register/index.vue
+++ b/src/views/gameManage/register/index.vue
@@ -11,13 +11,10 @@
           </el-form-item>
           <el-form-item label="选择区服" prop="server">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.param.server" class="m-2" placeholder="选择区服" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-form-item label="起始日期" prop="startTime">
@@ -66,7 +63,7 @@
 //import { ElMessageBox, ElMessage } from 'element-plus';
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {registerCount} from "/@/api/game/index";
-import {allChannelList, allServerList} from "/@/utils/game";
+import {allChannelList, allServerList, ServerCategorize} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 
 interface TableDataState {
@@ -85,6 +82,7 @@ interface TableDataState {
   };
   servers: object[];
   channels: object[];
+  serverCategorize: object[];
 }
 
 export default defineComponent({
@@ -107,6 +105,7 @@ export default defineComponent({
       },
       servers: [],
       channels: [],
+      serverCategorize: ServerCategorize,
     });
 
     const switchServer = () => {
diff --git a/src/views/gameManage/shop/index.vue b/src/views/gameManage/shop/index.vue
index a3512a6..1a1041c 100644
--- a/src/views/gameManage/shop/index.vue
+++ b/src/views/gameManage/shop/index.vue
@@ -11,13 +11,10 @@
           </el-form-item>
           <el-form-item label="选择服务器" prop="serverId">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.param.server" class="m-2" placeholder="选择服务器" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-form-item label="注册日期" prop="createTime">
@@ -126,7 +123,7 @@
 //import { ElMessageBox, ElMessage } from 'element-plus';
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {keepAccount} from "/@/api/game/index";
-import {allChannelList, allServerList} from "/@/utils/game";
+import {allChannelList, allServerList, ServerCategorize} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 
 // 定义接口来定义对象的类型
@@ -157,6 +154,7 @@ interface TableDataState {
   servers: object[];
   channels: object[];
   dateNames: object;
+  serverCategorize: object;
 }
 
 export default defineComponent({
@@ -187,6 +185,7 @@ export default defineComponent({
         15: "fifteen",
         30: "thirty"
       },
+      serverCategorize: ServerCategorize,
     });
 
     const getRemain = () => {
diff --git a/src/views/gameNotice/pop/index.vue b/src/views/gameNotice/pop/index.vue
index a89bee3..99953a6 100644
--- a/src/views/gameNotice/pop/index.vue
+++ b/src/views/gameNotice/pop/index.vue
@@ -4,13 +4,10 @@
       <el-form label-width="90px">
         <el-form-item label="服务器：" prop="serverId">
           <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-            <el-option label="全部" :value="0"/>
-            <el-option label="ios" :value="1"/>
-            <el-option label="安卓" :value="2"/>
-            <el-option label="其他" :value="3"/>
+            <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
           </el-select>
           <el-select v-model="tableData.param.serverId" class="m-2" placeholder="选择服务器" size="large" filterable>
-            <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+            <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
           </el-select>
         </el-form-item>
       </el-form>
@@ -132,7 +129,7 @@ import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {ElMessageBox, ElMessage} from 'element-plus';
 import {gameNoticePop, gameGMNoticeModelGet, gameGMNoticeModelAdd, gameGMNoticeModelDel} from "/@/api/game";
 import {contentReplace, gSwitchServer} from "/@/utils/utils";
-import {serverList} from "/@/utils/game";
+import {ServerCategorize, serverList} from "/@/utils/game";
 
 interface TableDataState {
   unselsected: string[]
@@ -159,6 +156,7 @@ interface TableDataState {
   listModelVisible: boolean,
   contentVisible: boolean,
   serverSwitch: number,
+  serverCategorize: object[],
 }
 
 export default defineComponent({
@@ -189,6 +187,7 @@ export default defineComponent({
       servers: [],
       model: "",
       editModel: {},
+      serverCategorize: ServerCategorize,
     });
     const noticePop = () => {
       console.log("Notice: ", state.tableData.param);
diff --git a/src/views/gameOrder/count/index.vue b/src/views/gameOrder/count/index.vue
index 0065d05..38c83de 100644
--- a/src/views/gameOrder/count/index.vue
+++ b/src/views/gameOrder/count/index.vue
@@ -5,13 +5,10 @@
         <el-form :inline="true">
           <el-form-item label="选择区服">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.param.server" placeholder="选择区服">
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
+              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
             </el-select>
           </el-form-item>
           <el-form-item label="充值金额">
@@ -70,7 +67,7 @@
 import {toRefs, reactive, onMounted, defineComponent} from 'vue';
 //import { ElMessageBox, ElMessage } from 'element-plus';
 import {gameOrderCount} from "/@/api/game";
-import {allServerList, AllServerList} from "/@/utils/game";
+import {allServerList, AllServerList, ServerCategorize} from "/@/utils/game";
 import actionModel from "/@/views/gameMarket/actionModel/index.vue";
 import {gSwitchServer} from "/@/utils/utils";
 
@@ -101,6 +98,7 @@ interface TableDataState {
     compareType: object
   };
   servers: object[];
+  serverCategorize: object[];
 }
 
 export default defineComponent({
@@ -141,7 +139,8 @@ export default defineComponent({
           }
         ]
       },
-      servers: AllServerList
+      servers: AllServerList,
+      serverCategorize: ServerCategorize
     });
 
     const countList = () => {
diff --git a/src/views/gameOrder/deposit/index.vue b/src/views/gameOrder/deposit/index.vue
index c1f41a0..c31f6b6 100644
--- a/src/views/gameOrder/deposit/index.vue
+++ b/src/views/gameOrder/deposit/index.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="game-order-container">
-    <!--<el-card shadow="hover">
+	<div class="game-order-container">
+		<!--<el-card shadow="hover">
       <div class=" mb15">
         <el-form label-position="right" label-width="300px" style="max-width: 520px">
           <el-form-item label="选择区服" prop="serverId">
@@ -27,162 +27,188 @@
         </el-form>
       </div>
     </el-card>-->
-    <el-card shadow="hover">
-      <div class="mb15">
-        <el-form label-position="right" label-width="300px" style="max-width: 520px">
-          <el-form-item label="uid">
-            <el-input v-model="tableData.paramDeposit.account" placeholder="请输入玩家uid" class="w-50 m-2" clearable/>
-          </el-form-item>
-          <el-form-item label="充值金额">
-            <el-select v-model="tableData.paramDeposit.depositId" class="w-50 m-2" placeholder="">
-              <el-option v-for="item in depositIds" v-show="item.Currency==1" :key="item.Id" :label="item.Name"
-                         :value="item.Id"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="充值次数">
-            <el-input v-model="tableData.paramDeposit.times" placeholder="请输入充值次数" class="w-50 m-2" clearable/>
-          </el-form-item>
-          <el-form-item label="是否统计付费" prop="count">
-            <el-radio v-model="tableData.paramDeposit.count" :label="0">不统计</el-radio>
-            <el-radio v-model="tableData.paramDeposit.count" :label="1">统计</el-radio>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" class="ml10" @click="deposit">
-              确认充值
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
-  </div>
+		<el-card shadow="hover">
+			<div class="mb15">
+				<el-form label-position="right" label-width="300px" style="max-width: 520px">
+					<!--          <el-form-item label="选择区服" prop="serverId">-->
+					<!--            <el-select v-model="tableData.paramDeposit.serverId" class="m-2" placeholder="">-->
+					<!--              <el-option v-for="item in servers" :key="item.value" :label="item.label" :value="item.value"/>-->
+					<!--            </el-select>-->
+					<!--          </el-form-item>-->
+
+					<el-form-item label="选择服务器" prop="serverId">
+						<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+							<el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+						<el-select v-model="tableData.paramDeposit.serverId" class="m-2" placeholder="选择服务器" size="large" filterable>
+							<el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id + ''" />
+						</el-select>
+					</el-form-item>
+					<!--          <el-form-item label="uid">-->
+					<!--            <el-input v-model="tableData.paramDeposit.serverId" placeholder="请输入玩家uid" class="w-50 m-2" clearable/>-->
+					<!--          </el-form-item> v -->
+					<el-form-item label="uid">
+						<el-input v-model="tableData.paramDeposit.account" placeholder="请输入玩家uid" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item label="充值金额">
+						<el-select v-model="tableData.paramDeposit.depositId" class="w-50 m-2" placeholder="">
+							<el-option v-for="item in depositIds" v-show="item.Currency == 1" :key="item.Id" :label="item.Name" :value="item.Id" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="充值次数">
+						<el-input v-model="tableData.paramDeposit.times" placeholder="请输入充值次数" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item label="是否统计付费" prop="count">
+						<el-radio v-model="tableData.paramDeposit.count" :label="0">不统计</el-radio>
+						<el-radio v-model="tableData.paramDeposit.count" :label="1">统计</el-radio>
+					</el-form-item>
+					<el-form-item>
+						<el-button type="primary" class="ml10" @click="deposit"> 确认充值 </el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts">
-import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
-import {gameAddCoin, gameDeposit} from "/@/api/game";
-import {Platforms, ChannelList, serverList, channelList} from "/@/utils/game";
-import {ElMessage} from "element-plus/es";
-import RechargeConfigCategory from "/@/api/config/RechargeConfigCategory.json"
-import {ElMessageBox} from "element-plus";
+import { toRefs, reactive, onMounted, defineComponent } from 'vue';
+import { gameAddCoin, gameDeposit } from '/@/api/game';
+import { Platforms, ChannelList, ServerCategorize, serverList } from '/@/utils/game';
+import { ElMessage } from 'element-plus/es';
+import RechargeConfigCategory from '/@/api/config/RechargeConfigCategory.json';
+import { ElMessageBox } from 'element-plus';
+import { allGSwitchServer } from '/@/utils/utils';
 
 interface TableDataState {
-  tableData: {
-    param: {
-      uid: number
-      amount: number
-      amountType: number
-      serverId: string
-    };
-    paramDeposit: {
-      account: string
-      depositId: number
-      serverId: number
-      channel: string
-      amount: number
-      platform: number
-      count: number
-      times: number
-    }
-
-  };
-  servers: object[];
-  amountTypes: object
-  depositIds: object[]
-  platforms: object[]
-  channels: object[]
+	tableData: {
+		param: {
+			uid: number;
+			amount: number;
+			amountType: number;
+			serverId: string;
+		};
+		paramDeposit: {
+			account: string;
+			depositId: number;
+			serverId: number;
+			channel: string;
+			amount: number;
+			platform: number;
+			count: number;
+			times: number;
+		};
+	};
+	servers: object[];
+	amountTypes: object;
+	depositIds: object[];
+	platforms: object[];
+	channels: object[];
+	serverSwitch: number;
+	serverCategorize: object[];
 }
 
 export default defineComponent({
-  name: 'apiV1GameOrderDeposit',
-  setup() {
-    // const {proxy} = getCurrentInstance() as any;
-    const state = reactive<TableDataState>({
-      queryParams: {
-        account: "",
-        depositId: 101,
-        serverId: 1,
-        channel: "000000000000",
-        platform: 1,
-        count: 0
-      },
-      tableData: {
-        param: {
-          uid: 0,
-          amount: 0,
-          amountType: 1,
-          serverId: 1
-        },
-        paramDeposit: {
-          account: "",
-          depositId: 101,
-          serverId: 1,
-          channel: "000000000000",
-          platform: 1,
-          count: 0,
-          times: 1
-        }
-      },
-      servers: [],
-      amountTypes: [
-        {
-          value: 3,
-          label: '手稿',
-        },
-        {
-          value: 1,
-          label: '铜币',
-        },
-      ],
-      depositIds: RechargeConfigCategory,
-      platforms: Platforms,
-      channels: ChannelList,
-    });
-    const changeGameCoin = () => {
-      gameAddCoin(state.tableData.param).then(() => {
-        ElMessage.success('赠送金币成功');
-      }).finally(() => {
-        // state.loading = false;
-      })
-    }
-    const deposit = () => {
-      var config = state.depositIds.find(r => r.Id == state.tableData.paramDeposit.depositId);
-      state.tableData.paramDeposit.amount = config.RMB_Num
-      ElMessageBox.confirm(`确认给账号${state.tableData.paramDeposit.account}，充值${state.tableData.paramDeposit.amount}元?`, '提示', {
-        confirmButtonText: '确认',
-        cancelButtonText: '取消',
-        type: 'warning',
-      }).then(() => {
+	name: 'apiV1GameOrderDeposit',
+	setup() {
+		// const {proxy} = getCurrentInstance() as any;
+		const state = reactive<TableDataState>({
+			queryParams: {
+				account: '',
+				depositId: 101,
+				serverId: 1,
+				channel: '000000000000',
+				platform: 1,
+				count: 0,
+			},
+			tableData: {
+				param: {
+					uid: 0,
+					amount: 0,
+					amountType: 1,
+					serverId: 1,
+				},
+				paramDeposit: {
+					account: '',
+					depositId: 101,
+					serverId: 1,
+					channel: '000000000000',
+					platform: 1,
+					count: 0,
+					times: 1,
+				},
+			},
+			servers: [],
+			amountTypes: [
+				{
+					value: 3,
+					label: '手稿',
+				},
+				{
+					value: 1,
+					label: '铜币',
+				},
+			],
+			depositIds: RechargeConfigCategory,
+			platforms: Platforms,
+			channels: ChannelList,
+			serverCategorize: ServerCategorize,
+			serverSwitch: 0,
+		});
+		const changeGameCoin = () => {
+			gameAddCoin(state.tableData.param)
+				.then(() => {
+					ElMessage.success('赠送金币成功');
+				})
+				.finally(() => {
+					// state.loading = false;
+				});
+		};
+		const deposit = () => {
+			var config = state.depositIds.find((r) => r.Id == state.tableData.paramDeposit.depositId);
+			state.tableData.paramDeposit.amount = config.RMB_Num;
+			ElMessageBox.confirm(`确认给账号${state.tableData.paramDeposit.account}，充值${state.tableData.paramDeposit.amount}元?`, '提示', {
+				confirmButtonText: '确认',
+				cancelButtonText: '取消',
+				type: 'warning',
+			})
+				.then(() => {
+					for (let i = 0; i < state.tableData.paramDeposit.times; i++) {
+						setTimeout(() => {
+							recharge(i);
+						}, i * 1000);
+					}
+				})
+				.catch(() => {});
+		};
 
+		const recharge = (i: number) => {
+			gameDeposit(state.tableData.paramDeposit)
+				.then((res) => {
+					console.log(res);
+					if (res) {
+						ElMessage.success('第' + (i + 1) + '次，充值成功');
+					}
+				})
+				.finally(() => {});
+		};
 
-        for (let i = 0; i < state.tableData.paramDeposit.times; i++) {
-          setTimeout(() => {
-            recharge(i);
-          }, i*1000)
-        }
-      }).catch(() => {
+		const switchServer = () => {
+			return allGSwitchServer(state.serverSwitch, state.servers);
+		};
+		// 页面加载时
+		onMounted(() => {
+			serverList().then((res) => {
+        state.servers = res
+        state.tableData.paramDeposit.serverId = "" + res[0].id;
       });
-
-    }
-
-    const recharge = (i: number) => {
-      gameDeposit(state.tableData.paramDeposit).then((res) => {
-        console.log(res);
-        if (res) {
-          ElMessage.success('第' + (i + 1) + '次，充值成功');
-        }
-      }).finally(() => {
-
-      })
-    }
-
-    // 页面加载时
-    onMounted(() => {
-    });
-    return {
-      changeGameCoin,
-      deposit,
-      ...toRefs(state),
-    };
-  },
+		});
+		return {
+			switchServer,
+			changeGameCoin,
+			deposit,
+			...toRefs(state),
+		};
+	},
 });
 </script>
diff --git a/src/views/gameOrder/orderLog/index.vue b/src/views/gameOrder/orderLog/index.vue
index 3638ead..eea0f1f 100644
--- a/src/views/gameOrder/orderLog/index.vue
+++ b/src/views/gameOrder/orderLog/index.vue
@@ -11,10 +11,7 @@
           </el-form-item>
           <el-form-item label="选择区服" prop="server">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.param.server" class="m-2" placeholder="选择区服"
                        :disabled="tableData.param.channel===''" filterable>
@@ -122,7 +119,7 @@
 <script lang="ts">
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {orderLog} from "/@/api/game/index";
-import {allChannelList, CompareType, allServerList} from "/@/utils/game";
+import {allChannelList, CompareType, allServerList, ServerCategorize} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 
 // 定义接口来定义对象的类型
@@ -160,6 +157,7 @@ interface TableDataState {
   servers: object;
   channels: object[];
   dateNames: object;
+  serverCategorize: object;
 }
 
 export default defineComponent({
@@ -194,6 +192,7 @@ export default defineComponent({
         15: "fifteen",
         30: "thirty"
       },
+      serverCategorize: ServerCategorize,
     });
 
     const getRemain = () => {
diff --git a/src/views/gameOrder/shopInfo/index.vue b/src/views/gameOrder/shopInfo/index.vue
index efeca01..28d3923 100644
--- a/src/views/gameOrder/shopInfo/index.vue
+++ b/src/views/gameOrder/shopInfo/index.vue
@@ -11,10 +11,7 @@
           </el-form-item>
           <el-form-item label="选择区服" prop="server">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="queryParams.serverId" class="m-2" placeholder="选择区服" filterable>
               <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
@@ -59,7 +56,7 @@
 <script lang="ts">
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {gameShopList} from "/@/api/game";
-import {allServerList, allChannelList} from "/@/utils/game";
+import {allServerList, allChannelList, ServerCategorize} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 import CommonShopConfigCategory from "/@/api/config/CommonShopConfigCategory.json";
 import RechargeConfigCategory from "/@/api/config/RechargeConfigCategory.json";
@@ -90,6 +87,7 @@ interface TableDataState {
   channels: object;
   itemConfig: object[];
   commonShop: object[];
+  serverCategorize: object[];
 }
 
 export default defineComponent({
@@ -114,6 +112,7 @@ export default defineComponent({
       channels: [],
       rechargeConfig: RechargeConfigCategory,
       commonShop: CommonShopConfigCategory,
+      serverCategorize: ServerCategorize,
     });
 
     const orderList = () => {
diff --git a/src/views/gameRole/account/index.vue b/src/views/gameRole/account/index.vue
index cbbcc6d..a569438 100644
--- a/src/views/gameRole/account/index.vue
+++ b/src/views/gameRole/account/index.vue
@@ -5,10 +5,7 @@
         <el-form :inline="true">
           <el-form-item label="服务器">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="queryParams.serverId" class="m-2" placeholder="选择服务器" filterable>
               <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id+''"/>
@@ -61,7 +58,7 @@
 import {toRefs, reactive, onMounted, defineComponent} from 'vue';
 import {gameAccountList} from "/@/api/game";
 import {ElMessage} from "element-plus";
-import {serverList} from "/@/utils/game";
+import {ServerCategorize, serverList} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 
 // 定义接口来定义对象的类型
@@ -90,6 +87,7 @@ interface TableDataState {
     accountType: Array<{ label: string, value: number }>
   };
   servers: object[]
+  serverCategorize: object[]
 }
 
 export default defineComponent({
@@ -109,7 +107,8 @@ export default defineComponent({
         total: 0,
         accountType: [{label: "正常", value: 0}, {label: "黑名单", value: 0}, {label: "GM", value: 0}]
       },
-      servers: []
+      servers: [],
+      serverCategorize: ServerCategorize,
     });
 
     const accountList = () => {
diff --git a/src/views/gameRole/online/index.vue b/src/views/gameRole/online/index.vue
index b912c75..3c394ab 100644
--- a/src/views/gameRole/online/index.vue
+++ b/src/views/gameRole/online/index.vue
@@ -5,10 +5,7 @@
         <el-form :inline="true">
           <el-form-item label="选择服务器" prop="serverId">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.param.serverId" class="m-2" placeholder="选择服务器" size="large" filterable>
               <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
@@ -82,7 +79,7 @@
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 //import { ElMessageBox, ElMessage } from 'element-plus';
 // import EditRole from '/@/views/system/role/component/editRole.vue';
-import {allServerList, ServerList} from "/@/utils/game";
+import {allServerList, ServerCategorize, ServerList} from "/@/utils/game";
 import {gameOnlineList, gameOnlineTopList} from "/@/api/game";
 import {gSwitchServer} from "/@/utils/utils";
 
@@ -107,6 +104,7 @@ interface TableDataState {
     total: number;
   };
   servers: object[]
+  serverCategorize: object[];
 }
 
 export default defineComponent({
@@ -126,7 +124,8 @@ export default defineComponent({
         topNumber: 0,
         total: 0,
       },
-      servers: ServerList
+      servers: ServerList,
+      serverCategorize: ServerCategorize
     });
     const onlineList = () => {
       // const data: Array<any> = [];
diff --git a/src/views/gameRole/role/index.vue b/src/views/gameRole/role/index.vue
index 2c2180c..1931347 100644
--- a/src/views/gameRole/role/index.vue
+++ b/src/views/gameRole/role/index.vue
@@ -1,1439 +1,1410 @@
 <template>
-  <div class="game-order-container">
-    <el-card shadow="hover">
-      <div class="game-order-search mb15">
-        <el-form :inline="true">
-          <el-form-item label="服务器">
-            <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
-            </el-select>
-            <el-select v-model="queryParams.serverId" class="m-2" placeholder="选择服务器" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id+''"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="id">
-            <el-input size="default" v-model="queryParams.id" placeholder="请输入id" class="w-50 m-2"
-                      clearable/>
-          </el-form-item>
-          <el-form-item label="uid">
-            <el-input size="default" v-model="queryParams.uid" placeholder="请输入uid" class="w-50 m-2"
-                      clearable/>
-          </el-form-item>
-          <el-form-item label="账号">
-            <el-input size="default" v-model="queryParams.account" placeholder="请输入账号" class="w-50 m-2" clearable>
-              <template #prepend>
-                <el-select size="default" v-model="queryParams.channel" class="m-2" placeholder="选择渠道"
-                           style="width: 115px">
-                  <el-option v-for="item in channels" :key="item.value" :label="item.label"
-                             :value="item.value"/>
-                </el-select>
-              </template>
-            </el-input>
-          </el-form-item>
-          <el-form-item label="身份证:">
-            <el-input size="default" v-model="queryParams.ident" placeholder="身份证" class="w-50 m-2"
-                      clearable/>
-          </el-form-item>
-          <el-form-item label="名字:">
-            <el-input size="default" v-model="queryParams.name" placeholder="名字" class="w-50 m-2"
-                      clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="roleList">
-              <el-icon>
-                <ele-Search/>
-              </el-icon>
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-card>
-    <el-card shadow="hover" header="基本信息">
-      <template #header>
-        基本信息
-        <el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret"
-                   type="text">
-          <el-icon size="20">
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.listShow && tableData.data[0]">
-        <el-form :inline="true">
-          id：{{ tableData.account.StringId }}
-        </el-form>
-        <el-form :inline="true">
-          uid：{{ tableData.account.uid }}
-        </el-form>
-        <el-form :inline="true">
-          账号：{{ tableData.account.AccountName }}
-        </el-form>
-        <el-form :inline="true">
-          创建时间：{{ tableData.account.CreateTime }}
-        </el-form>
-        <el-form :inline="true">
-          是否未成年：{{ checkAdult() }}
-        </el-form>
-        <el-form :inline="true">
-          实名信息：
-          <el-button type="text" @click="showIdentity">查看</el-button>
-        </el-form>
-      </div>
-    </el-card>
-    <el-card shadow="hover" header="存档信息">
-      <template #header>
-        存档信息
-        <el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret"
-                   type="text">
-          <el-icon size="20">
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.listShow && tableData.data[0]">
-        <el-form :inline="true">
-          山谷名称： {{
-            tableData.data[0] && tableData.data[0].ValleyComponent &&
-            tableData.data[0].ValleyComponent.Name
-          }}
-        </el-form>
-        <el-form :inline="true">
-          游戏时间： {{
-            tableData.data[0] && tableData.data[0].ValleyComponent &&
-            tableData.data[0].ValleyComponent.Day
-          }}天
-          {{
-            tableData.data[0] && tableData.data[0].ValleyComponent &&
-            Math.floor(tableData.data[0].ValleyComponent.GameTime / 100)
-          }}时
-          {{
-            tableData.data[0] && tableData.data[0].ValleyComponent &&
-            tableData.data[0].ValleyComponent.GameTime % 100
-          }}分
-          {{
-            tableData.data[0] && tableData.data[0].ValleyComponent &&
-            seasonConfig.find(r => r.Id == tableData.data[0].ValleyComponent.SeasonId).Name
-          }}季
-        </el-form>
-        <el-form :inline="true">
-          游戏规模： {{
-            tableData.data[0] && tableData.data[0].ValleyComponent &&
-            tableData.data[0].ValleyComponent.Scale + "--" +
-            scaleConfig.find(r => r.Id == tableData.data[0].ValleyComponent.Scale).ScaleName
-          }}
-        </el-form>
-        <el-form :inline="true">
-          成功防守： {{
-            tableData.data[0] && tableData.data[0].ValleyComponent &&
-            tableData.data[0].ValleyComponent.Scale
-          }}
-        </el-form>
-        <el-divider border-style="dotted"/>
-        <el-form>
-          <el-descriptions direction="vertical" :column="6" border>
-            <el-descriptions-item label="桃谷">
-              解锁
-            </el-descriptions-item>
-            <div v-for="(item, k) in villageShow" :key="k">
-              <el-descriptions-item :label="item.name+item.id">
-                {{
-                  tableData.data[0] && tableData.data[0].RegionComponent &&
-                  tableData.data[0].RegionComponent.UnLockRegionList.indexOf(item.id) == -1 ? '未解锁' : "解锁"
-                }}
-              </el-descriptions-item>
-            </div>
-          </el-descriptions>
-        </el-form>
-        <el-divider border-style="dotted"/>
-        <el-form>
-          <el-descriptions direction="vertical" :column="4" border>
-            <div v-for="(item, k) in valleyShow" :key="k">
-              <el-descriptions-item :label="valleyShowCN[item]">
-                {{
-                  tableData.data[0] && tableData.data[0].ValleyComponent &&
-                  tableData.data[0].ValleyComponent[item]
-                }}
-              </el-descriptions-item>
-            </div>
-          </el-descriptions>
-        </el-form>
-        <el-divider border-style="dotted"/>
-        <el-form :inline="true">
-          <el-form-item label="物品名称:">
-            <el-select size="default" v-model="queryParams.itemName" filterable placeholder="请填写物品名称">
-              <el-option v-for="item in allItemConfig" :key="item.Id" :label="item.Name"
-                         :value="item.Name"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="findItem">
-              <el-icon>
-                <ele-Search/>
-              </el-icon>
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true">
-          <el-form-item label="建筑名称:">
-            <el-select size="default" v-model="queryParams.buildingName" filterable placeholder="请填写建筑名称">
-              <el-option v-for="item in structureConfig" :key="item.Id" :label="item.Name"
-                         :value="item.Name"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="findBuilding">
-              <el-icon>
-                <ele-Search/>
-              </el-icon>
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true">
-          <el-form-item label="勇士名称:">
-            <el-select size="default" v-model="queryParams.warriorName" filterable placeholder="请填写勇士名称">
-              <el-option v-for="item in warriorConfig" :key="item.Id" :label="item.FirstName+item.Name"
-                         :value="item.FirstName+item.Name"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="findWarrior">
-              <el-icon>
-                <ele-Search/>
-              </el-icon>
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <el-form :inline="true">
-          <el-form-item label="村民名称:">
-            <el-input size="default" v-model="queryParams.villagerName" placeholder="村民名称" class="w-50 m-2"
-                      clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="findVillager">
-              <el-icon>
-                <ele-Search/>
-              </el-icon>
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-        <!--        <el-divider border-style="dotted"/>-->
-        <!--        <el-form >-->
+	<div class="game-order-container">
+		<el-card shadow="hover">
+			<div class="game-order-search mb15">
+				<el-form :inline="true">
+					<el-form-item label="服务器">
+						<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+							<el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+						<el-select v-model="queryParams.serverId" class="m-2" placeholder="选择服务器" filterable>
+							<el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="id">
+						<el-input size="default" v-model="queryParams.id" placeholder="请输入id" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item label="uid">
+						<el-input size="default" v-model="queryParams.uid" placeholder="请输入uid" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item label="账号">
+						<el-input size="default" v-model="queryParams.account" placeholder="请输入账号" class="w-50 m-2" clearable>
+							<template #prepend>
+								<el-select size="default" v-model="queryParams.channel" class="m-2" placeholder="选择渠道" style="width: 115px">
+									<el-option v-for="item in channels" :key="item.value" :label="item.label" :value="item.value" />
+								</el-select>
+							</template>
+						</el-input>
+					</el-form-item>
+					<el-form-item label="身份证:">
+						<el-input size="default" v-model="queryParams.ident" placeholder="身份证" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item label="名字:">
+						<el-input size="default" v-model="queryParams.name" placeholder="名字" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="roleList">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+		</el-card>
+		<el-card shadow="hover" header="基本信息">
+			<template #header>
+				基本信息
+				<el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret" type="text">
+					<el-icon size="20">
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.listShow && tableData.data[0]">
+				<el-form :inline="true"> id：{{ tableData.account.StringId }} </el-form>
+				<el-form :inline="true"> uid：{{ tableData.account.uid }} </el-form>
+				<el-form :inline="true"> 账号：{{ tableData.account.AccountName }} </el-form>
+				<el-form :inline="true"> 创建时间：{{ tableData.account.CreateTime }} </el-form>
+				<el-form :inline="true"> 是否未成年：{{ checkAdult() }} </el-form>
+				<el-form :inline="true">
+					实名信息：
+					<el-button type="text" @click="showIdentity">查看</el-button>
+				</el-form>
+			</div>
+		</el-card>
+		<el-card shadow="hover" header="存档信息">
+			<template #header>
+				存档信息
+				<el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret" type="text">
+					<el-icon size="20">
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.listShow && tableData.data[0]">
+				<el-form :inline="true">
+					山谷名称： {{ tableData.data[0] && tableData.data[0].ValleyComponent && tableData.data[0].ValleyComponent.Name }}
+				</el-form>
+				<el-form :inline="true">
+					游戏时间： {{ tableData.data[0] && tableData.data[0].ValleyComponent && tableData.data[0].ValleyComponent.Day }}天
+					{{ tableData.data[0] && tableData.data[0].ValleyComponent && Math.floor(tableData.data[0].ValleyComponent.GameTime / 100) }}时
+					{{ tableData.data[0] && tableData.data[0].ValleyComponent && tableData.data[0].ValleyComponent.GameTime % 100 }}分
+					{{
+						tableData.data[0] &&
+						tableData.data[0].ValleyComponent &&
+						seasonConfig.find((r) => r.Id == tableData.data[0].ValleyComponent.SeasonId).Name
+					}}季
+				</el-form>
+				<el-form :inline="true">
+					游戏规模：
+					{{
+						tableData.data[0] &&
+						tableData.data[0].ValleyComponent &&
+						tableData.data[0].ValleyComponent.Scale + '--' + scaleConfig.find((r) => r.Id == tableData.data[0].ValleyComponent.Scale).ScaleName
+					}}
+				</el-form>
+				<el-form :inline="true">
+					成功防守： {{ tableData.data[0] && tableData.data[0].ValleyComponent && tableData.data[0].ValleyComponent.Scale }}
+				</el-form>
+				<el-divider border-style="dotted" />
+				<el-form>
+					<el-descriptions direction="vertical" :column="6" border>
+						<el-descriptions-item label="桃谷"> 解锁 </el-descriptions-item>
+						<div v-for="(item, k) in villageShow" :key="k">
+							<el-descriptions-item :label="item.name + item.id">
+								{{
+									tableData.data[0] && tableData.data[0].RegionComponent && tableData.data[0].RegionComponent.UnLockRegionList.indexOf(item.id) == -1
+										? '未解锁'
+										: '解锁'
+								}}
+							</el-descriptions-item>
+						</div>
+					</el-descriptions>
+				</el-form>
+				<el-divider border-style="dotted" />
+				<el-form>
+					<el-descriptions direction="vertical" :column="4" border>
+						<div v-for="(item, k) in valleyShow" :key="k">
+							<el-descriptions-item :label="valleyShowCN[item]">
+								{{ tableData.data[0] && tableData.data[0].ValleyComponent && tableData.data[0].ValleyComponent[item] }}
+							</el-descriptions-item>
+						</div>
+					</el-descriptions>
+				</el-form>
+				<el-divider border-style="dotted" />
+				<el-form :inline="true">
+					<el-form-item label="物品名称:">
+						<el-select size="default" v-model="queryParams.itemName" filterable placeholder="请填写物品名称">
+							<el-option v-for="item in allItemConfig" :key="item.Id" :label="item.Name" :value="item.Name" />
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="findItem">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+					</el-form-item>
+				</el-form>
+				<el-form :inline="true">
+					<el-form-item label="建筑名称:">
+						<el-select size="default" v-model="queryParams.buildingName" filterable placeholder="请填写建筑名称">
+							<el-option v-for="item in structureConfig" :key="item.Id" :label="item.Name" :value="item.Name" />
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="findBuilding">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+					</el-form-item>
+				</el-form>
+				<el-form :inline="true">
+					<el-form-item label="勇士名称:">
+						<el-select size="default" v-model="queryParams.warriorName" filterable placeholder="请填写勇士名称">
+							<el-option v-for="item in warriorConfig" :key="item.Id" :label="item.FirstName + item.Name" :value="item.FirstName + item.Name" />
+						</el-select>
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="findWarrior">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+					</el-form-item>
+				</el-form>
+				<el-form :inline="true">
+					<el-form-item label="村民名称:">
+						<el-input size="default" v-model="queryParams.villagerName" placeholder="村民名称" class="w-50 m-2" clearable />
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="findVillager">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+					</el-form-item>
+				</el-form>
+				<!--        <el-divider border-style="dotted"/>-->
+				<!--        <el-form >-->
 
-        <!--        </el-form>-->
-      </div>
-    </el-card>
-    <el-card shadow="hover" header="付费信息">
-      <template #header>
-        付费信息
-        <el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret"
-                   type="text">
-          <el-icon size="20">
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.listShow && tableData.data[0]">
-        付费总额：{{
-          tableData.data[0] && tableData.data[0].RechargeComponent &&
-          tableData.data[0].RechargeComponent.RechargeTotal
-        }}
-        <el-table :data="tableData.orderData" style="width: 100%">
-          <el-table-column prop="tradeNo" label="订单id" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="externalTradeNo" label="渠道订单id" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="stringId" label="账号" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="uid" label="uid" show-overflow-tooltip></el-table-column>
-          <el-table-column prop="Rmb" label="金额（元）" show-overflow-tooltip width="120">
-            <template #default="scope">
-              {{ (Number(scope.row.Rmb) / 100).toFixed(2) }}
-            </template>
-          </el-table-column>
-          <el-table-column prop="timeStr" label="充值时间" show-overflow-tooltip width="180"></el-table-column>
-          <!--        <el-table-column prop="timeStr" label="充值时间" show-overflow-tooltip></el-table-column>-->
-          <!--        <el-table-column prop="CfgId" label="商品" show-overflow-tooltip>-->
-          <!--          <template #default="scope">-->
-          <!--            <span>{{rechargeInfo.find(r=>r.Id == scope.row.CfgId).Name}}</span>-->
-          <!--          </template>-->
-          <!--        </el-table-column>-->
-          <el-table-column prop="status" label="状态" show-overflow-tooltip width="120">
-            <template #default="scope">
-              <div v-if="scope.row.status==1">
-                <span style='color: #a8a17b'>未付款</span>
-              </div>
-              <div v-else-if="scope.row.status==2">
-                <span>充值成功</span>
-              </div>
-              <div v-else>
-                <span style='color: #e60000'>充值失败</span>
-              </div>
-            </template>
-          </el-table-column>
-          <el-table-column prop="channel" label="渠道" show-overflow-tooltip width="120">
-            <template #default="scope">
-              <span>{{
-                  channels.find(r => r.value == scope.row.channel) ? channels.find(r => r.value == scope.row.channel).label : scope.row.channel
-                }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column prop="server" label="区服" show-overflow-tooltip width="60"></el-table-column>
-        </el-table>
-        <el-row justify="space-evenly">
-          <el-pagination :hide-on-single-page="true" v-model:page-size="queryParams.orderPageSize"
-                         v-model:current-page="queryParams.orderPageNum"
-                         :pager-count="5" @current-change="orderList" layout="total, prev, pager, next"
-                         :total="queryParams.orderTotal"/>
-        </el-row>
-      </div>
-    </el-card>
-    <el-card shadow="hover" header="登录信息">
-      <template #header>
-        登录信息
-        <el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret"
-                   type="text">
-          <el-icon size="20">
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.listShow && tableData.loginOutData.length>0">
-        <el-table :data="tableData.loginOutData" border>
-          <el-table-column label="时间" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.cDate }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="状态" width="80">
-            <template #default="scope">
-              <span>{{ scope.row.state == 1 ? "登录" : "登出" }}</span>
-            </template>
-          </el-table-column>
-          <!--          <el-table-column label="" width="80">-->
-          <!--            <template #default="scope">-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-          <el-table-column label="山谷信息" width="100">
-            <template #default="scope">
-              <el-tag @click="getShowData(1,scope.row)">点击查看</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column label="部分信息" width="100">
-            <template #default="scope">
-              <el-tag @click="getShowData(2,scope.row)">点击查看</el-tag>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row justify="space-evenly">
-          <el-pagination :hide-on-single-page="true" v-model:page-size="queryParams.loginOutPageSize"
-                         v-model:current-page="queryParams.loginOutPageNum"
-                         :pager-count="5" @current-change="loginOut" layout="total, prev, pager, next"
-                         :total="queryParams.loginOutTotal"/>
-        </el-row>
-      </div>
-    </el-card>
-    <el-card shadow="hover" header="重要信息">
-      <template #header>
-        重要信息
-        <el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret"
-                   type="text">
-          <el-icon size="20">
-            <ele-CaretBottom/>
-          </el-icon>
-        </el-button>
-        <el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret"
-                   type="text">
-          <el-icon>
-            <ele-CaretTop/>
-          </el-icon>
-        </el-button>
-      </template>
-      <div v-show="item.listShow && tableData.loginOutData.length>0">
-        <el-table :data="tableData.loginOutData" border>
-          <el-table-column label="物品" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.Name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="" width="180">
-            <template>
-              <el-tag @click="getShowData(3)">点击查看</el-tag>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-card>
+				<!--        </el-form>-->
+			</div>
+		</el-card>
+		<el-card shadow="hover" header="付费信息">
+			<template #header>
+				付费信息
+				<el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret" type="text">
+					<el-icon size="20">
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.listShow && tableData.data[0]">
+				付费总额：{{ tableData.data[0] && tableData.data[0].RechargeComponent && tableData.data[0].RechargeComponent.RechargeTotal }}
+				<el-table :data="tableData.orderData" style="width: 100%">
+					<el-table-column prop="tradeNo" label="订单id" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="externalTradeNo" label="渠道订单id" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="stringId" label="账号" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="uid" label="uid" show-overflow-tooltip></el-table-column>
+					<el-table-column prop="Rmb" label="金额（元）" show-overflow-tooltip width="120">
+						<template #default="scope">
+							{{ (Number(scope.row.Rmb) / 100).toFixed(2) }}
+						</template>
+					</el-table-column>
+					<el-table-column prop="timeStr" label="充值时间" show-overflow-tooltip width="180"></el-table-column>
+					<!--        <el-table-column prop="timeStr" label="充值时间" show-overflow-tooltip></el-table-column>-->
+					<!--        <el-table-column prop="CfgId" label="商品" show-overflow-tooltip>-->
+					<!--          <template #default="scope">-->
+					<!--            <span>{{rechargeInfo.find(r=>r.Id == scope.row.CfgId).Name}}</span>-->
+					<!--          </template>-->
+					<!--        </el-table-column>-->
+					<el-table-column prop="status" label="状态" show-overflow-tooltip width="120">
+						<template #default="scope">
+							<div v-if="scope.row.status == 1">
+								<span style="color: #a8a17b">未付款</span>
+							</div>
+							<div v-else-if="scope.row.status == 2">
+								<span>充值成功</span>
+							</div>
+							<div v-else>
+								<span style="color: #e60000">充值失败</span>
+							</div>
+						</template>
+					</el-table-column>
+					<el-table-column prop="channel" label="渠道" show-overflow-tooltip width="120">
+						<template #default="scope">
+							<span>{{
+								channels.find((r) => r.value == scope.row.channel) ? channels.find((r) => r.value == scope.row.channel).label : scope.row.channel
+							}}</span>
+						</template>
+					</el-table-column>
+					<el-table-column prop="server" label="区服" show-overflow-tooltip width="60"></el-table-column>
+				</el-table>
+				<el-row justify="space-evenly">
+					<el-pagination
+						:hide-on-single-page="true"
+						v-model:page-size="queryParams.orderPageSize"
+						v-model:current-page="queryParams.orderPageNum"
+						:pager-count="5"
+						@current-change="orderList"
+						layout="total, prev, pager, next"
+						:total="queryParams.orderTotal"
+					/>
+				</el-row>
+			</div>
+		</el-card>
+		<el-card shadow="hover" header="登录信息">
+			<template #header>
+				登录信息
+				<el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret" type="text">
+					<el-icon size="20">
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.listShow && tableData.loginOutData.length > 0">
+				<el-table :data="tableData.loginOutData" border>
+					<el-table-column label="时间" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.cDate }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="状态" width="80">
+						<template #default="scope">
+							<span>{{ scope.row.state == 1 ? '登录' : '登出' }}</span>
+						</template>
+					</el-table-column>
+					<!--          <el-table-column label="" width="80">-->
+					<!--            <template #default="scope">-->
+					<!--            </template>-->
+					<!--          </el-table-column>-->
+					<el-table-column label="山谷信息" width="100">
+						<template #default="scope">
+							<el-tag @click="getShowData(1, scope.row)">点击查看</el-tag>
+						</template>
+					</el-table-column>
+					<el-table-column label="部分信息" width="100">
+						<template #default="scope">
+							<el-tag @click="getShowData(2, scope.row)">点击查看</el-tag>
+						</template>
+					</el-table-column>
+				</el-table>
+				<el-row justify="space-evenly">
+					<el-pagination
+						:hide-on-single-page="true"
+						v-model:page-size="queryParams.loginOutPageSize"
+						v-model:current-page="queryParams.loginOutPageNum"
+						:pager-count="5"
+						@current-change="loginOut"
+						layout="total, prev, pager, next"
+						:total="queryParams.loginOutTotal"
+					/>
+				</el-row>
+			</div>
+		</el-card>
+		<el-card shadow="hover" header="重要信息">
+			<template #header>
+				重要信息
+				<el-button v-show="item.listShow == false" @click="item.listShow = true" class="button-caret" type="text">
+					<el-icon size="20">
+						<ele-CaretBottom />
+					</el-icon>
+				</el-button>
+				<el-button v-show="item.listShow == true" @click="item.listShow = false" class="button-caret" type="text">
+					<el-icon>
+						<ele-CaretTop />
+					</el-icon>
+				</el-button>
+			</template>
+			<div v-show="item.listShow && tableData.loginOutData.length > 0">
+				<el-table :data="tableData.loginOutData" border>
+					<el-table-column label="物品" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.Name }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="" width="180">
+						<template>
+							<el-tag @click="getShowData(3)">点击查看</el-tag>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</el-card>
 
-    <el-dialog v-model="buildingDialogVisible" width="90%" :show-close="false" center>
-      <el-form :inline="true">
-        建筑名称： {{ JSON.stringify(tableData.building.buidlingId) }}{{ tableData.building.name }}
-      </el-form>
-      <el-form :inline="true">
-        建筑数量： {{ tableData.building.num }}
-      </el-form>
-      <el-table :data="tableData.building.buildingList" border>
-        <el-table-column type="index" width="50"/>
-        <el-table-column prop="Position" label="位置" width="180">
-          <template #default="scope">
-            <span>x:{{ scope.row.Position.x }}-y:{{ scope.row.Position.y }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="耐久" width="180">
-          <template #default="scope">
-            <span>{{ scope.row.durableLeft[1] }}/{{ scope.row.Durable }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="损耗" width="180">
-          <template #default="scope">
-            <span>{{ scope.row.DurableLoss }}/日</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="宝物" width="180">
-          <template #default="scope">
-            <span>{{ scope.row.gemName.length === 0 ? "无" : scope.row.gemName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="name" label="强化" width="180">
-          <template #default="scope">
-            <span>{{ scope.row.StrengthenLv }}/{{ scope.row.StrengthenNumMax }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
+		<el-dialog v-model="buildingDialogVisible" width="90%" :show-close="false" center>
+			<el-form :inline="true"> 建筑名称： {{ JSON.stringify(tableData.building.buidlingId) }}{{ tableData.building.name }} </el-form>
+			<el-form :inline="true"> 建筑数量： {{ tableData.building.num }} </el-form>
+			<el-table :data="tableData.building.buildingList" border>
+				<el-table-column type="index" width="50" />
+				<el-table-column prop="Position" label="位置" width="180">
+					<template #default="scope">
+						<span>x:{{ scope.row.Position.x }}-y:{{ scope.row.Position.y }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="耐久" width="180">
+					<template #default="scope">
+						<span>{{ scope.row.durableLeft[1] }}/{{ scope.row.Durable }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="损耗" width="180">
+					<template #default="scope">
+						<span>{{ scope.row.DurableLoss }}/日</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="宝物" width="180">
+					<template #default="scope">
+						<span>{{ scope.row.gemName.length === 0 ? '无' : scope.row.gemName }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column prop="name" label="强化" width="180">
+					<template #default="scope">
+						<span>{{ scope.row.StrengthenLv }}/{{ scope.row.StrengthenNumMax }}</span>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-dialog>
 
-    <el-dialog v-model="warriorDialogVisible" width="90%" :show-close="false" center>
-      <el-form :inline="true">
-        勇士名称： {{ JSON.stringify(tableData.warrior.id) }}{{ tableData.warrior.name }}
-      </el-form>
-      <el-form :inline="true">
-        加入时间-现实： {{ tableData.warrior.num }}
-      </el-form>
-      <el-form :inline="true">
-        加入时间-游戏： {{ tableData.warrior.num }}
-      </el-form>
-      <el-table :data="tableData.warrior.list" border>
-        <el-table-column label="是否出战" width="100">
-          <template #default="scope">
-            <span>{{ scope.row.troop }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="是否队长" width="100">
-          <template #default="scope">
-            <span>{{ scope.row.captain }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="战力" width="100">
-          <template #default="scope">
-            <span>{{ scope.row.fightingCapacity }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="位置" width="190">
-          <template #default="scope">
-            <span>x:{{
-                Math.floor(scope.row.BehaveComponent.DayPos.x * 100) / 100
-              }}-y:{{ Math.floor(scope.row.BehaveComponent.DayPos.y * 100) / 100 }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column label="睡前位置" width="190">
-          <template #default="scope">
-            <span>x:{{
-                Math.floor(scope.row.BehaveComponent.BeforeSleepPos.x * 100) / 100
-              }}-y:{{ Math.floor(scope.row.BehaveComponent.BeforeSleepPos.y * 100) / 100 }}</span>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div v-for="warrior in tableData.warrior.list" :key="warrior.index">
-        <el-form>
-          <el-descriptions direction="vertical" :column="12" border>
-            <div v-for="(item,k) in warrior.GameNumericComponent.NumericDic" :key="k">
-              <el-descriptions-item
-                  :label="item[0] > 9999 ? (NumericType[''+Math.floor(parseInt(item[0])/ 10)] +  '基础') : (NumericType[item[0]] ? NumericType[item[0]] : item[0]) ">
-                {{ item[1] }}
-              </el-descriptions-item>
-            </div>
-          </el-descriptions>
-        </el-form>
-      </div>
-      <div v-for="(warrior,k) in tableData.warrior.list" :key="k">
-        <el-table :data="warrior.SlotComponent.SlotDic" border>
-          <el-table-column label="装备" width="180">
-            <template #default="scope">
-              <span>{{ scope.row[3] && scope.row[3].config && scope.row[3].config.Name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="类型" width="180">
-            <template #default="scope">
-              <span>{{ Clothes_Type[scope.row[0]] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="数值" width="180">
-            <template #default="scope">
-              <div v-for="(data, k) in scope.row[4]" :key="k">
-                <div>{{ NumericType[data.id] }}：{{ data.operator }}{{ data.value }}</div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-      <div v-for="warrior in tableData.warrior.list">
-        <el-table :data="warrior.SkillComponent.Children" border>
-          <el-table-column label="技能" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.config.Name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="类型" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.config.CastType == 1 ? "主动" : "被动" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="是否解锁" width="180">
-            <template #default="">
-              <span>是</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="等级" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.Level }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-dialog>
+		<el-dialog v-model="warriorDialogVisible" width="90%" :show-close="false" center>
+			<el-form :inline="true"> 勇士名称： {{ JSON.stringify(tableData.warrior.id) }}{{ tableData.warrior.name }} </el-form>
+			<el-form :inline="true"> 加入时间-现实： {{ tableData.warrior.num }} </el-form>
+			<el-form :inline="true"> 加入时间-游戏： {{ tableData.warrior.num }} </el-form>
+			<el-table :data="tableData.warrior.list" border>
+				<el-table-column label="是否出战" width="100">
+					<template #default="scope">
+						<span>{{ scope.row.troop }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="是否队长" width="100">
+					<template #default="scope">
+						<span>{{ scope.row.captain }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="战力" width="100">
+					<template #default="scope">
+						<span>{{ scope.row.fightingCapacity }}</span>
+					</template>
+				</el-table-column>
+				<el-table-column label="位置" width="190">
+					<template #default="scope">
+						<span
+							>x:{{ Math.floor(scope.row.BehaveComponent.DayPos.x * 100) / 100 }}-y:{{
+								Math.floor(scope.row.BehaveComponent.DayPos.y * 100) / 100
+							}}</span
+						>
+					</template>
+				</el-table-column>
+				<el-table-column label="睡前位置" width="190">
+					<template #default="scope">
+						<span
+							>x:{{ Math.floor(scope.row.BehaveComponent.BeforeSleepPos.x * 100) / 100 }}-y:{{
+								Math.floor(scope.row.BehaveComponent.BeforeSleepPos.y * 100) / 100
+							}}</span
+						>
+					</template>
+				</el-table-column>
+			</el-table>
+			<div v-for="warrior in tableData.warrior.list" :key="warrior.index">
+				<el-form>
+					<el-descriptions direction="vertical" :column="12" border>
+						<div v-for="(item, k) in warrior.GameNumericComponent.NumericDic" :key="k">
+							<el-descriptions-item
+								:label="
+									item[0] > 9999
+										? NumericType['' + Math.floor(parseInt(item[0]) / 10)] + '基础'
+										: NumericType[item[0]]
+										? NumericType[item[0]]
+										: item[0]
+								"
+							>
+								{{ item[1] }}
+							</el-descriptions-item>
+						</div>
+					</el-descriptions>
+				</el-form>
+			</div>
+			<div v-for="(warrior, k) in tableData.warrior.list" :key="k">
+				<el-table :data="warrior.SlotComponent.SlotDic" border>
+					<el-table-column label="装备" width="180">
+						<template #default="scope">
+							<span>{{ scope.row[3] && scope.row[3].config && scope.row[3].config.Name }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="类型" width="180">
+						<template #default="scope">
+							<span>{{ Clothes_Type[scope.row[0]] }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="数值" width="180">
+						<template #default="scope">
+							<div v-for="(data, k) in scope.row[4]" :key="k">
+								<div>{{ NumericType[data.id] }}：{{ data.operator }}{{ data.value }}</div>
+							</div>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+			<div v-for="warrior in tableData.warrior.list">
+				<el-table :data="warrior.SkillComponent.Children" border>
+					<el-table-column label="技能" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.config.Name }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="类型" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.config.CastType == 1 ? '主动' : '被动' }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="是否解锁" width="180">
+						<template #default="">
+							<span>是</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="等级" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.Level }}</span>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</el-dialog>
 
-    <el-dialog v-model="villagerDialogVisible" width="90%" :show-close="false" center>
-      <el-form :inline="true">
-        村民名称：{{ JSON.stringify(tableData.villager.Id) }}{{ tableData.villager.name }}
-      </el-form>
-      <el-form :inline="true">
-        加入时间-现实： {{ tableData.villager.num }}
-      </el-form>
-      <el-form :inline="true">
-        加入时间-游戏： {{ tableData.villager.num }}
-      </el-form>
-      <div v-for="(warrior, k) in tableData.villager.list" :key="k">
-        <el-form>
-          <el-descriptions direction="vertical" :column="12" border>
-            <el-descriptions-item label="Id">
-              {{ warrior.PeopleComponent.StringId }}
-            </el-descriptions-item>
-            <el-descriptions-item label="性别">
-              {{ Gender[warrior.PeopleComponent.Gender] }}
-            </el-descriptions-item>
-            <el-descriptions-item label="状态">
-              {{ ConstBehaveType[warrior.BehaveComponent.BehaveType] }}
-            </el-descriptions-item>
-            <div v-for="(item, k) in warrior.GameNumericComponent.NumericDic" :key="k">
-              <el-descriptions-item
-                  :label="item[0] > 9999 ? ((NumericType[''+Math.floor(parseInt(item[0])/ 10)] ? NumericType[''+Math.floor(parseInt(item[0])/ 10)] : Math.floor(parseInt(item[0])/ 10)) +  '基础') : (NumericType[item[0]] ? NumericType[item[0]] : item[0]) ">
-                {{ item[1] }}
-              </el-descriptions-item>
-            </div>
+		<el-dialog v-model="villagerDialogVisible" width="90%" :show-close="false" center>
+			<el-form :inline="true"> 村民名称：{{ JSON.stringify(tableData.villager.Id) }}{{ tableData.villager.name }} </el-form>
+			<el-form :inline="true"> 加入时间-现实： {{ tableData.villager.num }} </el-form>
+			<el-form :inline="true"> 加入时间-游戏： {{ tableData.villager.num }} </el-form>
+			<div v-for="(warrior, k) in tableData.villager.list" :key="k">
+				<el-form>
+					<el-descriptions direction="vertical" :column="12" border>
+						<el-descriptions-item label="Id">
+							{{ warrior.PeopleComponent.StringId }}
+						</el-descriptions-item>
+						<el-descriptions-item label="性别">
+							{{ Gender[warrior.PeopleComponent.Gender] }}
+						</el-descriptions-item>
+						<el-descriptions-item label="状态">
+							{{ ConstBehaveType[warrior.BehaveComponent.BehaveType] }}
+						</el-descriptions-item>
+						<div v-for="(item, k) in warrior.GameNumericComponent.NumericDic" :key="k">
+							<el-descriptions-item
+								:label="
+									item[0] > 9999
+										? (NumericType['' + Math.floor(parseInt(item[0]) / 10)]
+												? NumericType['' + Math.floor(parseInt(item[0]) / 10)]
+												: Math.floor(parseInt(item[0]) / 10)) + '基础'
+										: NumericType[item[0]]
+										? NumericType[item[0]]
+										: item[0]
+								"
+							>
+								{{ item[1] }}
+							</el-descriptions-item>
+						</div>
 
-            <el-descriptions-item label="父">
-              {{ warrior.MarriageComponent.ParentsShow.pa }}
-            </el-descriptions-item>
-            <el-descriptions-item label="母">
-              {{ warrior.MarriageComponent.ParentsShow.ma }}
-            </el-descriptions-item>
-            <el-descriptions-item label="夫妻">
-              <div v-for="(data, k) in warrior.MarriageComponent.MatesShow" :key="k">
-                {{ data }}
-              </div>
-            </el-descriptions-item>
-            <el-descriptions-item label="兄弟姐妹">
-              <div v-for="(data,k) in warrior.MarriageComponent.BSShow" :key="k">
-                {{ data }}
-              </div>
-            </el-descriptions-item>
-            <el-descriptions-item label="子女">
-              <div v-for="(data,k) in warrior.MarriageComponent.MyChildrenShow" :key="k">
-                {{ data }}
-              </div>
-            </el-descriptions-item>
-          </el-descriptions>
-        </el-form>
-        <el-table :data="warrior.SlotComponent.SlotDic" border>
-          <el-table-column label="装备" width="180">
-            <template #default="scope">
-              <span>{{ scope.row[3].config.Name }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="类型" width="180">
-            <template #default="scope">
-              <span>{{ Clothes_Type[scope.row[0]] }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="数值" width="180">
-            <template #default="scope">
-              <div v-for="(data,k) in scope.row[4]" :key="k">
-                <div>{{ NumericType[data.id] }}：{{ data.operator }}{{ data.value }}</div>
-              </div>
-            </template>
-          </el-table-column>
-        </el-table>
+						<el-descriptions-item label="父">
+							{{ warrior.MarriageComponent.ParentsShow.pa }}
+						</el-descriptions-item>
+						<el-descriptions-item label="母">
+							{{ warrior.MarriageComponent.ParentsShow.ma }}
+						</el-descriptions-item>
+						<el-descriptions-item label="夫妻">
+							<div v-for="(data, k) in warrior.MarriageComponent.MatesShow" :key="k">
+								{{ data }}
+							</div>
+						</el-descriptions-item>
+						<el-descriptions-item label="兄弟姐妹">
+							<div v-for="(data, k) in warrior.MarriageComponent.BSShow" :key="k">
+								{{ data }}
+							</div>
+						</el-descriptions-item>
+						<el-descriptions-item label="子女">
+							<div v-for="(data, k) in warrior.MarriageComponent.MyChildrenShow" :key="k">
+								{{ data }}
+							</div>
+						</el-descriptions-item>
+					</el-descriptions>
+				</el-form>
+				<el-table :data="warrior.SlotComponent.SlotDic" border>
+					<el-table-column label="装备" width="180">
+						<template #default="scope">
+							<span>{{ scope.row[3].config.Name }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="类型" width="180">
+						<template #default="scope">
+							<span>{{ Clothes_Type[scope.row[0]] }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="数值" width="180">
+						<template #default="scope">
+							<div v-for="(data, k) in scope.row[4]" :key="k">
+								<div>{{ NumericType[data.id] }}：{{ data.operator }}{{ data.value }}</div>
+							</div>
+						</template>
+					</el-table-column>
+				</el-table>
 
-        <el-table :data="warrior.SkillComponent.Children" border>
-          <el-table-column label="技能" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.config.Name }}{{ scope.row.config.Action }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="类型" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.config.CastType == 1 ? "主动" : "被动" }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="是否解锁" width="180">
-            <template #default="">
-              <span>是</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="等级" width="180">
-            <template #default="scope">
-              <span>{{ scope.row.Level }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </el-dialog>
+				<el-table :data="warrior.SkillComponent.Children" border>
+					<el-table-column label="技能" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.config.Name }}{{ scope.row.config.Action }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="类型" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.config.CastType == 1 ? '主动' : '被动' }}</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="是否解锁" width="180">
+						<template #default="">
+							<span>是</span>
+						</template>
+					</el-table-column>
+					<el-table-column label="等级" width="180">
+						<template #default="scope">
+							<span>{{ scope.row.Level }}</span>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</el-dialog>
 
-    <el-dialog v-model="listVisible" :show-close="false" :before-close="handleClose" center>
-      <p v-html="showData">
-      </p>
-    </el-dialog>
-  </div>
+		<el-dialog v-model="listVisible" :show-close="false" :before-close="handleClose" center>
+			<p v-html="showData"></p>
+		</el-dialog>
+	</div>
 </template>
 
 <script lang="ts">
-import {h, toRefs, reactive, onMounted, defineComponent,} from 'vue';
-import {
-  gameRoleList,
-  gameAccountList,
-  gameLoginOut,
-  gameLoginOutLog,
-  gameItemRecord,
-  gameOrderList
-} from "/@/api/game";
-import SeasonConfigCategory from "/@/api/config/SeasonConfigCategory.json";
-import ScaleConfigCategory from "/@/api/config/ScaleConfigCategory.json";
-import RegionConfigCategory from "/@/api/config/RegionConfigCategory.json";
-import AllItemConfigCategory from "/@/api/config/AllItemConfigCategory.json";
-import StructureConfigCategory from "/@/api/config/StructureConfigCategory.json";
-import WorldParametersConfigCategory from "/@/api/config/WorldParametersConfigCategory.json";
-import TreasureConfigCategory from "/@/api/config/TreasureConfigCategory.json";
-import WarriorConfigCategory from "/@/api/config/WarriorConfigCategory.json";
-import SkillConfigCategory from "/@/api/config/SkillConfigCategory.json";
-import EquipmentConfigCategory from "/@/api/config/EquipmentConfigCategory.json";
-import ClothesConfigCategory from "/@/api/config/ClothesConfigCategory.json";
-import {
-  ConstRegion,
-  GameUnitType,
-  NumericType,
-  Clothes_Type,
-  AttributeOperator,
-  Gender,
-  ConstBehaveType,
-} from '/@/api/common/consts';
-import {ElMessage, ElMessageBox} from "element-plus";
-import {allChannelList, channelList, serverList} from "/@/utils/game";
-import {gSwitchServer} from "/@/utils/utils";
+import { h, toRefs, reactive, onMounted, defineComponent } from 'vue';
+import { gameRoleList, gameAccountList, gameLoginOut, gameLoginOutLog, gameItemRecord, gameOrderList } from '/@/api/game';
+import SeasonConfigCategory from '/@/api/config/SeasonConfigCategory.json';
+import ScaleConfigCategory from '/@/api/config/ScaleConfigCategory.json';
+import RegionConfigCategory from '/@/api/config/RegionConfigCategory.json';
+import AllItemConfigCategory from '/@/api/config/AllItemConfigCategory.json';
+import StructureConfigCategory from '/@/api/config/StructureConfigCategory.json';
+import WorldParametersConfigCategory from '/@/api/config/WorldParametersConfigCategory.json';
+import TreasureConfigCategory from '/@/api/config/TreasureConfigCategory.json';
+import WarriorConfigCategory from '/@/api/config/WarriorConfigCategory.json';
+import SkillConfigCategory from '/@/api/config/SkillConfigCategory.json';
+import EquipmentConfigCategory from '/@/api/config/EquipmentConfigCategory.json';
+import ClothesConfigCategory from '/@/api/config/ClothesConfigCategory.json';
+import { ConstRegion, GameUnitType, NumericType, Clothes_Type, AttributeOperator, Gender, ConstBehaveType } from '/@/api/common/consts';
+import { ElMessage, ElMessageBox } from 'element-plus';
+import { allChannelList, channelList, ServerCategorize, serverList } from '/@/utils/game';
+import { gSwitchServer } from '/@/utils/utils';
 
 // 定义接口来定义对象的类型
 interface TableData {
-  uid: number;
-  name: string;
-  region: number;
-  totalTime: number;
-  rechargeTotal: number;
-  CreateTime: string;
-  AccountType: string;
-  AccountName: string;
+	uid: number;
+	name: string;
+	region: number;
+	totalTime: number;
+	rechargeTotal: number;
+	CreateTime: string;
+	AccountType: string;
+	AccountName: string;
 }
 
 interface TableDataState {
-  item: { listShow: boolean },
-  buildingDialogVisible: boolean;
-  warriorDialogVisible: boolean;
-  villagerDialogVisible: boolean;
-  queryParams: {
-    id: string,
-    uid: number,
-    serverId: number,
-    channel: string,
-    account: string,
-    ident: string,
-    name: string,
-    itemName: string,
-    buildingName: string,
-    warriorName: string,
-    villagerName: string,
-    pageSize: number,
-    pageNum: number,
-    loginOutPageSize: number,
-    loginOutPageNum: number,
-    loginOutTotal: number,
-    loginOutLogPageSize: number,
-    loginOutLogPageNum: number,
-    loginOutLogTotal: number,
-    itemPageSize: number,
-    itemPageNum: number,
-    itemTotal: number,
-    orderPageNum: number,
-    orderPageSize: number,
-    orderTotal: number
-    orderAccount: string,
-  };
-  tableData: {
-    orderData: object[];
-    account: TableData;
-    data: Array<TableData>;
-    loginOutData: object[];
-    total: 0,
-    building: { buildingList: object[] },
-    warrior: { list: object[] },
-    villager: { list: object[] },
-    accountType: Array<{ label: string, value: number }>,
-  };
-  loginOutLogData: object[];
-  itemRecordData: object[];
-  villageList: object[];
-  valleyComponent: object[];
-  valleyShow: string[];
-  valleyShowCN: object;
-  villageShow: string[];
-  villageShowCN: object;
-  seasonConfig: object;
-  scaleConfig: object;
-  worldParametersConfig: object;
-  treasureConfig: object;
-  warriorConfig: object;
-  regionConfig: object;
-  equipmentConfig: object;
-  clothesConfigCategory: object;
-  NumericType: object;
-  Clothes_Type: object;
-  Gender: object;
-  ConstBehaveType: object;
-  channels: object;
-  showData: string;
-  listVisible: boolean;
-  servers: object[];
-  serverSwitch: number;
+	item: { listShow: boolean };
+	buildingDialogVisible: boolean;
+	warriorDialogVisible: boolean;
+	villagerDialogVisible: boolean;
+	queryParams: {
+		id: string;
+		uid: number;
+		serverId: number;
+		channel: string;
+		account: string;
+		ident: string;
+		name: string;
+		itemName: string;
+		buildingName: string;
+		warriorName: string;
+		villagerName: string;
+		pageSize: number;
+		pageNum: number;
+		loginOutPageSize: number;
+		loginOutPageNum: number;
+		loginOutTotal: number;
+		loginOutLogPageSize: number;
+		loginOutLogPageNum: number;
+		loginOutLogTotal: number;
+		itemPageSize: number;
+		itemPageNum: number;
+		itemTotal: number;
+		orderPageNum: number;
+		orderPageSize: number;
+		orderTotal: number;
+		orderAccount: string;
+	};
+	tableData: {
+		orderData: object[];
+		account: TableData;
+		data: Array<TableData>;
+		loginOutData: object[];
+		total: 0;
+		building: { buildingList: object[] };
+		warrior: { list: object[] };
+		villager: { list: object[] };
+		accountType: Array<{ label: string; value: number }>;
+	};
+	loginOutLogData: object[];
+	itemRecordData: object[];
+	villageList: object[];
+	valleyComponent: object[];
+	valleyShow: string[];
+	valleyShowCN: object;
+	villageShow: string[];
+	villageShowCN: object;
+	seasonConfig: object;
+	scaleConfig: object;
+	worldParametersConfig: object;
+	treasureConfig: object;
+	warriorConfig: object;
+	regionConfig: object;
+	equipmentConfig: object;
+	clothesConfigCategory: object;
+	NumericType: object;
+	Clothes_Type: object;
+	Gender: object;
+	ConstBehaveType: object;
+	channels: object;
+	showData: string;
+	listVisible: boolean;
+	servers: object[];
+	serverCategorize: object[];
+	serverSwitch: number;
 }
 
 export default defineComponent({
-  name: 'apiV1GameRoleRole',
-  setup: function () {
-    const state = reactive<TableDataState>({
-      serverSwitch: 0,
-      item: {listShow: true},
-      queryParams: {
-        id: "",
-        serverId: "",
-        channel: "",
-        account: "",
-        uid: "",
-        ident: "",
-        name: "",
-        itemName: "",
-        buildingName: "",
-        warriorName: "",
-        villagerName: "",
-        pageSize: 10,
-        pageNum: 1,
-        loginOutPageSize: 10,
-        loginOutPageNum: 1,
-        loginOutTotal: 0,
-        loginOutLogPageSize: 10,
-        loginOutLogPageNum: 1,
-        loginOutLogTotal: 0,
-        itemPageSize: 10,
-        itemPageNum: 1,
-        itemTotal: 0,
-        orderPageNum: 1,
-        orderPageSize: 10,
-        orderTotal: 0,
-        orderAccount: "",
-      },
-      tableData: {
-        loginOutData: [],
-        orderData: [],
-        account: {},
-        data: [],
-        total: 0,
-        building: {buildingList: []},
-        warrior: {list: []},
-        villager: {list: []},
-        accountType: [{label: "正常", value: 0}, {label: "黑名单", value: 0}, {label: "GM", value: 0}],
-      },
-      seasonConfig: SeasonConfigCategory,
-      scaleConfig: ScaleConfigCategory,
-      valleyShow: ["Prosperity", "Food", "Copper", "GoldIngot"],
-      valleyShowCN: {Prosperity: "繁荣", Food: "食物", Copper: "铜钱", GoldIngot: "桃花石"},
-      villageShow: [],
-      villageShowCN: {},
-      regionConfig: RegionConfigCategory,
-      structureConfig: StructureConfigCategory,
-      allItemConfig: AllItemConfigCategory,
-      worldParametersConfig: WorldParametersConfigCategory,
-      treasureConfig: TreasureConfigCategory,
-      warriorConfig: WarriorConfigCategory,
-      equipmentConfig: EquipmentConfigCategory,
-      clothesConfig: ClothesConfigCategory,
-      NumericType: NumericType,
-      Clothes_Type: Clothes_Type,
-      Gender: Gender,
-      ConstBehaveType: ConstBehaveType,
-      buildingDialogVisible: false,
-      warriorDialogVisible: false,
-      villagerDialogVisible: false,
-      listVisible: false,
-      showData: "",
-      channels: [],
-      servers: []
-    });
-    const roleList = (value: number) => {
-      if (!value) {
-        state.queryParams.itemPageNum = 1
-        state.queryParams.orderPageNum = 1
-        state.queryParams.loginOutLogPageNum = 1
-        state.queryParams.loginOutPageNum = 1
-      }
-      if (state.queryParams.channel.length > 0 && state.queryParams.account.length > 0 && state.queryParams.account.indexOf(state.queryParams.channel) != 0) {
-        state.queryParams.account = state.queryParams.channel + state.queryParams.account
-      }
-      gameAccountList(state.queryParams).then(res => {
-        if (!res.data.list || res.data.list.length == 0) {
-          ElMessage.error('未查询到用户信息！');
-          return;
-        }
-        console.log(res);
-        const list = res.data.list ?? [];
-        list.map((item: TableData) => {
-          item.AccountType = state.tableData.accountType.find(r => r.value == item.AccountType).label;
-          item.CreateTime = new Date(item.CreateTime).toLocaleString();
-        });
-        if (list.length > 0) {
-          state.tableData.account = list[0];
-          gameRoleList({id: list[0].StringId, serverId: state.queryParams.serverId}).then(res => {
-            if (!res.data.list || res.data.list.length == 0) {
-              ElMessage.error('未查询到玩家信息！');
-              return;
-            }
-            console.log(res);
-            let roleList = res.data.list || [];
-            state.tableData.total = res.data.total;
-            roleList.map((item: TableData) => {
-              for (let i in item.C) {
-                item[item.C[i]._t] = item.C[i]
-              }
-            });
-            state.tableData.data = roleList;
-            console.log(roleList);
-          });
-          state.queryParams.orderAccount = list[0].AccountName;
-          orderList();
-          loginOut();
-          loginOutLog();
-          itemRecord()
-        }
-      });
-    };
-    const orderList = () => {
-      state.tableData.orderData = []
-      gameOrderList({
-        account: state.queryParams.orderAccount,
-        pageNum: state.queryParams.orderPageNum,
-        pageSize: state.queryParams.orderPageSize
-      }).then(res => {
-        if (!res.data.list || res.data.list.length == 0) {
-          ElMessage.error('未查询到充值信息！');
-          return;
-        }
-        console.log("orderData: ", res);
-        let list = res.data.list || [];
-        state.queryParams.orderTotal = res.data.total;
-        list.map((item: any) => {
-          state.tableData.orderData.push({
-            tradeNo: item.tradeNo,
-            externalTradeNo: item.externalTradeNo,
-            AccountName: item.account,
-            timeStr: item.CreateTime,
-            CfgId: item.config,
-            Rmb: item.amount,
-            status: item.status,
-            CreateTime: item.CreateTime,
-            channel: item.channel,
-            server: item.server,
-            uid: item.uid,
-            stringId: item.stringId,
-          });
-        });
-        console.log("orderData: ", list);
-      });
-    };
-    const loginOut = () => {
-      state.tableData.loginOutData = []
-      gameLoginOut({
-        account: state.queryParams.orderAccount,
-        serverId: state.queryParams.serverId,
-        id: state.queryParams.id,
-        pageSize: state.queryParams.loginOutPageSize,
-        pageNum: state.queryParams.loginOutPageNum
-      }).then(res => {
-        if (!res.data.logs || res.data.logs.length == 0) {
-          ElMessage.error('未查询到登录登出信息！');
-          return;
-        }
-        console.log("loginOut: ", res.data);
-        state.queryParams.loginOutTotal = res.data.total;
-        state.tableData.loginOutData = res.data.logs;
-      });
-    };
-    const loginOutLog = () => {
-      state.loginOutLogData = []
-      gameLoginOutLog({
-        account: state.queryParams.orderAccount,
-        id: state.queryParams.id,
-        serverId: state.queryParams.serverId,
-        pageSize: state.queryParams.loginOutLogPageSize,
-        pageNum: state.queryParams.loginOutLogPageNum
-      }).then(res => {
-        if (!res.data.logs || res.data.logs.length == 0) {
-          ElMessage.error('未查询到登录登出信息！');
-          return;
-        }
-        console.log("loginOutLog: ", res.data);
-        state.queryParams.loginOutLogTotal = res.data.total;
-        state.loginOutLogData = res.data.logs;
-      });
-    };
-    const itemRecord = () => {
-      return
-      gameItemRecord({
-        account: state.queryParams.orderAccount,
-        id: state.queryParams.id,
-        serverId: state.queryParams.serverId,
-        pageSize: state.queryParams.itemPageSize,
-        pageNum: state.queryParams.itemPageNum
-      }).then(res => {
-        if (!res.data.logs || res.data.logs.length == 0) {
-          ElMessage.error('未查询到物品交易记录！');
-          return;
-        }
+	name: 'apiV1GameRoleRole',
+	setup: function () {
+		const state = reactive<TableDataState>({
+			serverSwitch: 0,
+			item: { listShow: true },
+			queryParams: {
+				id: '',
+				serverId: '',
+				channel: '',
+				account: '',
+				uid: '',
+				ident: '',
+				name: '',
+				itemName: '',
+				buildingName: '',
+				warriorName: '',
+				villagerName: '',
+				pageSize: 10,
+				pageNum: 1,
+				loginOutPageSize: 10,
+				loginOutPageNum: 1,
+				loginOutTotal: 0,
+				loginOutLogPageSize: 10,
+				loginOutLogPageNum: 1,
+				loginOutLogTotal: 0,
+				itemPageSize: 10,
+				itemPageNum: 1,
+				itemTotal: 0,
+				orderPageNum: 1,
+				orderPageSize: 10,
+				orderTotal: 0,
+				orderAccount: '',
+			},
+			tableData: {
+				loginOutData: [],
+				orderData: [],
+				account: {},
+				data: [],
+				total: 0,
+				building: { buildingList: [] },
+				warrior: { list: [] },
+				villager: { list: [] },
+				accountType: [
+					{ label: '正常', value: 0 },
+					{ label: '黑名单', value: 0 },
+					{ label: 'GM', value: 0 },
+				],
+			},
+			seasonConfig: SeasonConfigCategory,
+			scaleConfig: ScaleConfigCategory,
+			valleyShow: ['Prosperity', 'Food', 'Copper', 'GoldIngot'],
+			valleyShowCN: { Prosperity: '繁荣', Food: '食物', Copper: '铜钱', GoldIngot: '桃花石' },
+			villageShow: [],
+			villageShowCN: {},
+			regionConfig: RegionConfigCategory,
+			structureConfig: StructureConfigCategory,
+			allItemConfig: AllItemConfigCategory,
+			worldParametersConfig: WorldParametersConfigCategory,
+			treasureConfig: TreasureConfigCategory,
+			warriorConfig: WarriorConfigCategory,
+			equipmentConfig: EquipmentConfigCategory,
+			clothesConfig: ClothesConfigCategory,
+			NumericType: NumericType,
+			Clothes_Type: Clothes_Type,
+			Gender: Gender,
+			ConstBehaveType: ConstBehaveType,
+			buildingDialogVisible: false,
+			warriorDialogVisible: false,
+			villagerDialogVisible: false,
+			listVisible: false,
+			showData: '',
+			channels: [],
+			servers: [],
+			serverCategorize: ServerCategorize,
+		});
+		const roleList = (value: number) => {
+			if (!value) {
+				state.queryParams.itemPageNum = 1;
+				state.queryParams.orderPageNum = 1;
+				state.queryParams.loginOutLogPageNum = 1;
+				state.queryParams.loginOutPageNum = 1;
+			}
+			if (
+				state.queryParams.channel.length > 0 &&
+				state.queryParams.account.length > 0 &&
+				state.queryParams.account.indexOf(state.queryParams.channel) != 0
+			) {
+				state.queryParams.account = state.queryParams.channel + state.queryParams.account;
+			}
+			gameAccountList(state.queryParams).then((res) => {
+				if (!res.data.list || res.data.list.length == 0) {
+					ElMessage.error('未查询到用户信息！');
+					return;
+				}
+				console.log(res);
+				const list = res.data.list ?? [];
+				list.map((item: TableData) => {
+					item.AccountType = state.tableData.accountType.find((r) => r.value == item.AccountType).label;
+					item.CreateTime = new Date(item.CreateTime).toLocaleString();
+				});
+				if (list.length > 0) {
+					state.tableData.account = list[0];
+					gameRoleList({ id: list[0].StringId, serverId: state.queryParams.serverId }).then((res) => {
+						if (!res.data.list || res.data.list.length == 0) {
+							ElMessage.error('未查询到玩家信息！');
+							return;
+						}
+						console.log(res);
+						let roleList = res.data.list || [];
+						state.tableData.total = res.data.total;
+						roleList.map((item: TableData) => {
+							for (let i in item.C) {
+								item[item.C[i]._t] = item.C[i];
+							}
+						});
+						state.tableData.data = roleList;
+						console.log(roleList);
+					});
+					state.queryParams.orderAccount = list[0].AccountName;
+					orderList();
+					loginOut();
+					loginOutLog();
+					itemRecord();
+				}
+			});
+		};
+		const orderList = () => {
+			state.tableData.orderData = [];
+			gameOrderList({
+				account: state.queryParams.orderAccount,
+				pageNum: state.queryParams.orderPageNum,
+				pageSize: state.queryParams.orderPageSize,
+			}).then((res) => {
+				if (!res.data.list || res.data.list.length == 0) {
+					ElMessage.error('未查询到充值信息！');
+					return;
+				}
+				console.log('orderData: ', res);
+				let list = res.data.list || [];
+				state.queryParams.orderTotal = res.data.total;
+				list.map((item: any) => {
+					state.tableData.orderData.push({
+						tradeNo: item.tradeNo,
+						externalTradeNo: item.externalTradeNo,
+						AccountName: item.account,
+						timeStr: item.CreateTime,
+						CfgId: item.config,
+						Rmb: item.amount,
+						status: item.status,
+						CreateTime: item.CreateTime,
+						channel: item.channel,
+						server: item.server,
+						uid: item.uid,
+						stringId: item.stringId,
+					});
+				});
+				console.log('orderData: ', list);
+			});
+		};
+		const loginOut = () => {
+			state.tableData.loginOutData = [];
+			gameLoginOut({
+				account: state.queryParams.orderAccount,
+				serverId: state.queryParams.serverId,
+				id: state.queryParams.id,
+				pageSize: state.queryParams.loginOutPageSize,
+				pageNum: state.queryParams.loginOutPageNum,
+			}).then((res) => {
+				if (!res.data.logs || res.data.logs.length == 0) {
+					ElMessage.error('未查询到登录登出信息！');
+					return;
+				}
+				console.log('loginOut: ', res.data);
+				state.queryParams.loginOutTotal = res.data.total;
+				state.tableData.loginOutData = res.data.logs;
+			});
+		};
+		const loginOutLog = () => {
+			state.loginOutLogData = [];
+			gameLoginOutLog({
+				account: state.queryParams.orderAccount,
+				id: state.queryParams.id,
+				serverId: state.queryParams.serverId,
+				pageSize: state.queryParams.loginOutLogPageSize,
+				pageNum: state.queryParams.loginOutLogPageNum,
+			}).then((res) => {
+				if (!res.data.logs || res.data.logs.length == 0) {
+					ElMessage.error('未查询到登录登出信息！');
+					return;
+				}
+				console.log('loginOutLog: ', res.data);
+				state.queryParams.loginOutLogTotal = res.data.total;
+				state.loginOutLogData = res.data.logs;
+			});
+		};
+		const itemRecord = () => {
+			return;
+			gameItemRecord({
+				account: state.queryParams.orderAccount,
+				id: state.queryParams.id,
+				serverId: state.queryParams.serverId,
+				pageSize: state.queryParams.itemPageSize,
+				pageNum: state.queryParams.itemPageNum,
+			}).then((res) => {
+				if (!res.data.logs || res.data.logs.length == 0) {
+					ElMessage.error('未查询到物品交易记录！');
+					return;
+				}
 
-        state.queryParams.itemTotal = res.data.total;
-        state.itemRecordData = res.data.logs;
-      });
-    };
-    const onHandleSizeChange = (val: number) => {
-      state.queryParams.pageSize = val;
-    };
-    const onHandleCurrentChange = (val: number) => {
-      state.queryParams.pageNum = val;
-      roleList(1)
-    };
-    onMounted(() => {
-      serverList().then(res => {
-        state.servers = res;
-        if (res.length > 0) {
-          state.queryParams.serverId = res[0].id
-        }
-      });
-      channelList().then((res) => {
-        state.channels = res
-      })
-      state.villageShow = [];
-      for (let i in RegionConfigCategory) {
-        if (RegionConfigCategory[i].Type == 3) {
-          state.villageShow.push({id: RegionConfigCategory[i].Id, name: RegionConfigCategory[i].Region});
-        }
-      }
-      console.log(state.villageShow)
-    });
-    const checkAdult = () => {
-      if (!state.tableData.account) {
-        return;
-      }
-      if (!state.tableData.account.StringId) {
-        return;
-      }
-      if (!state.tableData.account.Identity) {
-        return "未实名";
-      }
-      let year = state.tableData.account.Identity.substring(6, 10);
-      let month = state.tableData.account.Identity.substring(11, 12);
-      let day = state.tableData.account.Identity.substring(13, 14);
+				state.queryParams.itemTotal = res.data.total;
+				state.itemRecordData = res.data.logs;
+			});
+		};
+		const onHandleSizeChange = (val: number) => {
+			state.queryParams.pageSize = val;
+		};
+		const onHandleCurrentChange = (val: number) => {
+			state.queryParams.pageNum = val;
+			roleList(1);
+		};
+		onMounted(() => {
+			serverList().then((res) => {
+				state.servers = res;
+				if (res.length > 0) {
+					state.queryParams.serverId = res[0].id;
+				}
+			});
+			channelList().then((res) => {
+				state.channels = res;
+			});
+			state.villageShow = [];
+			for (let i in RegionConfigCategory) {
+				if (RegionConfigCategory[i].Type == 3) {
+					state.villageShow.push({ id: RegionConfigCategory[i].Id, name: RegionConfigCategory[i].Region });
+				}
+			}
+			console.log(state.villageShow);
+		});
+		const checkAdult = () => {
+			if (!state.tableData.account) {
+				return;
+			}
+			if (!state.tableData.account.StringId) {
+				return;
+			}
+			if (!state.tableData.account.Identity) {
+				return '未实名';
+			}
+			let year = state.tableData.account.Identity.substring(6, 10);
+			let month = state.tableData.account.Identity.substring(11, 12);
+			let day = state.tableData.account.Identity.substring(13, 14);
 
-      return new Date(Number(year) + 18, month, day) > new Date() ? "是" : "否";
-    };
-    const showIdentity = (done: () => void) => {
-      if (!state.tableData.account) {
-        return;
-      }
-      if (!state.tableData.account.StringId) {
-        return;
-      }
-      if (!state.tableData.account.Identity) {
-        ElMessageBox({
-          title: '实名信息',
-          message: h('p', null, [
-            h('div', null, '未实名')
-          ])
-        });
-        return;
-      }
-      ElMessageBox({
-        title: '实名信息',
-        message: h('p', null, [
-          h('div', null, '姓名: ' + (state.tableData.account.RealName || "")),
-          h('div', null, '身份证号: ' + (state.tableData.account.Identity || ""))
-        ])
-      })
-    };
-    const findItem = (val: number) => {
-      let itemId = 0;
-      for (let i in AllItemConfigCategory) {
-        let item = AllItemConfigCategory[i];
-        if (item.Name == state.queryParams.itemName) {
-          itemId = item.Id;
-        }
-      }
+			return new Date(Number(year) + 18, month, day) > new Date() ? '是' : '否';
+		};
+		const showIdentity = (done: () => void) => {
+			if (!state.tableData.account) {
+				return;
+			}
+			if (!state.tableData.account.StringId) {
+				return;
+			}
+			if (!state.tableData.account.Identity) {
+				ElMessageBox({
+					title: '实名信息',
+					message: h('p', null, [h('div', null, '未实名')]),
+				});
+				return;
+			}
+			ElMessageBox({
+				title: '实名信息',
+				message: h('p', null, [
+					h('div', null, '姓名: ' + (state.tableData.account.RealName || '')),
+					h('div', null, '身份证号: ' + (state.tableData.account.Identity || '')),
+				]),
+			});
+		};
+		const findItem = (val: number) => {
+			let itemId = 0;
+			for (let i in AllItemConfigCategory) {
+				let item = AllItemConfigCategory[i];
+				if (item.Name == state.queryParams.itemName) {
+					itemId = item.Id;
+				}
+			}
 
-      if (!itemId) {
-        return
-      }
-      let showData = [h('div', null, '物品名称: ' + (itemId || "") + (state.queryParams.itemName || ""))];
-      let warehouse = 0;
-      let bag = 0;
-      for (let i in state.tableData.data[0].StoreComponent.Children) {
-        let c = state.tableData.data[0].StoreComponent.Children[i];
-        if (c.ConfigId == itemId && c.Region == ConstRegion.Valley) {
-          warehouse += c.Amount;
-        }
-        if (c.ConfigId == itemId && c.Region == ConstRegion.Bag) {
-          bag += c.Amount;
-        }
-      }
+			if (!itemId) {
+				return;
+			}
+			let showData = [h('div', null, '物品名称: ' + (itemId || '') + (state.queryParams.itemName || ''))];
+			let warehouse = 0;
+			let bag = 0;
+			for (let i in state.tableData.data[0].StoreComponent.Children) {
+				let c = state.tableData.data[0].StoreComponent.Children[i];
+				if (c.ConfigId == itemId && c.Region == ConstRegion.Valley) {
+					warehouse += c.Amount;
+				}
+				if (c.ConfigId == itemId && c.Region == ConstRegion.Bag) {
+					bag += c.Amount;
+				}
+			}
 
-      showData.push(h('div', null, '仓库持有: ' + warehouse));
-      showData.push(h('div', null, '背包持有: ' + bag));
-      if (showData) {
-        ElMessageBox({
-          title: '查询结果',
-          message: h('p', null, showData)
-        })
-      }
-    };
-    const findBuilding = (val: number) => {
-      let buidlingId = [];
-      for (let i in StructureConfigCategory) {
-        let item = StructureConfigCategory[i];
-        console.log(item);
-        if (item.Name == state.queryParams.buildingName) {
-          buidlingId.push(item.Id);
-        }
-      }
-      if (buidlingId.length <= 0) {
-        console.log("findBuilding: ", buidlingId, state.queryParams);
-        return
-      }
-      let lost = 0;
-      for (let i in state.tableData.data[0].ResearchComponent.HighUnLockList) {
-        let id = state.tableData.data[0].ResearchComponent.HighUnLockList[i];
-        if (id == 2001) {
-          lost -= 1;
-        }
-        if (id == 2002) {
-          lost -= 2;
-        }
-      }
-      let buildingList = [];
-      let num = 0;
-      for (let i in state.tableData.data[0].GameUnitComponent.Children) {
-        let c = state.tableData.data[0].GameUnitComponent.Children[i];
-        if (c.UnitType == GameUnitType.Building) {
-          for (let j in c.C) {
-            let data = c.C[j];
-            c[data._t] = data;
+			showData.push(h('div', null, '仓库持有: ' + warehouse));
+			showData.push(h('div', null, '背包持有: ' + bag));
+			if (showData) {
+				ElMessageBox({
+					title: '查询结果',
+					message: h('p', null, showData),
+				});
+			}
+		};
+		const findBuilding = (val: number) => {
+			let buidlingId = [];
+			for (let i in StructureConfigCategory) {
+				let item = StructureConfigCategory[i];
+				console.log(item);
+				if (item.Name == state.queryParams.buildingName) {
+					buidlingId.push(item.Id);
+				}
+			}
+			if (buidlingId.length <= 0) {
+				console.log('findBuilding: ', buidlingId, state.queryParams);
+				return;
+			}
+			let lost = 0;
+			for (let i in state.tableData.data[0].ResearchComponent.HighUnLockList) {
+				let id = state.tableData.data[0].ResearchComponent.HighUnLockList[i];
+				if (id == 2001) {
+					lost -= 1;
+				}
+				if (id == 2002) {
+					lost -= 2;
+				}
+			}
+			let buildingList = [];
+			let num = 0;
+			for (let i in state.tableData.data[0].GameUnitComponent.Children) {
+				let c = state.tableData.data[0].GameUnitComponent.Children[i];
+				if (c.UnitType == GameUnitType.Building) {
+					for (let j in c.C) {
+						let data = c.C[j];
+						c[data._t] = data;
 
-            if (data._t == "BuildingComponent" && buidlingId.indexOf(data.ConfigId) !== -1) {
-              num += 1;
-              c.StrengthenLv = data.StrengthenLv;
-              c.DurableLoss = WorldParametersConfigCategory[0].DurableLoss - WorldParametersConfigCategory[0].StrengthenDurable * data.StrengthenLv;
-              c.Durable = StructureConfigCategory.find(r => r.Id == data.ConfigId).Durable;
-              buildingList.push(c);
-            }
-          }
-        }
-      }
+						if (data._t == 'BuildingComponent' && buidlingId.indexOf(data.ConfigId) !== -1) {
+							num += 1;
+							c.StrengthenLv = data.StrengthenLv;
+							c.DurableLoss = WorldParametersConfigCategory[0].DurableLoss - WorldParametersConfigCategory[0].StrengthenDurable * data.StrengthenLv;
+							c.Durable = StructureConfigCategory.find((r) => r.Id == data.ConfigId).Durable;
+							buildingList.push(c);
+						}
+					}
+				}
+			}
 
-      for (let i in buildingList) {
-        buildingList[i].durableLeft = buildingList[i].GameNumericComponent.NumericDic.find(r => r[0] == 2008);
-        buildingList[i].DurableLoss += lost;
-        buildingList[i].StrengthenNumMax = WorldParametersConfigCategory[0].StrengthenNumMax;
-        buildingList[i].gemName = "";
-        for (let j in buildingList[i].BuildingSlotComponent.Gems) {
-          let item = AllItemConfigCategory.find(r => r.Id == buildingList[i].BuildingSlotComponent.Gems[j]);
-          if (!item) {
-            break
-          }
-          buildingList[i].gemName += (buildingList[i].gemName.length > 0 ? ";" : "") + item.Name;
-          let config = TreasureConfigCategory.find(r => r.Id == item.RelatedId);
-          if (!config) {
-            break
-          }
-          buildingList[i].DurableLoss -= config.DurableRecovery;
-        }
-      }
+			for (let i in buildingList) {
+				buildingList[i].durableLeft = buildingList[i].GameNumericComponent.NumericDic.find((r) => r[0] == 2008);
+				buildingList[i].DurableLoss += lost;
+				buildingList[i].StrengthenNumMax = WorldParametersConfigCategory[0].StrengthenNumMax;
+				buildingList[i].gemName = '';
+				for (let j in buildingList[i].BuildingSlotComponent.Gems) {
+					let item = AllItemConfigCategory.find((r) => r.Id == buildingList[i].BuildingSlotComponent.Gems[j]);
+					if (!item) {
+						break;
+					}
+					buildingList[i].gemName += (buildingList[i].gemName.length > 0 ? ';' : '') + item.Name;
+					let config = TreasureConfigCategory.find((r) => r.Id == item.RelatedId);
+					if (!config) {
+						break;
+					}
+					buildingList[i].DurableLoss -= config.DurableRecovery;
+				}
+			}
 
-      state.tableData.building.name = state.queryParams.buildingName;
-      state.tableData.building.num = num;
-      state.tableData.building.buidlingId = buidlingId;
-      state.tableData.building.buildingList = buildingList;
-      state.buildingDialogVisible = true;
-    };
-    const findWarrior = () => {
-      for (let i in WarriorConfigCategory) {
-        let warriorConf = WarriorConfigCategory[i];
-        if (!warriorConf || (warriorConf.FirstName + warriorConf.Name) != state.queryParams.warriorName) {
-          continue
-        }
-        state.tableData.warrior.name = state.queryParams.warriorName;
-        state.tableData.warrior.id = warriorConf.Id;
-      }
+			state.tableData.building.name = state.queryParams.buildingName;
+			state.tableData.building.num = num;
+			state.tableData.building.buidlingId = buidlingId;
+			state.tableData.building.buildingList = buildingList;
+			state.buildingDialogVisible = true;
+		};
+		const findWarrior = () => {
+			for (let i in WarriorConfigCategory) {
+				let warriorConf = WarriorConfigCategory[i];
+				if (!warriorConf || warriorConf.FirstName + warriorConf.Name != state.queryParams.warriorName) {
+					continue;
+				}
+				state.tableData.warrior.name = state.queryParams.warriorName;
+				state.tableData.warrior.id = warriorConf.Id;
+			}
 
-      let warriorList = [];
-      let num = 0;
+			let warriorList = [];
+			let num = 0;
 
-      let troop = state.tableData.data[0].TroopComponent.PeopleList;
-      for (let i in state.tableData.data[0].GameUnitComponent.Children) {
-        let c = state.tableData.data[0].GameUnitComponent.Children[i];
-        if (c.UnitType == GameUnitType.Warrior) {
-          for (let j in c.C) {
-            let data = c.C[j];
-            c[data._t] = data;
-            c["captain"] = "否";
+			let troop = state.tableData.data[0].TroopComponent.PeopleList;
+			for (let i in state.tableData.data[0].GameUnitComponent.Children) {
+				let c = state.tableData.data[0].GameUnitComponent.Children[i];
+				if (c.UnitType == GameUnitType.Warrior) {
+					for (let j in c.C) {
+						let data = c.C[j];
+						c[data._t] = data;
+						c['captain'] = '否';
 
-            c["troop"] = "否";
-            let troopIndex = troop.indexOf(c._id);
-            if (troopIndex == 0) {
-              c["captain"] = "是";
-            }
-            if (troopIndex > -1) {
-              c["troop"] = "是";
-            }
-            if (data._t == "WarriorComponent" && state.tableData.warrior.id == data.ConfigId) {
-              num += 1;
-              c.SoulLevel = data.SoulLevel;
-              warriorList.push(c);
-            }
-            if (data._t == "SkillComponent") {
-              for (let z in data.Children) {
-                data.Children[z].config = SkillConfigCategory.find(r => r.Id == data.Children[z].ConfigId)
-              }
-            }
-            if (data._t == "SlotComponent") {
-              for (let z in data.SlotDic) {
-                if (data.SlotDic[z][0] == Clothes_Type.WEAPON || data.SlotDic[z][0] == Clothes_Type.ARMOR) {
-                  data.SlotDic[z][3] = data.Children.find(r => r.StringId == data.SlotDic[z][2]);
-                  if (data.SlotDic[z][3]) data.SlotDic[z][3].config = AllItemConfigCategory.find(r => r.Id == data.SlotDic[z][3].ConfigId);
-                  data.SlotDic[z][4] = [];
-                  if (data.SlotDic[z][3] && data.SlotDic[z][3].config) {
-                    let equip = EquipmentConfigCategory.find(r => r.Id == data.SlotDic[z][3].config.RelatedId);
-                    if (equip.Attribute1 > 0) data.SlotDic[z][4].push({
-                      id: equip.Attribute1,
-                      value: equip.AttributeValue1,
-                      operator: AttributeOperator[equip.AttributeOperator1]
-                    });
-                    if (equip.Attribute2 > 0) data.SlotDic[z][4].push({
-                      id: equip.Attribute2,
-                      value: equip.AttributeValue2,
-                      operator: AttributeOperator[equip.AttributeOperator2]
-                    });
-                    if (equip.Attribute3 > 0) data.SlotDic[z][4].push({
-                      id: equip.Attribute3,
-                      value: equip.AttributeValue3,
-                      operator: AttributeOperator[equip.AttributeOperator3]
-                    });
-                  }
+						c['troop'] = '否';
+						let troopIndex = troop.indexOf(c._id);
+						if (troopIndex == 0) {
+							c['captain'] = '是';
+						}
+						if (troopIndex > -1) {
+							c['troop'] = '是';
+						}
+						if (data._t == 'WarriorComponent' && state.tableData.warrior.id == data.ConfigId) {
+							num += 1;
+							c.SoulLevel = data.SoulLevel;
+							warriorList.push(c);
+						}
+						if (data._t == 'SkillComponent') {
+							for (let z in data.Children) {
+								data.Children[z].config = SkillConfigCategory.find((r) => r.Id == data.Children[z].ConfigId);
+							}
+						}
+						if (data._t == 'SlotComponent') {
+							for (let z in data.SlotDic) {
+								if (data.SlotDic[z][0] == Clothes_Type.WEAPON || data.SlotDic[z][0] == Clothes_Type.ARMOR) {
+									data.SlotDic[z][3] = data.Children.find((r) => r.StringId == data.SlotDic[z][2]);
+									if (data.SlotDic[z][3]) data.SlotDic[z][3].config = AllItemConfigCategory.find((r) => r.Id == data.SlotDic[z][3].ConfigId);
+									data.SlotDic[z][4] = [];
+									if (data.SlotDic[z][3] && data.SlotDic[z][3].config) {
+										let equip = EquipmentConfigCategory.find((r) => r.Id == data.SlotDic[z][3].config.RelatedId);
+										if (equip.Attribute1 > 0)
+											data.SlotDic[z][4].push({
+												id: equip.Attribute1,
+												value: equip.AttributeValue1,
+												operator: AttributeOperator[equip.AttributeOperator1],
+											});
+										if (equip.Attribute2 > 0)
+											data.SlotDic[z][4].push({
+												id: equip.Attribute2,
+												value: equip.AttributeValue2,
+												operator: AttributeOperator[equip.AttributeOperator2],
+											});
+										if (equip.Attribute3 > 0)
+											data.SlotDic[z][4].push({
+												id: equip.Attribute3,
+												value: equip.AttributeValue3,
+												operator: AttributeOperator[equip.AttributeOperator3],
+											});
+									}
 
-                  console.log(data.SlotDic[z]);
-                }
-              }
-            }
-          }
-        }
-      }
+									console.log(data.SlotDic[z]);
+								}
+							}
+						}
+					}
+				}
+			}
 
-      for (let i in warriorList) {
-        let ATK = 0;
-        let HP = 0;
-        let DEF = 0;
-        let Hit = 0;
-        let Dodge = 0;
-        let Crit = 0;
-        for (let j in warriorList[i].GameNumericComponent.NumericDic) {
-          if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.ATK) {
-            ATK = warriorList[i].GameNumericComponent.NumericDic[j][1];
-          }
-          if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.HP) {
-            HP = warriorList[i].GameNumericComponent.NumericDic[j][1];
-          }
-          if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.DEF) {
-            DEF = warriorList[i].GameNumericComponent.NumericDic[j][1];
-          }
-          if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.Hit) {
-            Hit = warriorList[i].GameNumericComponent.NumericDic[j][1];
-          }
-          if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.Dodge) {
-            Dodge = warriorList[i].GameNumericComponent.NumericDic[j][1];
-          }
-          if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.Crit) {
-            Crit = warriorList[i].GameNumericComponent.NumericDic[j][1];
-          }
-        }
-        warriorList[i]["fightingCapacity"] = ATK * 2 + HP * 2 + DEF * 5 + Hit * 2 + Dodge * 2 + Crit * 30;
-      }
+			for (let i in warriorList) {
+				let ATK = 0;
+				let HP = 0;
+				let DEF = 0;
+				let Hit = 0;
+				let Dodge = 0;
+				let Crit = 0;
+				for (let j in warriorList[i].GameNumericComponent.NumericDic) {
+					if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.ATK) {
+						ATK = warriorList[i].GameNumericComponent.NumericDic[j][1];
+					}
+					if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.HP) {
+						HP = warriorList[i].GameNumericComponent.NumericDic[j][1];
+					}
+					if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.DEF) {
+						DEF = warriorList[i].GameNumericComponent.NumericDic[j][1];
+					}
+					if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.Hit) {
+						Hit = warriorList[i].GameNumericComponent.NumericDic[j][1];
+					}
+					if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.Dodge) {
+						Dodge = warriorList[i].GameNumericComponent.NumericDic[j][1];
+					}
+					if (warriorList[i].GameNumericComponent.NumericDic[j][0] === NumericType.Crit) {
+						Crit = warriorList[i].GameNumericComponent.NumericDic[j][1];
+					}
+				}
+				warriorList[i]['fightingCapacity'] = ATK * 2 + HP * 2 + DEF * 5 + Hit * 2 + Dodge * 2 + Crit * 30;
+			}
 
-      state.tableData.warrior.list = warriorList;
+			state.tableData.warrior.list = warriorList;
 
-      state.warriorDialogVisible = true;
-    };
-    const findVillager = () => {
-      let warriorList = [];
-      for (let i in state.tableData.data[0].GameUnitComponent.Children) {
-        let c = state.tableData.data[0].GameUnitComponent.Children[i];
-        if (c.UnitType == GameUnitType.Villager) {
-          for (let j in c.C) {
-            let data = c.C[j];
-            c[data._t] = data;
-            if (data._t == "PeopleComponent" && data.FamilyName + data.Name == state.queryParams.villagerName) {
-              warriorList.push(c);
-            }
-            if (data._t == "SkillComponent") {
-              for (let z in data.Children) {
-                data.Children[z].config = SkillConfigCategory.find(r => r.Id == data.Children[z].ConfigId)
-              }
-            }
-            if (data._t == "MarriageComponent") {
-              let parent = {};
-              data.BS = [];
-              for (let z in data.Parents) {
-                let people = getPeopleName(data.Parents[z], true);
-                // console.log(data.Parents[z], people);
-                if (people.people && people.people.Gender == Gender.MAN) {
-                  parent.pa = people.people.FamilyName + people.people.Name;
-                }
-                if (people.people && people.people.Gender == Gender.WOMAN) {
-                  parent.ma = people.people.FamilyName + people.people.Name;
-                }
-                if (people.MyChildren && people.MyChildren.length > 0) {
-                  people.MyChildren = people.MyChildren.filter(item => item !== data.StringId);
-                  data.BS.concat(people.MyChildren)
-                }
-              }
-              data.ParentsShow = parent;
-              data.MyChildrenShow = [];
-              // console.log(data.Parents);
-              for (let z in data.MyChildren) {
-                let people = getPeopleName(data.MyChildren[z]);
-                if (people.people) {
-                  data.MyChildrenShow[z] = people.people.FamilyName + people.people.Name
-                }
-              }
-              data.MatesShow = [];
-              for (let z in data.Mates) {
-                let people = getPeopleName(data.Mates[z]);
-                if (people.people) {
-                  data.MatesShow[z] = people.people.FamilyName + people.people.Name
-                }
-              }
-              data.BSShow = [];
-              for (let z in data.BS) {
-                let people = getPeopleName(data.BS[z]);
-                if (people.people) {
-                  data.BSShow[z] = people.people.FamilyName + people.people.Name
-                }
-              }
-            }
-            if (data._t == "SlotComponent") {
-              for (let z in data.SlotDic) {
-                if (data.SlotDic[z][0] == Clothes_Type.APPAREL || data.SlotDic[z][0] == Clothes_Type.RAINGEAR) {
-                  data.SlotDic[z][3] = state.tableData.data[0].StoreComponent.Children.find(r => r.StringId == data.SlotDic[z][2]);
-                  data.SlotDic[z][3].config = AllItemConfigCategory.find(r => r.Id == data.SlotDic[z][3].ConfigId);
-                  data.SlotDic[z][4] = [];
-                  let equip = ClothesConfigCategory.find(r => r.Id == data.SlotDic[z][3].config.RelatedId);
-                  if (equip.IllnessReduce > 0) data.SlotDic[z][4].push({
-                    id: NumericType.IllnessReduce,
-                    value: equip.IllnessReduce * 100,
-                    operator: AttributeOperator[1]
-                  });
-                  if (equip.DiseaseDeduction > 0) data.SlotDic[z][4].push({
-                    id: NumericType.DiseaseDeduction,
-                    value: equip.DiseaseDeduction * 100,
-                    operator: AttributeOperator[1]
-                  });
-                  if (equip.LifeExp > 0) data.SlotDic[z][4].push({
-                    id: NumericType.LifeExp,
-                    value: equip.LifeExp,
-                    operator: AttributeOperator[1]
-                  });
-                }
-                if (data.SlotDic[z][0] == Clothes_Type.WEAPON || data.SlotDic[z][0] == Clothes_Type.ARMOR) {
-                  data.SlotDic[z][3] = state.tableData.data[0].StoreComponent.Children.find(r => r.StringId == data.SlotDic[z][2]);
-                  data.SlotDic[z][3].config = AllItemConfigCategory.find(r => r.Id == data.SlotDic[z][3].ConfigId);
-                  data.SlotDic[z][4] = [];
-                  let equip = EquipmentConfigCategory.find(r => r.Id == data.SlotDic[z][3].config.RelatedId);
-                  if (equip.Attribute1 > 0) data.SlotDic[z][4].push({
-                    id: equip.Attribute1,
-                    value: equip.AttributeValue1,
-                    operator: AttributeOperator[equip.AttributeOperator1]
-                  });
-                  if (equip.Attribute2 > 0) data.SlotDic[z][4].push({
-                    id: equip.Attribute2,
-                    value: equip.AttributeValue2,
-                    operator: AttributeOperator[equip.AttributeOperator2]
-                  });
-                  if (equip.Attribute3 > 0) data.SlotDic[z][4].push({
-                    id: equip.Attribute3,
-                    value: equip.AttributeValue3,
-                    operator: AttributeOperator[equip.AttributeOperator3]
-                  });
+			state.warriorDialogVisible = true;
+		};
+		const findVillager = () => {
+			let warriorList = [];
+			for (let i in state.tableData.data[0].GameUnitComponent.Children) {
+				let c = state.tableData.data[0].GameUnitComponent.Children[i];
+				if (c.UnitType == GameUnitType.Villager) {
+					for (let j in c.C) {
+						let data = c.C[j];
+						c[data._t] = data;
+						if (data._t == 'PeopleComponent' && data.FamilyName + data.Name == state.queryParams.villagerName) {
+							warriorList.push(c);
+						}
+						if (data._t == 'SkillComponent') {
+							for (let z in data.Children) {
+								data.Children[z].config = SkillConfigCategory.find((r) => r.Id == data.Children[z].ConfigId);
+							}
+						}
+						if (data._t == 'MarriageComponent') {
+							let parent = {};
+							data.BS = [];
+							for (let z in data.Parents) {
+								let people = getPeopleName(data.Parents[z], true);
+								// console.log(data.Parents[z], people);
+								if (people.people && people.people.Gender == Gender.MAN) {
+									parent.pa = people.people.FamilyName + people.people.Name;
+								}
+								if (people.people && people.people.Gender == Gender.WOMAN) {
+									parent.ma = people.people.FamilyName + people.people.Name;
+								}
+								if (people.MyChildren && people.MyChildren.length > 0) {
+									people.MyChildren = people.MyChildren.filter((item) => item !== data.StringId);
+									data.BS.concat(people.MyChildren);
+								}
+							}
+							data.ParentsShow = parent;
+							data.MyChildrenShow = [];
+							// console.log(data.Parents);
+							for (let z in data.MyChildren) {
+								let people = getPeopleName(data.MyChildren[z]);
+								if (people.people) {
+									data.MyChildrenShow[z] = people.people.FamilyName + people.people.Name;
+								}
+							}
+							data.MatesShow = [];
+							for (let z in data.Mates) {
+								let people = getPeopleName(data.Mates[z]);
+								if (people.people) {
+									data.MatesShow[z] = people.people.FamilyName + people.people.Name;
+								}
+							}
+							data.BSShow = [];
+							for (let z in data.BS) {
+								let people = getPeopleName(data.BS[z]);
+								if (people.people) {
+									data.BSShow[z] = people.people.FamilyName + people.people.Name;
+								}
+							}
+						}
+						if (data._t == 'SlotComponent') {
+							for (let z in data.SlotDic) {
+								if (data.SlotDic[z][0] == Clothes_Type.APPAREL || data.SlotDic[z][0] == Clothes_Type.RAINGEAR) {
+									data.SlotDic[z][3] = state.tableData.data[0].StoreComponent.Children.find((r) => r.StringId == data.SlotDic[z][2]);
+									data.SlotDic[z][3].config = AllItemConfigCategory.find((r) => r.Id == data.SlotDic[z][3].ConfigId);
+									data.SlotDic[z][4] = [];
+									let equip = ClothesConfigCategory.find((r) => r.Id == data.SlotDic[z][3].config.RelatedId);
+									if (equip.IllnessReduce > 0)
+										data.SlotDic[z][4].push({
+											id: NumericType.IllnessReduce,
+											value: equip.IllnessReduce * 100,
+											operator: AttributeOperator[1],
+										});
+									if (equip.DiseaseDeduction > 0)
+										data.SlotDic[z][4].push({
+											id: NumericType.DiseaseDeduction,
+											value: equip.DiseaseDeduction * 100,
+											operator: AttributeOperator[1],
+										});
+									if (equip.LifeExp > 0)
+										data.SlotDic[z][4].push({
+											id: NumericType.LifeExp,
+											value: equip.LifeExp,
+											operator: AttributeOperator[1],
+										});
+								}
+								if (data.SlotDic[z][0] == Clothes_Type.WEAPON || data.SlotDic[z][0] == Clothes_Type.ARMOR) {
+									data.SlotDic[z][3] = state.tableData.data[0].StoreComponent.Children.find((r) => r.StringId == data.SlotDic[z][2]);
+									data.SlotDic[z][3].config = AllItemConfigCategory.find((r) => r.Id == data.SlotDic[z][3].ConfigId);
+									data.SlotDic[z][4] = [];
+									let equip = EquipmentConfigCategory.find((r) => r.Id == data.SlotDic[z][3].config.RelatedId);
+									if (equip.Attribute1 > 0)
+										data.SlotDic[z][4].push({
+											id: equip.Attribute1,
+											value: equip.AttributeValue1,
+											operator: AttributeOperator[equip.AttributeOperator1],
+										});
+									if (equip.Attribute2 > 0)
+										data.SlotDic[z][4].push({
+											id: equip.Attribute2,
+											value: equip.AttributeValue2,
+											operator: AttributeOperator[equip.AttributeOperator2],
+										});
+									if (equip.Attribute3 > 0)
+										data.SlotDic[z][4].push({
+											id: equip.Attribute3,
+											value: equip.AttributeValue3,
+											operator: AttributeOperator[equip.AttributeOperator3],
+										});
 
-                  // console.log(data.SlotDic[z]);
-                }
-              }
-            }
-          }
-        }
-      }
+									// console.log(data.SlotDic[z]);
+								}
+							}
+						}
+					}
+				}
+			}
 
-      state.tableData.villager.name = state.queryParams.villagerName;
-      state.tableData.villager.list = warriorList;
-      state.villagerDialogVisible = true;
-    };
-    const getPeopleName = (id: string, children: boolean) => {
-      let res = {};
-      for (let zz in state.tableData.data[0].GameUnitComponent.Children) {
-        let c = state.tableData.data[0].GameUnitComponent.Children[zz];
-        if (c.UnitType == GameUnitType.Villager && c.StringId === id) {
-          for (let j in c.C) {
-            let data = c.C[j];
-            if (data._t == "PeopleComponent") {
-              res.people = data;
-              if (!children) {
-                return res;
-              }
-            }
-            if (children && data._t == "MarriageComponent") {
-              res.MyChildren = data;
-            }
-          }
-          return res;
-        }
-      }
-      return res;
-    };
-    const getShowData = (type: number, data: any) => {
-      if (type == 1) {
-        state.showData = "游戏时间: " + data.day + "天" + data.gameTime + "时， 规模: " + data.scale + "， 村民数量: " + data.villagerNum + "， 繁荣值: " + data.prosperity;
-      } else if (type == 2) {
-        state.showData = "铜币: " + data.goldIngot + "， 桃花石: " + data.copper + "， 基础食物: " + data.baseFood;
-      } else if (type == 3) {
-        state.showData = "";
-      }
-      state.listVisible = true;
-    };
-    const handleClose = () => {
-      state.listVisible = false;
-    };
+			state.tableData.villager.name = state.queryParams.villagerName;
+			state.tableData.villager.list = warriorList;
+			state.villagerDialogVisible = true;
+		};
+		const getPeopleName = (id: string, children: boolean) => {
+			let res = {};
+			for (let zz in state.tableData.data[0].GameUnitComponent.Children) {
+				let c = state.tableData.data[0].GameUnitComponent.Children[zz];
+				if (c.UnitType == GameUnitType.Villager && c.StringId === id) {
+					for (let j in c.C) {
+						let data = c.C[j];
+						if (data._t == 'PeopleComponent') {
+							res.people = data;
+							if (!children) {
+								return res;
+							}
+						}
+						if (children && data._t == 'MarriageComponent') {
+							res.MyChildren = data;
+						}
+					}
+					return res;
+				}
+			}
+			return res;
+		};
+		const getShowData = (type: number, data: any) => {
+			if (type == 1) {
+				state.showData =
+					'游戏时间: ' +
+					data.day +
+					'天' +
+					data.gameTime +
+					'时， 规模: ' +
+					data.scale +
+					'， 村民数量: ' +
+					data.villagerNum +
+					'， 繁荣值: ' +
+					data.prosperity;
+			} else if (type == 2) {
+				state.showData = '铜币: ' + data.goldIngot + '， 桃花石: ' + data.copper + '， 基础食物: ' + data.baseFood;
+			} else if (type == 3) {
+				state.showData = '';
+			}
+			state.listVisible = true;
+		};
+		const handleClose = () => {
+			state.listVisible = false;
+		};
 
-    const switchServer = () => {
-      return gSwitchServer(state.serverSwitch, state.servers)
-
-    };
-    return {
-      switchServer,
-      handleClose,
-      getShowData,
-      loginOut,
-      orderList,
-      loginOutLog,
-      itemRecord,
-      onHandleSizeChange,
-      onHandleCurrentChange,
-      roleList,
-      checkAdult,
-      showIdentity,
-      findItem,
-      findBuilding,
-      findWarrior,
-      findVillager,
-      ...toRefs(state),
-    };
-  },
+		const switchServer = () => {
+			return gSwitchServer(state.serverSwitch, state.servers);
+		};
+		return {
+			switchServer,
+			handleClose,
+			getShowData,
+			loginOut,
+			orderList,
+			loginOutLog,
+			itemRecord,
+			onHandleSizeChange,
+			onHandleCurrentChange,
+			roleList,
+			checkAdult,
+			showIdentity,
+			findItem,
+			findBuilding,
+			findWarrior,
+			findVillager,
+			...toRefs(state),
+		};
+	},
 });
 </script>
 <style scoped lang="scss">
 .el-form-item {
-  display: -moz-flex;
-  vertical-align: middle;
-  margin-right: 32px;
+	display: -moz-flex;
+	vertical-align: middle;
+	margin-right: 32px;
 }
 
 ::v-deep .el-table--striped .el-table__body tr.el-table__row--striped td {
-  background: #ffffd5;
+	background: #ffffd5;
 }
 
 ::v-deep .el-table .el-table--enable-row-hover .el-table__body tr:hover > td {
-  background: inherit;
+	background: inherit;
 }
 
 .el-row {
-  margin-bottom: 20px;
+	margin-bottom: 20px;
 }
 
 .el-row:last-child {
-  margin-bottom: 0;
+	margin-bottom: 0;
 }
 
 .el-col {
-  border-radius: 4px;
+	border-radius: 4px;
 }
 
 .grid-content {
-  border-radius: 4px;
-  min-height: 36px;
+	border-radius: 4px;
+	min-height: 36px;
 }
 </style>
diff --git a/src/views/gameRole/scale/index.vue b/src/views/gameRole/scale/index.vue
index 18f48fc..09a636e 100644
--- a/src/views/gameRole/scale/index.vue
+++ b/src/views/gameRole/scale/index.vue
@@ -26,10 +26,7 @@
           </el-form-item>
           <el-form-item label="选择区服" prop="server">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="tableData.param.server" class="m-2" placeholder="选择区服" filterable>
               <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
@@ -154,7 +151,7 @@
 //import { ElMessageBox, ElMessage } from 'element-plus';
 import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
 import {liveAccount} from "/@/api/game/index";
-import {allChannelList, allServerList} from "/@/utils/game";
+import {allChannelList, allServerList, ServerCategorize} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 
 // 定义接口来定义对象的类型
@@ -186,6 +183,7 @@ interface TableDataState {
   channels: object[];
   dateNames: object;
   serverSwitch: number;
+  serverCategorize: object[];
 }
 
 export default defineComponent({
@@ -216,6 +214,7 @@ export default defineComponent({
         15: "fifteen",
         30: "thirty"
       },
+      serverCategorize: ServerCategorize,
     });
 
     const getRemain = () => {
diff --git a/src/views/gameRole/searchAccount/index.vue b/src/views/gameRole/searchAccount/index.vue
index dc57ba3..c1e2051 100644
--- a/src/views/gameRole/searchAccount/index.vue
+++ b/src/views/gameRole/searchAccount/index.vue
@@ -5,10 +5,7 @@
         <el-form :inline="true">
           <el-form-item label="服务器">
             <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
+              <el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value"/>
             </el-select>
             <el-select v-model="queryParams.serverId" class="m-2" placeholder="选择服务器" filterable>
               <el-option v-for="item in switchServer()" :key="item.id" :label="item.name" :value="item.id"/>
@@ -80,7 +77,7 @@
 import {toRefs, reactive, onMounted, defineComponent} from 'vue';
 import {gameSearchAccount} from "/@/api/game";
 import {ElMessage} from "element-plus";
-import {allServerList} from "/@/utils/game";
+import {allServerList, ServerCategorize} from "/@/utils/game";
 import {gSwitchServer} from "/@/utils/utils";
 
 // 定义接口来定义对象的类型
@@ -113,6 +110,7 @@ interface TableDataState {
   };
   servers: object[];
   compareType: Array<{ label: string, value: number }>
+  serverCategorize: object[];
 }
 
 export default defineComponent({
@@ -146,7 +144,8 @@ export default defineComponent({
         {value: 3, label: '<',},
         {value: 4, label: '>',},
         {value: 5, label: '>=',}
-      ]
+      ],
+      serverCategorize: ServerCategorize,
     });
 
     const accountList = () => {
diff --git a/src/views/gameRole/statics/index.vue b/src/views/gameRole/statics/index.vue
index be05eda..242be53 100644
--- a/src/views/gameRole/statics/index.vue
+++ b/src/views/gameRole/statics/index.vue
@@ -1,292 +1,287 @@
 <template>
-  <div class="game-statistics-container">
-    <el-card shadow="hover">
-      <div class="system-user-search mb15">
-        <el-form :inline="true">
-          <el-form-item label="渠道" prop="channel">
-            <el-select v-model="tableData.param.channel" class="m-2" placeholder="选择渠道">
-              <el-option v-for="item in channels" :key="item.value" :label="item.label"
-                         :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="选择区服" prop="server">
-            <el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
-              <el-option label="全部" :value="0"/>
-              <el-option label="ios" :value="1"/>
-              <el-option label="安卓" :value="2"/>
-              <el-option label="其他" :value="3"/>
-            </el-select>
-            <el-select v-model="tableData.param.server" class="m-2" placeholder="选择区服" filterable>
-              <el-option v-for="item in switchServer()" :key="item.id+''" :label="item.name" :value="item.id+''"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="起始日期" prop="startTime">
-            <el-date-picker type="datetime" v-model="tableData.param.startTime" format="YYYY-MM-DD HH:mm:ss"
-                            value-format="x"/>
-          </el-form-item>
-          <el-form-item label="起始日期" prop="endTime">
-            <el-date-picker type="datetime" v-model="tableData.param.endTime" format="YYYY-MM-DD HH:mm:ss"
-                            value-format="x"/>
-          </el-form-item>
-          <el-form-item>
-            <el-button size="default" type="primary" class="ml10" @click="getRemain">
-              <el-icon>
-                <ele-Search/>
-              </el-icon>
-              查询
-            </el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-      <el-table :data="tableData.registerData" style="width: 100%">
-        <el-table-column prop="labelName" label="注册数量" width="180"></el-table-column>
-        <el-table-column prop="one" label="男性玩家" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.one">
-              <span>{{ scope.row.one }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="two" label="男性玩家占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.two">
-              <span>{{ scope.row.two }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="three" label="女性玩家" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.three">
-              <span>{{ scope.row.three }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="four" label="女性玩家占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.four">
-              <span>{{ scope.row.four }}</span>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-table :data="tableData.rechargeData" style="width: 100%">
-        <el-table-column prop="labelName" label="充值用户" width="180"></el-table-column>
-        <el-table-column prop="one" label="男性占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.one">
-              <span>{{ scope.row.one }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="four" label="女性占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.four">
-              <span>{{ scope.row.four }}</span>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-      <el-table :data="tableData.accountData" style="width: 100%">
-        <el-table-column prop="age" label="年龄" width="180"></el-table-column>
-        <el-table-column prop="one" label="用户数量" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.one">
-              <span>{{ scope.row.one }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="four" label="百分比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.four">
-              <span>{{ scope.row.four }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="four" label="男性占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.four">
-              <span>{{ scope.row.four }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="four" label="女性占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.four">
-              <span>{{ scope.row.four }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="four" label="充值数量占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.four">
-              <span>{{ scope.row.four }}</span>
-            </div>
-          </template>
-        </el-table-column>
-        <el-table-column prop="four" label="充值额度占比" width="180">
-          <template #default="scope">
-            <div v-if="scope.row.four">
-              <span>{{ scope.row.four }}</span>
-            </div>
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-card>
-  </div>
+	<div class="game-statistics-container">
+		<el-card shadow="hover">
+			<div class="system-user-search mb15">
+				<el-form :inline="true">
+					<el-form-item label="渠道" prop="channel">
+						<el-select v-model="tableData.param.channel" class="m-2" placeholder="选择渠道">
+							<el-option v-for="item in channels" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="选择区服" prop="server">
+						<el-select v-model="serverSwitch" class="m-2" placeholder="选择服务器" size="large" style="width: 80px">
+							<el-option v-for="item in serverCategorize" :key="item.value" :label="item.label" :value="item.value" />
+						</el-select>
+						<el-select v-model="tableData.param.server" class="m-2" placeholder="选择区服" filterable>
+							<el-option v-for="item in switchServer()" :key="item.id + ''" :label="item.name" :value="item.id + ''" />
+						</el-select>
+					</el-form-item>
+					<el-form-item label="起始日期" prop="startTime">
+						<el-date-picker type="datetime" v-model="tableData.param.startTime" format="YYYY-MM-DD HH:mm:ss" value-format="x" />
+					</el-form-item>
+					<el-form-item label="起始日期" prop="endTime">
+						<el-date-picker type="datetime" v-model="tableData.param.endTime" format="YYYY-MM-DD HH:mm:ss" value-format="x" />
+					</el-form-item>
+					<el-form-item>
+						<el-button size="default" type="primary" class="ml10" @click="getRemain">
+							<el-icon>
+								<ele-Search />
+							</el-icon>
+							查询
+						</el-button>
+					</el-form-item>
+				</el-form>
+			</div>
+			<el-table :data="tableData.registerData" style="width: 100%">
+				<el-table-column prop="labelName" label="注册数量" width="180"></el-table-column>
+				<el-table-column prop="one" label="男性玩家" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.one">
+							<span>{{ scope.row.one }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="two" label="男性玩家占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.two">
+							<span>{{ scope.row.two }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="three" label="女性玩家" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.three">
+							<span>{{ scope.row.three }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="four" label="女性玩家占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.four">
+							<span>{{ scope.row.four }}</span>
+						</div>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-table :data="tableData.rechargeData" style="width: 100%">
+				<el-table-column prop="labelName" label="充值用户" width="180"></el-table-column>
+				<el-table-column prop="one" label="男性占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.one">
+							<span>{{ scope.row.one }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="four" label="女性占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.four">
+							<span>{{ scope.row.four }}</span>
+						</div>
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-table :data="tableData.accountData" style="width: 100%">
+				<el-table-column prop="age" label="年龄" width="180"></el-table-column>
+				<el-table-column prop="one" label="用户数量" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.one">
+							<span>{{ scope.row.one }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="four" label="百分比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.four">
+							<span>{{ scope.row.four }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="four" label="男性占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.four">
+							<span>{{ scope.row.four }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="four" label="女性占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.four">
+							<span>{{ scope.row.four }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="four" label="充值数量占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.four">
+							<span>{{ scope.row.four }}</span>
+						</div>
+					</template>
+				</el-table-column>
+				<el-table-column prop="four" label="充值额度占比" width="180">
+					<template #default="scope">
+						<div v-if="scope.row.four">
+							<span>{{ scope.row.four }}</span>
+						</div>
+					</template>
+				</el-table-column>
+			</el-table>
+		</el-card>
+	</div>
 </template>
 
 <script lang="ts">
 //import { ElMessageBox, ElMessage } from 'element-plus';
-import {toRefs, reactive, onMounted, defineComponent,} from 'vue';
-import {liveAccount} from "/@/api/game/index";
-import {allChannelList, allServerList} from "/@/utils/game";
-import {gSwitchServer} from "/@/utils/utils";
+import { toRefs, reactive, onMounted, defineComponent } from 'vue';
+import { liveAccount } from '/@/api/game/index';
+import { allChannelList, allServerList, ServerCategorize } from '/@/utils/game';
+import { gSwitchServer } from '/@/utils/utils';
 
 // 定义接口来定义对象的类型
 interface TableData {
-  labelName: string
-  one: number
-  two: number
-  three: number
-  four: number
-  five: number
-  six: number
-  seven: number
-  fifteen: number
-  thirty: number
+	labelName: string;
+	one: number;
+	two: number;
+	three: number;
+	four: number;
+	five: number;
+	six: number;
+	seven: number;
+	fifteen: number;
+	thirty: number;
 }
 
 interface TableDataState {
-  serverSwitch: number;
-  tableData: {
-    data: Array<TableData>;
-    registerNum: number;
-    param: {
-      channel: string;
-      server: number;
-      createTime: string;
-    };
-    total: number;
-  };
-  servers: object[];
-  channels: object[];
-  dateNames: object;
+	serverSwitch: number;
+	tableData: {
+		data: Array<TableData>;
+		registerNum: number;
+		param: {
+			channel: string;
+			server: number;
+			createTime: string;
+		};
+		total: number;
+	};
+	servers: object[];
+	channels: object[];
+	dateNames: object;
+	serverCategorize: object;
 }
 
 export default defineComponent({
-  name: 'apiV1GameRoleStatics',
-  setup() {
-    const state = reactive<TableDataState>({
-      serverSwitch: 0,
-      tableData: {
-        data: [{labelName: "总注册量"}, {labelName: "活跃-占比"}, {labelName: "最高在线"}],
-        registerNum: 0,
-        param: {
-          channel: "",
-          server: "",
-          createTime: "",
-        },
-        total: 0,
-      },
-      servers: [],
-      channels: [],
-      dateNames: {
-        1: "one",
-        2: "two",
-        3: "three",
-        4: "four",
-        5: "five",
-        6: "six",
-        7: "seven",
-        15: "fifteen",
-        30: "thirty"
-      },
-    });
+	name: 'apiV1GameRoleStatics',
+	setup() {
+		const state = reactive<TableDataState>({
+			serverSwitch: 0,
+			tableData: {
+				data: [{ labelName: '总注册量' }, { labelName: '活跃-占比' }, { labelName: '最高在线' }],
+				registerNum: 0,
+				param: {
+					channel: '',
+					server: '',
+					createTime: '',
+				},
+				total: 0,
+			},
+			servers: [],
+			channels: [],
+			dateNames: {
+				1: 'one',
+				2: 'two',
+				3: 'three',
+				4: 'four',
+				5: 'five',
+				6: 'six',
+				7: 'seven',
+				15: 'fifteen',
+				30: 'thirty',
+			},
+			serverCategorize: ServerCategorize,
+		});
 
-    const getRemain = () => {
-      state.tableData.data = [{labelName: "总注册量"}, {labelName: "活跃-占比"}, {labelName: "最高在线"}];
-      const highData = state.tableData.data[2];
-      const liveData = state.tableData.data[1];
-      const registerData = {};
-      const totalRegisterData = state.tableData.data[0];
-      let date = state.tableData.param.createTime;
-      liveAccount(state.tableData.param).then(res => {
-        console.log("keepAccount:", res);
-        const highLogs = res.data && res.data.highLogs || [];
-        const liveLogs = res.data && res.data.liveLogs || [];
-        const registerLogs = res.data && res.data.registerLogs || [];
-        highLogs.map((item: any) => {
-          // if(item.cd == item.ct){
-          //   state.tableData.registerNum = item.num;
-          // }
-          let delta = getDaysBetween(date + " 00:00:00", item.cd + " 00:00:00");
-          let name = state.dateNames[delta];
-          if (name) {
-            highData[name] = item.num
-          }
-        });
-        registerLogs.map((item: any) => {
-          let delta = getDaysBetween(date + " 00:00:00", item.ct + " 00:00:00");
-          let name = state.dateNames[delta];
-          if (name) {
-            registerData[name] = item.num
-          }
-        });
-        for (let i in state.dateNames) {
-          let name = state.dateNames[i];
-          totalRegisterData[name] = res.data.registerTotal;
-          for (let j = 1; j <= i; j++) {
-            if (registerData[state.dateNames[j]]) {
-              totalRegisterData[name] += registerData[state.dateNames[j]]
-            }
-          }
-        }
-        liveLogs.map((item: any) => {
-          let delta = getDaysBetween(date + " 00:00:00", item.cd + " 00:00:00");
-          let name = state.dateNames[delta];
-          if (name) {
-            liveData[name] = item.num;
-            if (registerData[name]) {
-              console.log("register: ", item.num, registerData[name], Math.floor(Number(item.num) / Number(registerData[name]) * 100));
-              liveData[name] += '--' + Math.floor(Number(item.num) / Number(totalRegisterData[name]) * 100) + "%"
-            }
-          }
-        });
+		const getRemain = () => {
+			state.tableData.data = [{ labelName: '总注册量' }, { labelName: '活跃-占比' }, { labelName: '最高在线' }];
+			const highData = state.tableData.data[2];
+			const liveData = state.tableData.data[1];
+			const registerData = {};
+			const totalRegisterData = state.tableData.data[0];
+			let date = state.tableData.param.createTime;
+			liveAccount(state.tableData.param).then((res) => {
+				console.log('keepAccount:', res);
+				const highLogs = (res.data && res.data.highLogs) || [];
+				const liveLogs = (res.data && res.data.liveLogs) || [];
+				const registerLogs = (res.data && res.data.registerLogs) || [];
+				highLogs.map((item: any) => {
+					// if(item.cd == item.ct){
+					//   state.tableData.registerNum = item.num;
+					// }
+					let delta = getDaysBetween(date + ' 00:00:00', item.cd + ' 00:00:00');
+					let name = state.dateNames[delta];
+					if (name) {
+						highData[name] = item.num;
+					}
+				});
+				registerLogs.map((item: any) => {
+					let delta = getDaysBetween(date + ' 00:00:00', item.ct + ' 00:00:00');
+					let name = state.dateNames[delta];
+					if (name) {
+						registerData[name] = item.num;
+					}
+				});
+				for (let i in state.dateNames) {
+					let name = state.dateNames[i];
+					totalRegisterData[name] = res.data.registerTotal;
+					for (let j = 1; j <= i; j++) {
+						if (registerData[state.dateNames[j]]) {
+							totalRegisterData[name] += registerData[state.dateNames[j]];
+						}
+					}
+				}
+				liveLogs.map((item: any) => {
+					let delta = getDaysBetween(date + ' 00:00:00', item.cd + ' 00:00:00');
+					let name = state.dateNames[delta];
+					if (name) {
+						liveData[name] = item.num;
+						if (registerData[name]) {
+							console.log('register: ', item.num, registerData[name], Math.floor((Number(item.num) / Number(registerData[name])) * 100));
+							liveData[name] += '--' + Math.floor((Number(item.num) / Number(totalRegisterData[name])) * 100) + '%';
+						}
+					}
+				});
+			});
+		};
 
-      })
-    };
+		function getDaysBetween(date1, date2) {
+			var startDate = Date.parse(date1);
+			var endDate = Date.parse(date2);
+			if (startDate > endDate) {
+				return 0;
+			}
+			if (startDate == endDate) {
+				return 1;
+			}
+			var days = (endDate - startDate) / 86400000 + 1;
+			return days;
+		}
 
-    function getDaysBetween(date1, date2) {
-      var startDate = Date.parse(date1);
-      var endDate = Date.parse(date2);
-      if (startDate > endDate) {
-        return 0;
-      }
-      if (startDate == endDate) {
-        return 1;
-      }
-      var days = (endDate - startDate) / 86400000 + 1;
-      return days;
-    }
+		onMounted(function () {
+			allServerList().then((res) => {
+				state.servers = res;
+				// console.log(" server : ", state.servers);
+			});
 
-    onMounted(function () {
-      allServerList().then(res => {
-        state.servers = res;
-        // console.log(" server : ", state.servers);
-      })
-
-      allChannelList().then(res => {
-        state.channels = res;
-      });
-    });
-    const switchServer = () => {
-      return gSwitchServer(state.serverSwitch, state.servers)
-    };
-    return {
-      switchServer,
-      getRemain,
-      ...toRefs(state),
-    };
-  },
+			allChannelList().then((res) => {
+				state.channels = res;
+			});
+		});
+		const switchServer = () => {
+			return gSwitchServer(state.serverSwitch, state.servers);
+		};
+		return {
+			switchServer,
+			getRemain,
+			...toRefs(state),
+		};
+	},
 });
 </script>