From d6ceb62b3d8ab93bc8a835a6cc0f0848efc389ba Mon Sep 17 00:00:00 2001
From: luyuan <1162963624@qq.com>
Date: Tue, 10 Nov 2020 17:57:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86=E9=80=89=E6=8B=A9?=
 =?UTF-8?q?=E5=BC=80=E6=92=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/LivePlay.vue     |  4 ++--
 src/components/VideoCont.vue    | 15 +++++++++------
 src/components/VideoReview.vue  |  2 +-
 src/views/regime/Livedetail.vue |  2 +-
 src/views/regime/Liveing.vue    | 33 ++++++++++++++++++++++-----------
 src/views/regime/VideoInfo.vue  |  2 +-
 6 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/src/components/LivePlay.vue b/src/components/LivePlay.vue
index dbf3e04..e6598e7 100644
--- a/src/components/LivePlay.vue
+++ b/src/components/LivePlay.vue
@@ -9,7 +9,7 @@
               </div>
               <div>
                   <img src="@/static/images/livewatch.png" alt="" class="icon">
-                  <span>{{info.dateline}}</span>
+                  <span>{{info.tlanguage}}</span>
               </div>
               <div>
                   <img src="@/static/images/livetimetake.png" alt="" class="icon">
@@ -17,7 +17,7 @@
               </div>
                     <div>
                   <img src="@/static/images/shoucang.png" alt="" class="icon">
-                  <span class="score">5.0{{lan.$t('fen')}}</span>
+                  <span class="score">{{info.score}}{{lan.$t('fen')}}</span>
               </div>
           </div>
           <div style="display: flex">
diff --git a/src/components/VideoCont.vue b/src/components/VideoCont.vue
index 70a16cf..53b9d61 100644
--- a/src/components/VideoCont.vue
+++ b/src/components/VideoCont.vue
@@ -34,7 +34,7 @@
         </div>
         <div class="item item1" v-if="status==2">
           <span style="flex-shrink:0">{{lan.$t('yuanyin')}}</span>
-          <span> {{lan.$t('yuanyintext')}} </span>
+          <span> {{yuanyin}} </span>
         </div>
         
     </div>
@@ -129,20 +129,23 @@ import { useRoute } from 'vue-router';
 
 export default defineComponent({
     props:{
-        date:{
+        date: {
             type:String
         },
-        watch:{
+        watch: {
             type:Number
         },
-        share:{
+        share: {
             type:Number
         },
-        status:{
+        status: {
             type:Number
         },
-        videoid:{
+        videoid: {
             type:Number
+        },
+        yuanyin: {
+          type: String
         }
     },
     setup(){
diff --git a/src/components/VideoReview.vue b/src/components/VideoReview.vue
index 65d369a..2e12fde 100644
--- a/src/components/VideoReview.vue
+++ b/src/components/VideoReview.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="review">
+    <div class="review" v-if="reviewlist.data.length != 0">
         <div class="top">
             <div class="title">
                 {{lan.$t('shipinpingjia')}}
diff --git a/src/views/regime/Livedetail.vue b/src/views/regime/Livedetail.vue
index 047d52e..d8d698b 100644
--- a/src/views/regime/Livedetail.vue
+++ b/src/views/regime/Livedetail.vue
@@ -7,7 +7,7 @@
 
         <LiveCount :info="liveinfo.studentlist" :livestatus="liveinfo.livestatus" :zid="liveinfo.liveid"></LiveCount>
     </div>
-    <VideoReview class="review" v-if="liveinfo.livestatus == 2"></VideoReview>
+    <VideoReview class="review" v-if="liveinfo.livestatus == 2 && liveinfo.score != '0.0'" :videoinfo="liveinfo.score"></VideoReview>
   </div>
 </template>
 <style lang="scss" scoped>
diff --git a/src/views/regime/Liveing.vue b/src/views/regime/Liveing.vue
index 9292981..1f4fad1 100644
--- a/src/views/regime/Liveing.vue
+++ b/src/views/regime/Liveing.vue
@@ -50,6 +50,9 @@
         <a-modal v-model:visible="visible" title="Basic Modal" @ok="guanbi">
             <p>{{lan.$t('querenguanbi')}}</p>
         </a-modal>
+        <a-modal v-model:visible="xuanze" title="提示" okText="摄像头" cancelText="屏幕分享" @ok="xianze(1)" @cancel="xianze(0)" :closable="false" :maskClosable="false">
+            <p>请选择开播方式</p>
+        </a-modal>
     </div>
 </template>
 <style lang="scss" scoped>
@@ -548,18 +551,24 @@ export default defineComponent({
                 console.warn('sendMessage error:', imError);
             });
         }
+        const xuanze = ref(true)
+        async function xianze(index: number){
+            if(store.state.userinfo.memberid != 0 && store.state.userinfo.memberid){
+                // clearInterval(si);
+                userSing = await usersig(store.state.userinfo.memberid);
+                init(index == 0 ? pingmu : shexiang, userSing);
+                xuanze.value = false;
+            }
+        }
 
-        onMounted(async ()=>{
-            const si = setInterval(async ()=>{
-                if(store.state.userinfo.memberid != 0 && store.state.userinfo.memberid){
-                    clearInterval(si);
-                    userSing = await usersig(store.state.userinfo.memberid);
-                    init(pingmu, userSing);
-                   
-                }
-            })
+        // onMounted(async ()=>{
+        //     const si = setInterval(async ()=>{
+                
+        //     })
             
-        })
+        // })
+
+
      
         return{
             fenxiang,
@@ -569,7 +578,9 @@ export default defineComponent({
             visible,
             lan,
             sendtext,
-            imlist
+            imlist,
+            xianze,
+            xuanze
         }
     },
 });
diff --git a/src/views/regime/VideoInfo.vue b/src/views/regime/VideoInfo.vue
index a682210..1057ed7 100644
--- a/src/views/regime/VideoInfo.vue
+++ b/src/views/regime/VideoInfo.vue
@@ -2,7 +2,7 @@
     <div class="videoinfo">
         <div class="info">
             <VideoPlay :url="result.fileurl"></VideoPlay>
-            <VideoCont :videoid="result.videoid"  :date="result.createdAt" :watch="result.watch" :share="result.share" :status="result.status"></VideoCont>
+            <VideoCont :videoid="result.videoid" :yuanyin="result.statusdesc" :date="result.createdAt" :watch="result.watch" :share="result.share" :status="result.status"></VideoCont>
         </div>
         <VideoReview :videoinfo="result.score" class="review" v-if="result.status == 1"></VideoReview>
     </div>