Merge branch 'yb8.1'

src/views/video/List.vue

@@ -6,7 +6,12 @@ import {apiFICCPermissionList,apiGetWechatQRCode,apiGetTagTree} from '@/api/comm
 import {apiVideoList,apiVideoPlayLog} from '@/api/video'
 
 import SelfList from '@/components/SelfList.vue'
+import { useRoute } from 'vue-router'
 
+const route=useRoute()
+
+//分享进入的videoid 
+let videoId=ref(0)
 
 //监听列表页面版心宽度
 const listPageEl=ref('')
@@ -40,7 +45,13 @@ const getTagTreeList = async ()=>{
             })
             return obj
         })
-        handelChangeFirstNav(permissionState.firstNavList[0])
+        if(route.query.videoId){
+            videoId.value=route.query.videoId
+            getVideoList()
+        }else{
+            handelChangeFirstNav(permissionState.firstNavList[0])
+        }
+        
     }
 }
 getTagTreeList()
@@ -69,7 +80,7 @@ const getVideoList=async ()=>{
     const res=await apiVideoList({
         page_index:Number(listState.page),
         page_size:20,
-        video_id:0,
+        video_id:videoId.value,
         variety_tag_id:Number(permissionState.sSecond)
     })
     listState.loading=false
@@ -88,6 +99,7 @@ const refreshList=()=>{
     listState.finished=false
     listState.page=1
     listState.list=[]
+    videoId.value=0
     curVideoId.value=0
     getVideoList()
 }
@@ -193,7 +205,7 @@ onActivated(()=>{
             @listOnload="onLoad"
         >
             <div class="flex list-wrap">
-                <div class="video-item" v-for="item in listState.list" :key="item.community_video_id">
+                <div class="flex video-item" v-for="item in listState.list" :key="item.community_video_id">
                     <el-popover
                         :width="200"
                         trigger="hover"
@@ -207,6 +219,7 @@ onActivated(()=>{
                         </template>
                     </el-popover>
                     <div class="title">{{item.title}}</div>
+                    <div>
                     <video 
                         :src="item.video_url" 
                         controls
@@ -219,7 +232,10 @@ onActivated(()=>{
                     ></video>
                     <div v-else class="poster-img" :style="'background-image:url('+item.cover_img_url+')'" @click="handelClickPlay(item)"></div>
                     <div class="time">发布时间：{{item.publish_time}}</div>
+                    </div>
                 </div>
+                <div class="last-add-item"></div>
+                <div class="last-add-item"></div>
             </div>
         </SelfList>
     </div>
@@ -307,20 +323,24 @@ onActivated(()=>{
 
     .list-wrap{
         padding-top: 150px;
-        border-left: 1px solid #E2E2E2;
-        border-right: 1px solid #E2E2E2;
+        // border-left: 1px solid #E2E2E2;
+        // border-right: 1px solid #E2E2E2;
+        justify-content: center;
         flex-wrap: wrap;
         .video-item{
-            width: 50%;
+            flex-direction: column;
+            justify-content: space-between;
+            width: 410px;
             padding: 30px;
-            border-bottom: 1px solid #E2E2E2;
+            border: 1px solid #E2E2E2;
             position: relative;
-            &:nth-of-type(odd){
-                border-right: 1px solid #E2E2E2;
-            }
+            // &:nth-of-type(odd){
+            //     border-right: 1px solid #E2E2E2;
+            // }
             .title{
                 font-size: 16px;
                 color: #666;
+                padding-right: 26px;
             }
             video{
                 width: 100%;
@@ -353,6 +373,10 @@ onActivated(()=>{
                 font-size: 14px;
             }
         }
+        .last-add-item{
+            width: 410px;
+            height: 0;
+        }
     }
 }
 </style>