Merge branches 'xbx' and 'master' of http://git.luyuan.tk/luyuan/beelink into xbx

src/views/regime/Video.vue

@@ -197,7 +197,7 @@ export default defineComponent({
     VideoItem,
   },
   setup() {
-    const page = ref(6);
+    const page = ref(1);
     const tabindex = ref(4);
     interface VideoList {
       videoid: number;
@@ -226,17 +226,19 @@ export default defineComponent({
       videolist.value = res;
 
     });
-    function tabchange(e: number): void {
+    async function tabchange(e: number) {
       tabindex.value = e;
+      videolist.value = await getvideolist({title: input.value,page:page.value,status:e});
       // console.log(videolist)
     }
     async function sel(){
         console.log(input.value);
         page.value = 1;
-          videolist.value = await getvideolist({title: input.value,page:page.value});
+        videolist.value = await getvideolist({title: input.value,page:page.value,status:tabindex.value});
     }
-    async function  pagechange() {
-      videolist.value = await getvideolist({title: input.value,page:page.value});
+    async function  pagechange(e: number) {
+      page.value=e
+      videolist.value = await getvideolist({title: input.value,page:e,status:tabindex.value});
     }
     return {
       page,

src/views/regime/VideoInfo.vue

@@ -4,7 +4,7 @@
             <VideoPlay :url="result.fileurl"></VideoPlay>
             <VideoCont :videoid="result.videoid"  :date="result.created_at" :watch="result.watch" :share="result.share" :status="result.status"></VideoCont>
         </div>
-        <VideoReview class="review" ></VideoReview>
+        <VideoReview class="review"></VideoReview>
     </div>
 </template>
 <style lang="scss" scoped>
@@ -25,7 +25,7 @@ import { defineComponent, onMounted, ref } from 'vue';
 import VideoPlay from "@/components/VideoPlay.vue"
 import VideoCont from "@/components/VideoCont.vue"
 import VideoReview from "@/components/VideoReview.vue";
-import { videodetail } from '@/api';
+import { getcommentlist, videodetail } from '@/api';
 import { useRoute } from 'vue-router';
 export default defineComponent({
     components:{
@@ -37,12 +37,17 @@ export default defineComponent({
         // console.log(1)
         console.log(useRoute().query)
         const result=ref({})
+        const commentlist=ref({})
+        const videoid=ref(useRoute().query.id)
           onMounted(async () => {
             result.value= await videodetail(useRoute().query.id)
+            // commentlist.value=await getcommentlist({type:2,id:videoid.value})
         })
     
        return {
-           result
+           result,
+           commentlist,
+           videoid
        }
         
     }