123

feat(live获取失败时的处理机制
2025-02-12 10:17:28 +08:00 · 2025-02-12 09:09:58 +08:00 · 2025-02-11 15:58:35 +08:00 · 2025-02-11 15:39:22 +08:00 · 2025-02-11 15:27:31 +08:00 · 2025-02-11 14:56:19 +08:00
13 changed files with 310 additions and 9883 deletions
--- a/app/components/AppHeader.vue
+++ b/app/components/AppHeader.vue
@ -1,10 +1,9 @@
 <script setup>
 import { useAppHeaderRouteNames as routeWhiteList } from '@/config'
-import { goodStore } from "@/stores/goods/index.js";
-const { fullLive } = goodStore()
+import { liveStore } from "@/stores/live/index.js";
+const { fullLive } = liveStore()
 const route = useRoute()
 const router = useRouter()
-
 function onBack() {
  if (fullLive.value){
    fullLive.value=false
--- a/app/components/floatingVideo/index.vue
+++ b/app/components/floatingVideo/index.vue
@ -1,207 +0,0 @@
-<template>
-  <div
-      v-show="isVisible"
-      :class="['floating-video', { minimized: isMinimized }]"
-      class="!aspect-video"
-      :style="[positionStyle, containerStyle]"
-      @touchstart.prevent="handleTouchStart"
-      @touchmove.prevent="handleTouchMove"
-      @touchend="handleTouchEnd"
-  >
-    <video
-        ref="videoRef"
-        class="video-player "
-        controls
-        @loadedmetadata="handleVideoMetadata"
-    >
-      <source src="@/static/video/example.mp4" type="video/mp4" />
-      您的浏览器不支持 HTML5 视频。
-    </video>
-    <div class="control-bar">
-      <div class="minimize-btn" @click="toggleMinimize">
-        <span v-if="isMinimized">⤢</span>
-        <span v-else>⤓</span>
-      </div>
-      <div class="close-btn" @click="closeVideo">✕</div>
-    </div>
-  </div>
-</template>
-
-<script setup>
-import { ref, computed, onMounted, onBeforeUnmount } from 'vue'
-
-const props = defineProps({
-  isVisible: {
-    type: Boolean,
-    default: false
-  }
-})
-
-const emit = defineEmits(['close'])
-
-const videoRef = ref(null)
-const aspectRatio = ref(16 / 9) // 默认宽高比
-const isMinimized = ref(false)
-const position = ref({ x: 20, y: 20 })
-const isDragging = ref(false)
-const dragStart = ref({ x: 0, y: 0 })
-
-// 初始化窗口尺寸为0
-const windowSize = ref({
-  width: 0,
-  height: 0
-})
-
-const handleVideoMetadata = () => {
-  const video = videoRef.value
-  if (video.videoWidth && video.videoHeight) {
-    aspectRatio.value = video.videoWidth / video.videoHeight
-  }
-}
-
-const containerDimensions = computed(() => {
-  const baseWidth = isMinimized.value ? 150 : 300
-  const height = baseWidth / aspectRatio.value
-  return { width: baseWidth, height }
-})
-
-const containerStyle = computed(() => {
-  return {
-    width: `${containerDimensions.value.width}px`,
-    height: `${containerDimensions.value.height}px`
-  }
-})
-
-const positionStyle = computed(() => ({
-  transform: `translate3d(${position.value.x}px, ${position.value.y}px, 0)`
-}))
-
-const handleTouchStart = (event) => {
-  isDragging.value = true
-  const touch = event.touches[0]
-  dragStart.value = {
-    x: touch.clientX - position.value.x,
-    y: touch.clientY - position.value.y
-  }
-}
-
-const handleTouchMove = (event) => {
-  if (!isDragging.value) return
-
-  const touch = event.touches[0]
-  let newX = touch.clientX - dragStart.value.x
-  let newY = touch.clientY - dragStart.value.y
-
-  // 添加边界检测
-  const maxX = windowSize.value.width - containerDimensions.value.width
-  const maxY = windowSize.value.height - containerDimensions.value.height
-
-  newX = Math.max(0, Math.min(newX, maxX))
-  newY = Math.max(0, Math.min(newY, maxY))
-
-  requestAnimationFrame(() => {
-    position.value = { x: newX, y: newY }
-  })
-}
-
-const handleTouchEnd = () => {
-  isDragging.value = false
-}
-
-const toggleMinimize = () => {
-  isMinimized.value = !isMinimized.value
-
-  const maxX = windowSize.value.width - containerDimensions.value.width
-  const maxY = windowSize.value.height - containerDimensions.value.height
-
-  position.value = {
-    x: Math.max(0, Math.min(position.value.x, maxX)),
-    y: Math.max(0, Math.min(position.value.y, maxY))
-  }
-}
-
-const closeVideo = () => {
-  emit('close')
-}
-
-const handleResize = () => {
-  windowSize.value = {
-    width: window.innerWidth,
-    height: window.innerHeight
-  }
-
-  const maxX = windowSize.value.width - containerDimensions.value.width
-  const maxY = windowSize.value.height - containerDimensions.value.height
-
-  position.value = {
-    x: Math.max(0, Math.min(position.value.x, maxX)),
-    y: Math.max(0, Math.min(position.value.y, maxY))
-  }
-}
-
-// 在组件挂载后初始化窗口尺寸和事件监听
-onMounted(() => {
-  // 初始化窗口尺寸
-  windowSize.value = {
-    width: window.innerWidth,
-    height: window.innerHeight
-  }
-
-  window.addEventListener('resize', handleResize)
-})
-
-onBeforeUnmount(() => {
-  window.removeEventListener('resize', handleResize)
-})
-</script>
-
-<style scoped>
-/* 样式部分保持不变 */
-.floating-video {
-  position: fixed;
-  z-index: 1000;
-  background: #000;
-  border-radius: 8px;
-  box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3);
-  transition: width 0.3s ease, height 0.3s ease;
-  overflow: hidden;
-  transform: translate3d(0, 0, 0);
-  will-change: transform;
-  touch-action: none;
-}
-
-.video-player {
-  width: 100%;
-  height: 100%;
-  object-fit: fill!important;
-}
-
-.control-bar {
-  position: absolute;
-  top: 0;
-  right: 0;
-  display: flex;
-  gap: 8px;
-  padding: 8px;
-  background: linear-gradient(to bottom, rgba(0, 0, 0, 0.5), transparent);
-}
-
-.minimize-btn,
-.close-btn {
-  width: 24px;
-  height: 24px;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: rgba(255, 255, 255, 0.2);
-  border-radius: 50%;
-  cursor: pointer;
-  color: white;
-  font-size: 14px;
-}
-
-.minimize-btn:hover,
-.close-btn:hover {
-  background: rgba(255, 255, 255, 0.3);
-}
-</style>
--- a/app/components/liveMinWindow/index.vue
+++ b/app/components/liveMinWindow/index.vue
@ -0,0 +1,183 @@
+<template>
+  <div ref="dragRef"
+       :style="style"
+       class="fixed rounded-5px overflow-hidden shadow-lg cursor-move z-50"
+       @mousedown.stop="handleDragStart"
+       @touchstart.stop="handleDragStart">
+    <div class="relative" @click.stop="handleClick">
+      <img :src="props.snapshot"
+           class="w-80px object-cover"
+           alt="直播画面">
+
+      <div class="absolute inset-0 bg-black/40 flex items-center justify-center"
+           >
+        <span class="text-white text-12px">点击回到直播</span>
+      </div>
+      <button @click.stop="handleClose"
+              class="absolute top-10px right-10px text-white bg-black/40 rounded-full w-5 h-5 flex items-center justify-center hover:bg-black/60 cursor-pointer">
+        <van-icon name="cross" />
+      </button>
+    </div>
+  </div>
+</template>
+
+<script setup>
+import { ref, computed, onBeforeUnmount, shallowRef, onMounted } from 'vue'
+import { useRouter } from 'vue-router'
+import { useThrottleFn } from '@vueuse/core'
+
+const props = defineProps({
+  snapshot: {
+    type: String,
+    required: true
+  },
+  onClose: {
+    type: Function,
+    default: () => {}
+  },
+  onClick: {
+    type: Function,
+    default: () => {}
+  },
+  initialPosition: {
+    type: Object,
+    default: () => ({
+      top: '80px',
+      right: '16px'
+    })
+  }
+})
+
+const router = useRouter()
+const dragRef = shallowRef(null)
+const route = useRoute()
+
+const isDragging = ref(false)
+const startX = ref(0)
+const startY = ref(0)
+const left = ref(0)
+const top = ref(0)
+
+onMounted(() => {
+  const rect = dragRef.value.getBoundingClientRect()
+  left.value = window.innerWidth - rect.width - parseInt(props.initialPosition.right)
+  top.value = parseInt(props.initialPosition.top)
+})
+
+const style = computed(() => ({
+  left: left.value ? `${left.value}px` : 'auto',
+  top: top.value ? `${top.value}px` : 'auto',
+  right: !left.value ? props.initialPosition.right : 'auto',
+  transition: isDragging.value ? 'none' : 'all 0.3s ease',
+}))
+
+const handleDragStart = (event) => {
+  event.stopPropagation()
+  isDragging.value = true
+
+  const point = event.touches ? event.touches[0] : event
+
+  const rect = dragRef.value.getBoundingClientRect()
+  left.value = rect.left
+  top.value = rect.top
+
+  startX.value = point.clientX - left.value
+  startY.value = point.clientY - top.value
+
+  if (event.type === 'mousedown') {
+    document.addEventListener('mousemove', handleDragMove)
+    document.addEventListener('mouseup', handleDragEnd)
+  } else {
+    document.addEventListener('touchmove', handleDragMove, { passive: false })
+    document.addEventListener('touchend', handleDragEnd)
+  }
+}
+
+const handleDragMove = useThrottleFn((event) => {
+  if (!isDragging.value) return
+
+  event.preventDefault()
+  event.stopPropagation()
+
+  const point = event.touches ? event.touches[0] : event
+  const rect = dragRef.value.getBoundingClientRect()
+  const maxX = window.innerWidth - rect.width
+  const maxY = window.innerHeight - rect.height
+
+  left.value = Math.min(Math.max(0, point.clientX - startX.value), maxX)
+  top.value = Math.min(Math.max(0, point.clientY - startY.value), maxY)
+}, 16)
+
+const handleEdgeSnap = useThrottleFn(() => {
+  const rect = dragRef.value.getBoundingClientRect()
+  const centerX = rect.left + rect.width / 2
+
+  left.value = centerX > window.innerWidth / 2
+    ? window.innerWidth - rect.width - 16
+    : 16
+}, 100)
+
+const handleDragEnd = () => {
+  if (!isDragging.value) return
+
+  isDragging.value = false
+  handleEdgeSnap()
+
+  document.removeEventListener('mousemove', handleDragMove)
+  document.removeEventListener('mouseup', handleDragEnd)
+  document.removeEventListener('touchmove', handleDragMove)
+  document.removeEventListener('touchend', handleDragEnd)
+}
+
+const handleClick = (event) => {
+  event.stopPropagation()
+  if (!isDragging.value) {
+    handleReturnLive()
+  }
+}
+const handleReturnLive = () => {
+  props.onClick()
+}
+
+const handleClose = (event) => {
+  event?.stopPropagation()
+  props.onClose()
+}
+watch(() => route.path, (newVal) => {
+  if (['/','/home'].includes(newVal)){
+    handleClose()
+  }
+})
+onBeforeUnmount(() => {
+  document.removeEventListener('mousemove', handleDragMove)
+  document.removeEventListener('mouseup', handleDragEnd)
+  document.removeEventListener('touchmove', handleDragMove)
+  document.removeEventListener('touchend', handleDragEnd)
+})
+</script>
+<style scoped>
+.fixed {
+  will-change: transform, opacity;
+  touch-action: none;
+  -webkit-user-select: none;
+  user-select: none;
+  transform: translateZ(0);
+}
+
+.min-window-enter-active,
+.min-window-leave-active {
+  transition: transform 0.3s ease, opacity 0.3s ease;
+}
+
+.min-window-enter-from,
+.min-window-leave-to {
+  transform: translateY(100%);
+  opacity: 0;
+}
+
+img {
+  pointer-events: none;
+  -webkit-user-drag: none;
+  user-drag: none;
+}
+</style>
--- a/app/pages/home/index.vue
+++ b/app/pages/home/index.vue
@ -4,10 +4,9 @@ import {goodStore} from "@/stores/goods/index.js";
 import ItemList from './components/ItemList/index.vue'
 import Cescribe from './components/Cescribe/index.vue'
 import {message} from '@/components/x-message/useMessage.js'
-import floatingVideo from '@/components/floatingVideo/index.vue'
 import {liveStore} from "~/stores/live/index.js";
-const {fullLive,getAuctionDetail,auctionDetail} = goodStore();
-const {getLiveLink}= liveStore()
+const {getAuctionDetail,auctionDetail} = goodStore();
+const {fullLive}= liveStore()
 const changeLive = () => {
  fullLive.value = true;
 };
@ -18,10 +17,8 @@ if (!auctionDetail.value.uuid){
 </script>
 <template>
  <div class="flex-grow-1">
-<!--    <floatingVideo :is-visible="true"></floatingVideo>-->
    <client-only>
-      <liveRoom @click="changeLive" :class="['changeLive', fullLive ? 'expanded' : 'collapsed']"
-                :fullLive="fullLive"/>
+      <liveRoom @click="changeLive" :class="['changeLive', fullLive ? 'expanded' : 'collapsed']"/>
    </client-only>
    <div v-if="!fullLive" class="bg-#fff">
      <van-tabs sticky animated>
--- a/app/pages/liveRoom/components/Broadcast/index.vue
+++ b/app/pages/liveRoom/components/Broadcast/index.vue
@ -36,11 +36,11 @@ const headItem=(statusCode)=>{
      </template>
      <template v-else-if="auctionData.auctionPriceList?.buys?.length>0">
        <div v-for="(item, index) in auctionData.auctionPriceList?.buys" :key="index" class="flex flex-shrink-0 h-25px">
-          <div class="flex-grow-1 text-start shrink-0" :style="`color: ${headItem(item.statusCode).color}`" >{{ headItem(item.statusCode).label }}</div>
-          <div class="flex-grow-1 text-center shrink-0">{{ item.auctionType==='local'?'现场竞价':'网络竞价' }}</div>
-          <div class="flex-grow-1 text-center shrink-0">{{ item.createdAt }}</div>
-          <div class="flex-grow-1 text-center shrink-0">{{item.baseCurrency}}{{ item.baseMoney }}</div>
-          <div class="flex-grow-1 text-center text-#2B53AC shrink-0 w-20px">{{ item.userId===userInfo.ID?'我':'' }}</div>
+          <div class="text-start shrink-0 w-60px" :style="`color: ${headItem(item.statusCode).color}`" >{{ headItem(item.statusCode).label }}</div>
+          <div class="text-start shrink-0 w-80px">{{ item.auctionType==='local'?'现场竞价':'网络竞价' }}</div>
+          <div class="text-start shrink-0 w-80px">{{ item.createdAt }}</div>
+          <div class="text-start shrink-0 w-80px">{{item.baseCurrency}}{{ item.baseMoney }}</div>
+          <div class="text-start text-#2B53AC shrink-0 w-20px">{{ item.userId===userInfo.ID?'我':'' }}</div>
        </div>
      </template>
      <template v-if="auctionData.wsType==='newArtwork'">
--- a/app/pages/liveRoom/components/PaymentInput/index.vue
+++ b/app/pages/liveRoom/components/PaymentInput/index.vue
@ -1,4 +1,7 @@
 <script setup>
+import {liveStore} from "~/stores/live/index.js";
+import { showMinWindow, hideMinWindow } from '@/components/liveMinWindow/createMinWindow.js'
+const {lastSnapshot,fullLive} = liveStore()
 const props = defineProps({
  show: {
    type: Boolean,
@ -20,14 +23,47 @@ const close=()=>{
 }
 const confirm=()=>{
  router.push('/signature/protocol')
+  handleCapture()
  emit('update:show',false)
 }
+const captureVideoFrame = () => {
+  try {
+    const video = document.querySelector('#J_prismPlayer video')
+    if (!video) {
+      console.error('未找到视频元素')
+      return null
+    }

+    const canvas = document.createElement('canvas')
+    canvas.width = video.videoWidth
+    canvas.height = video.videoHeight
+
+    const ctx = canvas.getContext('2d')
+    ctx.drawImage(video, 0, 0, canvas.width, canvas.height)
+    return canvas.toDataURL('image/jpeg', 0.9)
+  } catch (error) {
+    console.error('获取视频截图失败:', error)
+    return null
+  }
+}
+const handleCapture = () => {
+  const imageUrl = captureVideoFrame()
+  if (imageUrl) {
+    lastSnapshot.value=imageUrl
+    showMinWindow(lastSnapshot.value,{
+  onClick:()=>{
+    router.replace('/')
+    fullLive.value=true
+    console.log('执行')
+  }
+    })
+  }
+}
 </script>

 <template>
  <div>
-    <van-dialog :show="show"  show-cancel-button @close="close" @confirm="confirm">
+    <van-dialog :show="show"  show-cancel-button @cancel="close" @confirm="confirm">
      <div class="flex flex-col pt-18px pb-13px justify-between items-center h-144px">
        <template v-if="payStatus===0">
          <div class="text-#000 text-16px font-600 ">支付全部</div>
--- a/app/pages/liveRoom/components/SideButton/index.vue
+++ b/app/pages/liveRoom/components/SideButton/index.vue
@ -18,7 +18,7 @@ const openOne = () => {

 const paySide = computed(() => {
  //当前是否已成交，以及成交人是当前登录用户
-  if (auctionData.value.artwork.isSoled && auctionData.value.artwork.buyInfo.userID === userInfo.value.ID) {
+  if (auctionData.value.artwork?.isSoled && auctionData.value.artwork?.buyInfo.userID === userInfo.value.ID) {
    return true
  } else {
    return false
--- a/app/pages/liveRoom/index.client.vue
+++ b/app/pages/liveRoom/index.client.vue
@ -1,5 +1,5 @@
 <script setup>
-import {ref, onMounted, onBeforeUnmount, computed, watch} from 'vue'
+import {ref, onMounted, onBeforeUnmount, watch} from 'vue'
 import Aliplayer from 'aliyun-aliplayer'
 import 'aliyun-aliplayer/build/skins/default/aliplayer-min.css'
 import sideButton from '@/pages/liveRoom/components/SideButton/index.vue'
@ -7,129 +7,72 @@ import broadcast from '@/pages/liveRoom/components/Broadcast/index.vue'
 import {liveStore} from "@/stores/live/index.js"
 import paymentResults from '@/pages/liveRoom/components/PaymentResults/index.vue'
 import paymentInput from '@/pages/liveRoom/components/PaymentInput/index.vue'
-import xButton from '@/components/x-button/index.vue'
 import {goodStore} from "@/stores/goods/index.js"
 import {message} from "~/components/x-message/useMessage.js"
+import { showDialog } from 'vant';
 import {artworkBuy} from "@/api/goods/index.js"
-import CryptoJS from 'crypto-js'
-
-const {auctionDetail, getAuctionDetail} = goodStore()
 const player = ref(null)
-const {quoteStatus, changeStatus, show, playerId, show1, auctionData, getSocketData,getLiveLink} = liveStore()
+const {quoteStatus, show, playerId, show1, auctionData, getSocketData, getLiveLink,fullLive} = liveStore()
 const isPlayerReady = ref(false)
-const pullLink=ref('')
-const props = defineProps({
-  fullLive: {
-    type: Boolean,
-    default: true,
-  },
-})
-const isPiPActive = ref(false)
-const videoRef = ref(null)
+const pullLink = ref('')

-// 检查浏览器是否支持画中画
-const isPiPSupported = computed(() => {
-  return document.pictureInPictureEnabled ||
-      document.webkitPictureInPictureEnabled
-})
-
-// 进入画中画模式
-const enterPiP = async () => {
-  try {
-    if (!videoRef.value) return
-
-    if (document.pictureInPictureElement) {
-      await document.exitPictureInPicture()
-    }
-
-    await videoRef.value.requestPictureInPicture()
-    isPiPActive.value = true
-  } catch (error) {
-    console.error('进入画中画模式失败:', error)
-  }
-}
-
-// 退出画中画模式
-const exitPiP = async () => {
-  try {
-    if (document.pictureInPictureElement) {
-      await document.exitPictureInPicture()
-      isPiPActive.value = false
-    }
-  } catch (error) {
-    console.error('退出画中画模式失败:', error)
-  }
-}

 definePageMeta({
  title: '主页',
  i18n: 'login.title',
 })
-
-const config = useRuntimeConfig()
-
-
 const handlePlayerError = (error) => {
  console.error('播放器错误:', error)
-  if (player.value) {
-    player.value?.play()
-  }
+  player.value?.play()
 }

-const initializePlayer = () => {
+const initializePlayer = async () => {
  try {
    if (player.value) {
-      player.value?.dispose()
+      player.value.dispose()
    }
+
    const playerConfig = {
      id: playerId.value,
-      source:pullLink.value,
+      source: pullLink.value,
      isLive: true,
      preload: true,
      autoplayPolicy: {fallbackToMute: true},
      controlBarVisibility: 'never',
    }
+
    player.value = new Aliplayer(playerConfig, (playerInstance) => {
      isPlayerReady.value = true
      playerInstance?.play()
    })
-    player.value?.on('error', handlePlayerError)
-    player.value?.on('rtsTraceId', (event) => {
-    })
-    player.value?.on('rtsFallback', (event) => {
-    })
+
+    player.value.on('error', handlePlayerError)
  } catch (error) {
+    showDialog({
+      message: '直播内容获取失败，是否刷新页面重新获取',
+      showCancelButton:true
+    }).then(() => {
+      location.reload()
+      // on close
+    }) .catch(() => {
+      // on cancel
+    });;
    console.error('播放器初始化失败:', error)
  }
 }

 onMounted(async () => {
-  pullLink.value=  await getLiveLink()
+  pullLink.value = await getLiveLink()
  initializePlayer()
 })

 onBeforeUnmount(() => {
-  if (player.value) {
-    player.value?.dispose()
-    player.value = null
-  }
+  player.value?.dispose()
+  player.value = null
 })
-
-const goPay = () => {
-  show.value = true
-}
-
-const fullLive1 = ref(false)
-watch(() => {
-  return props.fullLive
-}, (newVal) => {
+watch(()=>fullLive.value, (newVal) => {
  if (newVal) {
    getSocketData()
-    setTimeout(() => {
-      fullLive1.value = true
-    }, 400)
-  } else {
-    fullLive1.value = false
  }
 })

@ -145,16 +88,18 @@ const goBuy = async () => {

 const tipOpen = () => {
  message.warning('出价状态未开启')
+}
+const updateShow=()=>{
+
 }
 </script>

 <template>
-  <div class="relative h-full ">
+  <div class="relative h-full">
    <div :id="playerId" class="w-full h-full"></div>
-
    <transition>
-      <div v-if="fullLive1">
-        <sideButton class="absolute  top-196px right-0 z-999"></sideButton>
+      <div v-if="fullLive">
+        <sideButton class="absolute top-196px right-0 z-999"></sideButton>
        <div class="absolute left-1/2 transform -translate-x-1/2 flex flex-col items-center"
             style="bottom:calc(var(--safe-area-inset-bottom) + 26px)">
          <div class="text-16px text-#FFB25F font-600">
@ -171,12 +116,11 @@ const tipOpen = () => {
            <van-button @click="goBuy" color="#FFB25F" class="w-344px !h-[40px]">
              <div>{{
                  `确认出价 ${auctionData?.nowAuctionPrice?.currency} ${auctionData?.nowAuctionPrice?.nextPrice ?? 0}`
-                }}
-              </div>
+                }}</div>
            </van-button>
          </div>
          <div v-else class="mt-10px mb-10px">
-            <van-button @click="tipOpen" color="#D6D6D8" class=" w-344px !h-[40px]" v-if="!quoteStatus">
+            <van-button @click="tipOpen" color="#D6D6D8" class="w-344px !h-[40px]" v-if="!quoteStatus">
              <div class="text-#7D7D7F text-14px">点击"开启出价"，即刻参与竞拍</div>
            </van-button>
          </div>
@ -197,16 +141,19 @@ const tipOpen = () => {
    </transition>
  </div>
 </template>
+
 <style lang="scss">
-#J_prismPlayer{
-width: 100%;
-  height: 100%!important;
-  &>video{
+#J_prismPlayer {
+  width: 100%;
+  height: 100% !important;
+
+  & > video {
    width: 100%;
    height: 100%;
  }
 }
 </style>
+
 <style scoped>
 .v-enter-active,
 .v-leave-active {
--- a/app/pages/profile/index.vue
+++ b/app/pages/profile/index.vue
@ -97,7 +97,7 @@ const onRefresh = async () => {
                <x-image class="w-80px h-80px" :src="item1?.auctionArtworkInfo?.artwork?.hdPic" :preview="false" alt=""/>
              </div>
              <div class="flex flex-col justify-between grow-1">
-                <div class="text-#000 text-16px ellipsis line-height-21px">{{item1?.auctionArtworkInfo?.artworkTitle}}{{item1?.auctionArtworkInfo?.artworkTitle}}{{item1?.auctionArtworkInfo?.artworkTitle}}</div>
+                <div class="text-#000 text-16px ellipsis line-height-21px">{{item1?.auctionArtworkInfo?.artworkTitle}}</div>
                <div class="flex justify-between">
                  <div>
                    <div class="text-#575757 text-14px line-height-none mb-5px">起拍价：RMB 1,000</div>
--- a/app/pages/signature/protocol/index.vue
+++ b/app/pages/signature/protocol/index.vue
@ -1,6 +1,9 @@
 <script setup>
 const activeNames = ref(['1']);
-
+definePageMeta({
+  layout: 'default',
+  title: '签署内容'
+})
 </script>

 <template>
--- a/app/stores/goods/index.js
+++ b/app/stores/goods/index.js
@ -5,7 +5,6 @@ import { artworkList, defaultDetail, artworkDetail } from "@/api/goods/index.js"
 export const goodStore = createGlobalState(() => {
    // 状态定义
    const actionDetails = ref({})
-    const fullLive = ref(false)
    const currentItem = ref({})
    const myArtWorks = ref([])
    const pageRef = ref({
@ -95,7 +94,6 @@ export const goodStore = createGlobalState(() => {
    return {
        // 状态
        actionDetails,
-        fullLive,

        currentItem,
        myArtWorks,
--- a/app/stores/live/index.js
+++ b/app/stores/live/index.js
@ -10,6 +10,7 @@ import CryptoJS from "crypto-js";
 export const liveStore = createGlobalState(() => {
    const {auctionDetail} = goodStore();
    const { token } = authStore()
+    const fullLive = ref(false)
    const quoteStatus = ref(false)
    const show = ref(false)
    const cleanup = ref(null)
@ -19,6 +20,31 @@ export const liveStore = createGlobalState(() => {
    const socket=ref(null)
    const config = useRuntimeConfig()
    const pullLink=ref('')
+    const isMinWindow = ref(false)
+    const lastSnapshot = ref('')
+    const liveInfo = ref(null)
+
+    // 设置最小化状态
+    const setMinWindow = (status) => {
+        isMinWindow.value = status
+    }
+
+    // 设置截图
+    const setSnapshot = (snapshot) => {
+        lastSnapshot.value = snapshot
+    }
+
+    // 设置直播信息
+    const setLiveInfo = (info) => {
+        liveInfo.value = info
+    }
+
+    // 重置状态
+    const reset = () => {
+        isMinWindow.value = false
+        lastSnapshot.value = ''
+        liveInfo.value = null
+    }
    // 解密工具函数
    const decryptUtils = {
        // 解密配置
@ -229,6 +255,14 @@ export const liveStore = createGlobalState(() => {

    }
    return{
+        fullLive,
+        isMinWindow,
+        lastSnapshot,
+        liveInfo,
+        setMinWindow,
+        setSnapshot,
+        setLiveInfo,
+        reset,
        pullLink,
        getLiveLink,
        auctionData,
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
Author	SHA1	Message	Date
xingyy	afd5e75771	123	2025-02-12 10:17:28 +08:00
xingyy	d22979bd93	123	2025-02-12 09:09:58 +08:00
xingyy	9812cd7903	feat(live获取失败时的处理机制 -Room): 添加直播内容在播放器初始化失败时，弹出对话框提示用户直播内容获取失败 - 提供刷新页面重新获取直播内容的选项 - 使用 vant 的 showDialog 组件实现对话框功能	2025-02-11 15:58:35 +08:00
xingyy	50fe1248e3	refactor(liveRoom): 优化直播室组件和支付功能 - 移除 paymentInput 组件中的冗余属性 - 在 liveMinWindow 组件中添加路由监听，实现自动关闭功能 - 删除 PaymentInput 组件中的无用日志输出	2025-02-11 15:39:22 +08:00
xingyy	def6a6b71e	refactor(live): 重构直播相关功能和状态管理 -将 fullLive 状态从 goodStore 移动到 liveStore - 优化 liveRoom 页面逻辑，移除不必要的 props - 更新 AppHeader 组件，使用 liveStore 中的 fullLive 状态 - 删除 floatingVideo 组件 - 调整 liveMinWindow 组件，增加 onClick 事件处理 - 更新 home 页面，使用 liveStore 中的 fullLive 状态 - 优化 liveRoom 中的 PaymentInput 和 SideButton 组件	2025-02-11 15:27:31 +08:00
xingyy	48108c5e84	12	2025-02-11 14:56:19 +08:00
xingyy	3c69236caa	feat(live): 实现直播间最小化窗口功能 - 新增最小化窗口组件 liveMinWindow - 在 liveRoom 页面中集成最小化窗口功能 - 优化 liveStore，增加相关状态和方法支持最小化窗口 - 调整	2025-02-11 14:55:25 +08:00