diff --git a/app/pages/signature/panel/index.vue b/app/pages/signature/panel/index.vue index 252bc6d..9cec762 100644 --- a/app/pages/signature/panel/index.vue +++ b/app/pages/signature/panel/index.vue @@ -22,7 +22,7 @@ const checkScreenOrientation = () => { isLandscapeMode.value = true; } else { isLandscapeMode.value = false; - showToast($t('common.landscape')); + showToast($t('signature.tips.landscape')); } }; @@ -90,7 +90,7 @@ router.back() type="primary" @click="goBack" > - {{ $t('signature.back') }} + {{ $t('signature.action.back') }} - {{ $t('signature.clear') }} + {{ $t('signature.action.clear') }} - {{ $t('signature.confirm') }} + {{ $t('signature.action.confirm') }} diff --git a/app/plugins/i18n.ts b/app/plugins/i18n.ts index cf34393..ec535e6 100644 --- a/app/plugins/i18n.ts +++ b/app/plugins/i18n.ts @@ -18,12 +18,12 @@ export default defineNuxtPlugin(() => { // 暂时设置固定语言,用于调试 // 可以根据需要修改这里的语言代码:'zh-CN' | 'en-US' | 'ja-JP' | 'zh-TW' -/* const fixedLang = 'ja-JP' + const fixedLang = 'zh-CN' setLocale(fixedLang) - Locale.use(fixedLang)*/ + Locale.use(fixedLang) // 原自动检测系统语言的逻辑(暂时注释) - const lang = localStorage.getItem('lang') +/* const lang = localStorage.getItem('lang') if (lang) { setLocale(lang as TypeLocale) Locale.use(lang) @@ -31,6 +31,6 @@ export default defineNuxtPlugin(() => { else { setLocale(i18n.locale.value) Locale.use(i18n.locale.value) - } + }*/ } }) diff --git a/app/stores/live/index.js b/app/stores/live/index.js index 5b17721..2eefb0f 100644 --- a/app/stores/live/index.js +++ b/app/stores/live/index.js @@ -210,10 +210,13 @@ export const liveStore = createGlobalState(() => { handleTipMessage(tip?.tipType) break case WS_TYPES.STOP_ARTWORK: + console.log('changeQuote',quoteStatus.value) //quoteStatus.value = false break case WS_TYPES.OVER: + quoteStatus.value = false + console.log('changeQuote',quoteStatus.value) message.success(createMessageConfig( t('live_room.text10'), '#575757', @@ -239,7 +242,6 @@ export const liveStore = createGlobalState(() => { }) } const changeStatus = () => { - console.log('changeStatus') if (auctionData.value.artwork?.isSelling&&!auctionData.value.artwork.isSoled){ quoteStatus.value = !quoteStatus.value }else { @@ -247,7 +249,7 @@ export const liveStore = createGlobalState(() => { quoteStatus.value = false } } - + console.log('changeQuote',quoteStatus.value) } return{ fullLive,