Merge branch 'master' of http://git.luyuan.tk/luyuan/beelink into zj

src/components/LiveItem.vue

@@ -3,7 +3,7 @@
         <img :src="img" alt="" class="cover">
         <img src="@/static/images/play.png" alt="" class="play">
         <div class="title">
-            {{title}}
+            <div class="one-line-hide">{{title}}</div> 
             <span class="lv">{{score}}分</span>
         </div>
         <div class="info">
@@ -57,9 +57,10 @@
         height: 23px;
     }
     .title{
+        margin: 18px;
         margin-top: 16px;
+        margin-bottom: 0;
         font-display: 11px;
-        margin-left: 18px;
         color: #111;
         display: flex;
         align-items: center;
@@ -68,6 +69,7 @@
             margin-left: 11px;
             font-size: 10px;
             color: #f55455;
+            flex-shrink: 0;
         }
     }
     .info{
@@ -149,7 +151,7 @@ export default defineComponent({
             type:String
         },
         score:{
-            type:Number
+            type:String
         },
         date:{
             type:String
@@ -162,6 +164,9 @@ export default defineComponent({
         },
         status:{
             type:Number
+        },
+        zid:{
+            type: Number
         }
     },
     setup(props){
@@ -177,7 +182,10 @@ export default defineComponent({
                 case 3:
                     url = '/regeime/liveing';
             }
-            router.push(url)
+            console.log(props.zid);
+            if(props.zid != undefined){
+                router.push({path: url,query: { id: props.zid }})
+            }
         }
         return {
             navto

src/components/LivePlay.vue

@@ -1,19 +1,80 @@
 <template>
   <div class="video">
     <video src=""></video>
+    <div class="liveinfo">
+          <div class="left">
+              <div>
+                  <img src="@/static/images/livelesson.png" alt="" class="icon">
+                  <span>西班牙语</span>
+              </div>
+              <div>
+                  <img src="@/static/images/livewatch.png" alt="" class="icon">
+                  <span>2020-09-11  18:30</span>
+              </div>
+              <div>
+                  <img src="@/static/images/livetimetake.png" alt="" class="icon">
+                  <span>30min</span>
+              </div>
+                    <div>
+                  <img src="@/static/images/shoucang.png" alt="" class="icon">
+                  <span class="score">5.0分</span>
+              </div>
+          </div>
+          <div class="right">
+              编辑信息
+          </div>
+      </div>
   </div>
 </template>
 <style lang="scss" scoped>
 .video {
   width: 976px;
   height: 563px;
-  border-radius: 18px 18px 0px 0px;
+  border-radius: 18px;
   background-color: #0f0;
   overflow: hidden;
   > video {
     width: 100%;
-    height: 100%;
+    height: 505px;
   }
+  .liveinfo{
+        display: flex;
+        justify-content: space-between;
+        height: 58px;
+        align-items: center;
+        background-color: #fff;
+        .left{
+            display: flex;
+            color: #121212;
+            font-size: 13px;
+            margin-left: 29px;
+            .score{
+              color: #D22C2E;
+              font-size: 13px;
+            }
+            >div{
+                margin-right: 57px;
+            }
+            .icon{
+                width: 25px;
+                height:24px;
+                margin-right: 6px;
+
+            }
+        }
+        .right{
+            width: 74px;
+            height: 29px;
+            border:1px solid #08AE98;
+            border-radius: 3px;
+            margin-right: 29px;
+            color: #08AE98;
+            font-size: 13px;
+            line-height: 29px;
+            font-weight: bold;
+            text-align: center;
+        }
+      }
 }
 </style>
 <script lang="ts">