Merge branch 'xingyy' into dev

app/app.vue

@@ -11,7 +11,7 @@ useHead({
   ],
 })
 
-
+const route = useRoute()
 // 添加路由中间件来处理过渡方向
 const router = useRouter()
 const slideDirection = ref('slide-left')
@@ -37,7 +37,6 @@ if (to.path==='/'){
 
 // 提供过渡名称给页面组件
 provide('slideDirection', slideDirection)
-
 </script>
 
 <template>
@@ -50,7 +49,7 @@ provide('slideDirection', slideDirection)
       <NuxtLayout>
         <NuxtPage :transition="{
         name: slideDirection
-      }"/>
+      }" keepalive />
       </NuxtLayout>
     </VanConfigProvider>
   </client-only>

app/pages/login/index.vue

@@ -11,6 +11,7 @@ const router = useRouter();
 const route = useRoute();
 const { locale } = useI18n()
 definePageMeta({
+  keepalive: true,
   i18n: 'login.title'
 })
 const loadingRef=ref({

app/stores/live/index.js

@@ -113,7 +113,8 @@ export const liveStore = createGlobalState(() => {
     const WS_TYPES = {
         TIP: 'tip',
         STOP_ARTWORK: 'stopArtwork',
-        OVER: 'over'
+        OVER: 'over',
+        CHANGEPRICEINFO : 'changePriceInfo'
     }
 
     const TIP_TYPES = {
@@ -171,6 +172,9 @@ export const liveStore = createGlobalState(() => {
                     quoteStatus.value=false
                     message.success(createMessageConfig(t('live_room.text4'), '#18A058', t('live_room.text5')))
                 },
+                [TIP_TYPES.CHANGEPRICEINFO]: ()=>{
+                    message.warning(t('live_room.text11'))
+                },
                 [TIP_TYPES.ARTWORK_OVER]: () =>{
                     quoteStatus.value=false
                     message.success(createMessageConfig(

i18n/locales/en-US.json

@@ -230,7 +230,8 @@
     "text7": "Please wait for the next lot",
     "text8": "Sorry, bidding unsuccessful",
     "text9": "Bidding ended",
-    "text10": "Bidding ended, thank you for participating"
+    "text10": "Bidding ended, thank you for participating",
+    "text11": "The bidding table has been updated"
   },
   "personal": {
     "title": "Please fill in your personal information",

i18n/locales/ja-JP.json

@@ -230,7 +230,8 @@
     "text7": "次のロットをお待ちください",
     "text8": "申し訳ありません、落札失敗",
     "text9": "入札終了",
-    "text10": "入札終了、ご参加ありがとうございました"
+    "text10": "入札終了、ご参加ありがとうございました",
+    "text11": "入札テーブルが更新されました"
   },
   "personal": {
     "title": "個人情報を入力してください",

i18n/locales/zh-CN.json

@@ -230,7 +230,8 @@
     "text7": "请期待下个拍品",
     "text8": "很遗憾，竞拍失败",
     "text9": "竞拍结束",
-    "text10": "竞拍结束，谢谢参与"
+    "text10": "竞拍结束，谢谢参与",
+    "text11": "竞价表已更新"
   },
   "personal": {
     "title": "请填写个人相关信息",

i18n/locales/zh-TW.json

@@ -281,7 +281,8 @@
     "text7": "請期待下個拍品",
     "text8": "很遺憾，競拍失敗",
     "text9": "競拍結束",
-    "text10": "競拍結束，謝謝參與"
+    "text10": "競拍結束，謝謝參與",
+    "text11": "競價表已更新"
   },
   "personal": {
     "title": "請填寫個人相關信息",