diff --git a/.env b/.env index 30b8e66..b8f82d8 100644 --- a/.env +++ b/.env @@ -5,4 +5,4 @@ VITE_PORT = 8888 VITE_OPEN = false # public path 配置线上环境路径（打包）、本地通过 http-server 访问时，请置空即可 -VITE_PUBLIC_PATH = /vue-next-admin-preview/ +VITE_PUBLIC_PATH = / diff --git a/CHANGELOG.md b/CHANGELOG.md index e736d6b..c07c8e7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -205,7 +205,7 @@ - 🐞 修复 切换不同布局时，再去开启 `经典布局分割菜单` 功能不生效问题 - 🐞 修复 浏览器窗口标题中/英文切换不实时生效的问题 - 🐞 修复 切换布局时，某些功能不可以使用。部分界面不需要取消事件监听(proxy.mittBus.off('xxx')) -- 🐞 修复 动态路由带参数，router-link 跳转问题（#I3YX6G） +- 🐞 修复 动态路由带参数，router-link 跳转问题（#I3YX6G） - 🐞 修复 横向菜单有二级菜单时，点击子级菜单不高亮问题 - 🐞 修复 功能 tagsView 操作演示不生效 diff --git a/src/api/game/index.ts b/src/api/game/index.ts index 7566afc..feacf71 100644 --- a/src/api/game/index.ts +++ b/src/api/game/index.ts @@ -980,3 +980,11 @@ export function getOperLog(params: object) { params: params, }); } + +export function gameLoginOutGm(params: object) { + return request({ + url: '/api/v1/game/loginOut/getGm', + method: 'get', + params: params, + }); +} diff --git a/src/api/login/index.ts b/src/api/login/index.ts index ad4f117..dadf1cc 100644 --- a/src/api/login/index.ts +++ b/src/api/login/index.ts @@ -11,6 +11,50 @@ export function login(params: object){ data: params, }); } +/** + * 登录api接口集合 + * @method signIn 用户登录 + */ +export function loginMobile(params: object){ + return request({ + url: '/api/v1/system/loginMobile', + method: 'post', + data: params, + }); +} +/** + * 登录api接口集合 + * @method signIn 用户登录 + */ +export function mobileCode(params: object){ + return request({ + url: '/api/v1/system/mobileCode', + method: 'post', + data: params, + }); +} +/** + * 登录api接口集合 + * @method signIn 用户登录 + */ +export function loginEmail(params: object){ + return request({ + url: '/api/v1/system/loginEmail', + method: 'post', + data: params, + }); +} +/** + * 登录api接口集合 + * @method signIn 用户登录 + */ +export function emailCode(params: object){ + return request({ + url: '/api/v1/system/emailCode', + method: 'post', + data: params, + }); +} /** * 获取验证码 diff --git a/src/i18n/pages/login/en.ts b/src/i18n/pages/login/en.ts index 2654a18..283b55c 100644 --- a/src/i18n/pages/login/en.ts +++ b/src/i18n/pages/login/en.ts @@ -3,6 +3,7 @@ export default { label: { one1: 'User name login', two2: 'Mobile number', + three3: 'Email address', }, link: { one3: 'Third party login', @@ -22,6 +23,14 @@ export default { msgText: 'Warm tip: it is recommended to use Google, Microsoft edge, version 79.0.1072.62 and above browsers, and 360 browser, please use speed mode', }, + email: { + placeholder1: 'Please input email address', + placeholder2: 'Please enter the verification code', + codeText: 'Get code', + btnText: 'Sign in', + msgText: + 'Warm tip: it is recommended to use Google, Microsoft edge, version 79.0.1072.62 and above browsers, and 360 browser, please use speed mode', + }, scan: { text: 'Open the mobile phone to scan and quickly log in / register', }, diff --git a/src/i18n/pages/login/zh-cn.ts b/src/i18n/pages/login/zh-cn.ts index 3367b53..a826f90 100644 --- a/src/i18n/pages/login/zh-cn.ts +++ b/src/i18n/pages/login/zh-cn.ts @@ -3,6 +3,7 @@ export default { label: { one1: '用户名登录', two2: '手机号登录', + three3: '邮箱登录', }, link: { one3: '第三方登录', @@ -21,6 +22,13 @@ export default { btnText: '登 录', msgText: '* 温馨提示：建议使用谷歌、Microsoft Edge，版本 79.0.1072.62 及以上浏览器，360浏览器请使用极速模式', }, + email: { + placeholder1: '请输入邮箱地址', + placeholder2: '请输入验证码', + codeText: '获取验证码', + btnText: '登 录', + msgText: '* 温馨提示：建议使用谷歌、Microsoft Edge，版本 79.0.1072.62 及以上浏览器，360浏览器请使用极速模式', + }, scan: { text: '打开手机扫一扫，快速登录/注册', }, diff --git a/src/i18n/pages/login/zh-tw.ts b/src/i18n/pages/login/zh-tw.ts index 138e8c8..4647953 100644 --- a/src/i18n/pages/login/zh-tw.ts +++ b/src/i18n/pages/login/zh-tw.ts @@ -3,6 +3,7 @@ export default { label: { one1: '用戶名登入', two2: '手機號登入', + three3: '郵箱登入', }, link: { one3: '協力廠商登入', @@ -21,6 +22,13 @@ export default { btnText: '登入', msgText: '* 溫馨提示：建議使用穀歌、Microsoft Edge，版本79.0.1072.62及以上瀏覽器，360瀏覽器請使用極速模式', }, + email: { + placeholder1: '請輸入郵箱地址', + placeholder2: '請輸入驗證碼', + codeText: '獲取驗證碼', + btnText: '登入', + msgText: '* 溫馨提示：建議使用穀歌、Microsoft Edge，版本79.0.1072.62及以上瀏覽器，360瀏覽器請使用極速模式', + }, scan: { text: '打開手機掃一掃，快速登錄/注册', }, diff --git a/src/views/gameLoginUrl/serverVersion/index.vue b/src/views/gameLoginUrl/serverVersion/index.vue index 52418c9..fae4aad 100644 --- a/src/views/gameLoginUrl/serverVersion/index.vue +++ b/src/views/gameLoginUrl/serverVersion/index.vue @@ -23,7 +23,7 @@ - + @@ -147,3 +147,19 @@ export default defineComponent({ }, }); + + \ No newline at end of file diff --git a/src/views/gameManage/copyUnit/index.vue b/src/views/gameManage/copyUnit/index.vue index b917322..5b3ae25 100644 --- a/src/views/gameManage/copyUnit/index.vue +++ b/src/views/gameManage/copyUnit/index.vue @@ -195,8 +195,7 @@ import { gameGMUpdateUnit, gameGMDelAccount, gameResetPwd, - giftExchangeExists, - gameDeleteAccount + giftExchangeExists } from '/@/api/game'; import { gSwitchServer } from '/@/utils/utils'; import { AllServerList, ServerCategorize, serverList } from '/@/utils/game'; diff --git a/src/views/gameManage/gm/component/editConfig.vue b/src/views/gameManage/gm/component/editConfig.vue index ca40928..4ae23e5 100644 --- a/src/views/gameManage/gm/component/editConfig.vue +++ b/src/views/gameManage/gm/component/editConfig.vue @@ -17,7 +17,7 @@ {{ scope.row.serverName }} - + diff --git a/src/views/gameNotice/pop/index.vue b/src/views/gameNotice/pop/index.vue index 9b1e547..e6d41ea 100644 --- a/src/views/gameNotice/pop/index.vue +++ b/src/views/gameNotice/pop/index.vue @@ -9,7 +9,8 @@ - + 全选 + @@ -404,7 +405,15 @@ export default defineComponent({ const switchServer = () => { return gSwitchServer(state.serverSwitch, state.servers); }; + const changeServer = () => { + let servers = gSwitchServer(state.serverSwitch, state.servers); + state.tableData.param.servers = []; + for (let i in servers) { + state.tableData.param.servers.push(servers[i].id); + } + }; return { + changeServer, switchServer, showContent, noticePop, diff --git a/src/views/gameResetOrderSign/reset/index.vue b/src/views/gameResetOrderSign/reset/index.vue index 969f048..51069de 100644 --- a/src/views/gameResetOrderSign/reset/index.vue +++ b/src/views/gameResetOrderSign/reset/index.vue @@ -16,13 +16,13 @@ \ No newline at end of file + diff --git a/src/views/gameRole/deleteAccount/index.vue b/src/views/gameRole/deleteAccount/index.vue index e92af38..f140026 100644 --- a/src/views/gameRole/deleteAccount/index.vue +++ b/src/views/gameRole/deleteAccount/index.vue @@ -32,7 +32,7 @@ import { toRefs, reactive, onMounted, defineComponent } from 'vue'; import { gameDeleteAccount } from '/@/api/game'; import { ElMessage, ElMessageBox } from 'element-plus'; -import { AllServerList, ServerCategorize, serverList } from '/@/utils/game'; +import { ServerCategorize, serverList } from '/@/utils/game'; import { gSwitchServer } from '/@/utils/utils'; interface TableDataState { diff --git a/src/views/gameRole/loginOutInfoGm/index.vue b/src/views/gameRole/loginOutInfoGm/index.vue new file mode 100644 index 0000000..cf30dbf --- /dev/null +++ b/src/views/gameRole/loginOutInfoGm/index.vue @@ -0,0 +1,296 @@ + + + + diff --git a/src/views/gameRole/role/index.vue b/src/views/gameRole/role/index.vue index 84852e8..8a3c65a 100644 --- a/src/views/gameRole/role/index.vue +++ b/src/views/gameRole/role/index.vue @@ -365,11 +365,6 @@ {{ scope.row.cTime }} - - - - - { - let data = { - serverId: state.queryParams.serverId, - content: '强制踢出', - uids: state.tableData.account.uid, - popType: 3, - popTo: 2, - }; - console.log('Notice: ', data); - gameNoticePop(data) - .then(() => { - ElMessage.success(data.serverId + '退出弹窗发送成功'); - deleteRank(); - }) - .finally(() => { - // state.loading = false; - }); + ElMessageBox.confirm('是否确认强制踢出编号'+state.queryParams.serverId+'区的玩家'+state.tableData.account.AccountName+'['+state.tableData.account.uid+']？', '提示', { + confirmButtonText: '确认', + cancelButtonText: '取消', + type: 'warning', + }).then(() => { + let data = { + serverId: state.queryParams.serverId, + content: '强制踢出', + uids: state.tableData.account.uid, + popType: 3, + popTo: 2, + }; + console.log('Notice: ', data); + gameNoticePop(data) + .then(() => { + ElMessage.success(data.serverId + '退出弹窗发送成功'); + deleteRank(); + }) + .finally(() => { + // state.loading = false; + }); + }); }; const deleteRank = () => { let data = { @@ -1419,7 +1420,7 @@ export default defineComponent({ uid: state.tableData.account.uid, }; console.log('Notice: ', data); - ElMessageBox.confirm('是否确认删除排行榜？', '提示', { + ElMessageBox.confirm('是否确认删除编号'+state.queryParams.serverId+'区的玩家'+state.tableData.account.AccountName+'['+state.tableData.account.uid+']的排行榜？', '提示', { confirmButtonText: '确认', cancelButtonText: '取消', type: 'warning', @@ -1427,7 +1428,7 @@ export default defineComponent({ deleteGameRank(data) .then((res) => { if (res.data.mess) { - ElMessage.success(data.serverId + '排行榜删除成功!' + res.data.mess); + ElMessage.success(data.serverId +'区[uid:'+data.uid+']'+ '排行榜删除成功!' + res.data.mess); } }) .finally(() => { diff --git a/src/views/login/component/account.vue b/src/views/login/component/account.vue index 08d6693..85d74c0 100644 --- a/src/views/login/component/account.vue +++ b/src/views/login/component/account.vue @@ -80,7 +80,7 @@ import { initBackEndControlRoutes } from '/@/router/backEnd'; import { useStore } from '/@/store/index'; import { Session } from '/@/utils/storage'; import { formatAxis } from '/@/utils/formatTime'; -import {login,captcha} from '/@/api/login'; +import {login} from '/@/api/login'; export default defineComponent({ name: 'loginAccount', setup() { diff --git a/src/views/login/component/email.vue b/src/views/login/component/email.vue new file mode 100644 index 0000000..853e349 --- /dev/null +++ b/src/views/login/component/email.vue @@ -0,0 +1,183 @@ + + + + + diff --git a/src/views/login/component/mobile.vue b/src/views/login/component/mobile.vue index 9664bb0..a0f4930 100644 --- a/src/views/login/component/mobile.vue +++ b/src/views/login/component/mobile.vue @@ -1,5 +1,5 @@