合服修改

src/utils/game.ts

@@ -309,12 +309,14 @@ export const GameSetList = [
 	{ value: 'enableHotfix', label: '是否开启热更' },
 	{ value: 'enableAccountLogin', label: '是否开启账密' },
 	{ value: 'loginUrlChannelList', label: '登录类别检索' },
+	{ value: 'enableAds', label: '是否开启穿山甲广告' },
 ];
 
 export const GameSetOrder = [
 	{ value: 'enableHotfix', label: '渠道+版本号 > 渠道' },
 	{ value: 'enableAccountLogin', label: '渠道+版本号 > 渠道' },
 	{ value: 'loginUrlChannelList', label: '渠道+版本号 > 渠道 > 版本号' },
+	{ value: 'enableAds', label: '渠道+版本号 > 渠道' },
 ];
 
 export async function channelList(): Promise<object[]> {

src/utils/setIconfont.ts

@@ -1,7 +1,6 @@
-// 字体图标 url
+// 字体图标 url  '//lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/font-awesome/4.7.0/css/font-awesome.min.css',
 const cssCdnUrlList: Array<string> = [
 	'//at.alicdn.com/t/font_2298093_y6u00apwst.css',
-	'//lf3-cdn-tos.bytecdntp.com/cdn/expire-1-M/font-awesome/4.7.0/css/font-awesome.min.css',
 ];
 // 第三方 js url
 const jsCdnUrlList: Array<string> = [];

src/utils/utils.ts

@@ -91,6 +91,24 @@ export function gSwitchServer(serverSwitch, servers) {
 	}
 }
 
+export function ghSwitchServer(serverSwitch, servers) {
+	if (servers.length > 0) {
+		servers = servers.filter((r) => r.belong == 0);
+	}
+	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;
+	}
+}
+
 export function guid() {
 	return this.s4() + this.s4() + this.s4() + this.s4() + this.s4() + this.s4() + this.s4() + this.s4();
 }
@@ -118,8 +136,9 @@ export function channelFill(val: any) {
 export function getCompleteChannel(channel: any, subChannel: any) {
 	return channelFill(channel) + channelFill(subChannel);
 }
-export  function uniquePeriodId(arr) {
-	return arr.filter(function(item, index) {
-		return arr.indexOf(arr.find(r=>r.PeriodId == item.PeriodId)) === index;
+
+export function uniquePeriodId(arr) {
+	return arr.filter(function (item, index) {
+		return arr.indexOf(arr.find((r) => r.PeriodId == item.PeriodId)) === index;
 	});
 }

src/views/gameMail/send/index.vue

@@ -261,7 +261,7 @@ import { ServerCategorize, serverList } from '/@/utils/game';
 import AllItemConfigCategory from '/@/api/config/AllItemConfigCategory.json';
 import { ElMessage, ElMessageBox } from 'element-plus';
 import { Session } from '/@/utils/storage';
-import { getCookie, gSwitchServer } from '/@/utils/utils';
+import {getCookie, ghSwitchServer, gSwitchServer} from '/@/utils/utils';
 
 interface QueryParams {
 	serverId: string[];
@@ -641,10 +641,10 @@ export default defineComponent({
 		};
 
 		const switchServer = () => {
-			return gSwitchServer(state.serverSwitch, state.servers);
+			return ghSwitchServer(state.serverSwitch, state.servers);
 		};
 		const changeServer = () => {
-			let servers = gSwitchServer(state.serverSwitch, state.servers);
+			let servers = ghSwitchServer(state.serverSwitch, state.servers);
       state.queryParams.serverId = [];
 			for (let i in servers) {
 				state.queryParams.serverId.push(servers[i].id);

src/views/gameNotice/pop/index.vue

@@ -124,7 +124,7 @@
 import { toRefs, reactive, onMounted, defineComponent } from 'vue';
 import { ElMessageBox, ElMessage } from 'element-plus';
 import { gameNoticePop, gameGMNoticeModelGet, gameGMNoticeModelAdd, gameGMNoticeModelDel } from '/@/api/game/notice';
-import { contentReplace, gSwitchServer } from '/@/utils/utils';
+import {contentReplace, ghSwitchServer, gSwitchServer} from '/@/utils/utils';
 import { ServerCategorize, serverList } from '/@/utils/game';
 
 interface TableDataState {
@@ -403,10 +403,10 @@ export default defineComponent({
 			console.log(state.tableData.content);
 		};
 		const switchServer = () => {
-			return gSwitchServer(state.serverSwitch, state.servers);
+			return ghSwitchServer(state.serverSwitch, state.servers);
 		};
     const changeServer = () => {
-      let servers = gSwitchServer(state.serverSwitch, state.servers);
+      let servers = ghSwitchServer(state.serverSwitch, state.servers);
       state.tableData.param.servers = [];
       for (let i in servers) {
         state.tableData.param.servers.push(servers[i].id);

src/views/gameRole/online/index.vue

@@ -68,7 +68,7 @@
 import { toRefs, reactive, onMounted, defineComponent } from 'vue';
 import { allServerList, ServerCategorize, ServerList } from '/@/utils/game';
 import { gameOnlineList, gameOnlineTopList } from '/@/api/game/basicinfo';
-import { gSwitchServer } from '/@/utils/utils';
+import {ghSwitchServer, gSwitchServer} from '/@/utils/utils';
 
 // 定义接口来定义对象的类型
 interface TableData {
@@ -183,7 +183,7 @@ export default defineComponent({
 			});
 		});
 		const switchServer = () => {
-			return gSwitchServer(state.serverSwitch, state.servers);
+			return ghSwitchServer(state.serverSwitch, state.servers);
 		};
 		return {
 			switchServer,