fix(videourl): bugs cm video cant rendered

ADKcodeXD · Jan 7, 2024 · 1774796 · 1774796
1 parent e3252f1
commit 1774796
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/components/Aplayer.vue b/components/Aplayer.vue
@@ -49,7 +49,7 @@ const sources = computed(() => {
  return {
  src: props.videoUrl[key],
  type: 'video/mp4',
- label: t(key)
+ label: key
  }
  })
  } else if (_.isArray(props.videoUrl)) {

diff --git a/components/MemberPop.vue b/components/MemberPop.vue
@@ -2,7 +2,7 @@
  <el-popover placement="top" :width="300" trigger="hover" :show-after="100" transition="popshow">
  <template #reference>
  <ElAvatar
- :src="calcZip(memberVo.avatar, '0.4x') || undefined"
+ :src="calcZip(memberVo?.avatar || '', '0.4x') || undefined"
  class="mx-1"
  :size="size || 32"
  >{{ noAvatar }}</ElAvatar
@@ -11,7 +11,7 @@
  <template #default>
  <div class="flex">
  <ElAvatar
- :src="calcZip(memberVo.avatar, '0.4x') || undefined"
+ :src="calcZip(memberVo?.avatar || '', '0.4x') || undefined"
  :size="80"
  class="flex-shrink-0"
  >{{ noAvatar }}</ElAvatar

diff --git a/composables/useMovieOper.ts b/composables/useMovieOper.ts
@@ -34,11 +34,11 @@ export const useMovieOperate = () => {
  } else {
  ElMessageBox.confirm(t('pollTip'), '提示').then(async () => {
  const { data } = await pollVideo(movieItem.movieId)
+ movieItem.loginVo && (movieItem.loginVo.isPoll = true)
  if (data?.code === 200) {
  ElMessage.success(t('pollSuccess'))
  }
  })
- movieItem.loginVo.isPoll = true
  }
  } finally {
  isLoading.value = false

diff --git a/pages/activity/[activityId]/main.vue b/pages/activity/[activityId]/main.vue
@@ -1,7 +1,6 @@
 <template>
  <div class="main" ref="fullpageEl">
- <!-- 全屏滚动 -->
- <div class="fullpage-container" ref="container" @mousewheel="onMouseWheel">
+ <div class="fullpage-container" ref="container">
  <div class="video-container">
  <Transition :name="currentAnime" mode="out-in">
  <div class="video-content" v-if="movies.length">
@@ -28,7 +27,7 @@
  :content="movieItem['movieName'][locale] || movieItem['movieName']['cn']"
  placement="top"
  >
- <p class="sub-title max-w-3/5">
+ <p class="sub-title max-w-2/3">
  {{ movieItem['movieName'][locale] || movieItem['movieName']['cn'] }}
  </p>
  </ElTooltip>
@@ -50,7 +49,7 @@
  <MyCustomLoading v-else />
  </Transition>
  </div>
- <div class="nav">
+ <div class="nav" v-if="days?.length">
  <Icon
  name="ant-design:caret-left-filled"
  cursor="pointer"