feat: 将切换标签按钮移至左侧导航栏,并优化返回门户时语言参数的保留逻辑。
This commit is contained in:
parent
812300ead6
commit
616be27823
@ -9,6 +9,7 @@
|
|||||||
<div class="nav">
|
<div class="nav">
|
||||||
<div class="left">
|
<div class="left">
|
||||||
<div class="back" @click="handleBack"></div>
|
<div class="back" @click="handleBack"></div>
|
||||||
|
<div class="switch-tab" @click.stop="showSwitchtab(true)"></div>
|
||||||
<div class="user">
|
<div class="user">
|
||||||
<div class="name">
|
<div class="name">
|
||||||
{{ userInfo.username }}
|
{{ userInfo.username }}
|
||||||
@ -124,8 +125,7 @@
|
|||||||
></li>
|
></li>
|
||||||
</ul>
|
</ul>
|
||||||
<ul class="right-btn">
|
<ul class="right-btn">
|
||||||
<li class="btn switch-tab" @click.stop="showSwitchtab(true)"></li>
|
<!-- 右侧按钮已移至左上角导航栏 -->
|
||||||
<!-- <li class="btn continue" @click="cancelChip()"></li> -->
|
|
||||||
</ul>
|
</ul>
|
||||||
<iframe
|
<iframe
|
||||||
v-if="switchVideo && tableData"
|
v-if="switchVideo && tableData"
|
||||||
@ -391,10 +391,17 @@ export default {
|
|||||||
const urlParams = new URLSearchParams(window.location.search)
|
const urlParams = new URLSearchParams(window.location.search)
|
||||||
const from = urlParams.get('from')
|
const from = urlParams.get('from')
|
||||||
const returnUrl = urlParams.get('returnUrl')
|
const returnUrl = urlParams.get('returnUrl')
|
||||||
|
const language = urlParams.get('language')
|
||||||
|
|
||||||
if (from === 'portal' && returnUrl) {
|
if (from === 'portal' && returnUrl) {
|
||||||
// 返回到 Portal
|
// 返回到 Portal,保留语言设置
|
||||||
window.location.href = decodeURIComponent(returnUrl)
|
let finalUrl = decodeURIComponent(returnUrl)
|
||||||
|
if (language) {
|
||||||
|
// 如果 URL 中已有参数,用 & 连接,否则用 ?
|
||||||
|
const separator = finalUrl.includes('?') ? '&' : '?'
|
||||||
|
finalUrl = `${finalUrl}${separator}language=${language}`
|
||||||
|
}
|
||||||
|
window.location.href = finalUrl
|
||||||
} else {
|
} else {
|
||||||
// 返回到游戏大厅
|
// 返回到游戏大厅
|
||||||
router.replace({ name: routerStack.value })
|
router.replace({ name: routerStack.value })
|
||||||
@ -1290,17 +1297,28 @@ $gold: #c5a059;
|
|||||||
height: 0.923rem;
|
height: 0.923rem;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
gap: 0.3rem;
|
||||||
.back {
|
.back {
|
||||||
width: 0.923rem;
|
width: 0.923rem;
|
||||||
height: 0.923rem;
|
height: 0.923rem;
|
||||||
background: url("~@/assets/images/icon/back_white.png") center center
|
background: url("~@/assets/images/icon/back.png") center center
|
||||||
no-repeat;
|
no-repeat;
|
||||||
background-size: 50% auto;
|
background-size: 60% auto;
|
||||||
margin-left: 0.6rem;
|
margin-left: 0.6rem;
|
||||||
&:active {
|
&:active {
|
||||||
opacity: 0.5;
|
opacity: 0.5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.switch-tab {
|
||||||
|
width: 0.923rem;
|
||||||
|
height: 0.923rem;
|
||||||
|
background: url("~@/assets/images/icon/switch_tab.png") center center
|
||||||
|
no-repeat;
|
||||||
|
background-size: 60% auto;
|
||||||
|
&:active {
|
||||||
|
opacity: 0.5;
|
||||||
|
}
|
||||||
|
}
|
||||||
.user {
|
.user {
|
||||||
font-size: 13px;
|
font-size: 13px;
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user