Merge branch 'zhaoj'

src/pages/jsd/wdkc/zbkc/live.vue

@@ -71,8 +71,9 @@
         <div class="mt-20px" id="player-con"></div>
         <ChatBlock :id="tzk_id" />
       	</div>
+		<!-- v-if="chapter_info.tzk_zjr_user_id === user.user_id"  -->
             <div class="w-300px mt-46px right-box pt-30px relative">
-                 <el-button v-if="chapter_info.tzk_zjr_user_id === user.user_id" type="primary" color="#1259a1" size="large" class="w-100px live-btn" @click="launchLive">启动直播工具
+                 <el-button type="primary" color="#1259a1" size="large" class="w-100px live-btn" @click="launchLive">启动直播工具
                 </el-button>
                 <div class="right-nav ml-20px">
                     <span>相关文档</span>
@@ -485,7 +486,7 @@ $color: #1259a1;
     position: absolute;
     left: 50%;
     top: 24px;
-    z-index: 100;
+    z-index: 1000;
     margin-left: -209px;
     width: 418px;
     padding-top: 7px;

src/pages/manage/jcxxgl/xxgl/xj_detail.vue

@@ -2,7 +2,7 @@
   <div class="bg-white rounded-md h-screen py-4">
     <div class="margin_center">
       <div class="flex">
-        <img class="w-146px" v-if="detailData.sm_logo" :src="https+detailData.sm_logo" alt="" />
+        <img class="w-146px" v-if="detailData.sm_logo" :src="getFullUrl(detailData.sm_logo) " alt="" />
         <div>
           <h3>{{ detailData.sm_name }}</h3>
           <p>

src/pages/zbkc/detailIsLive.vue

@@ -116,7 +116,7 @@ function getChapterDetail() {
                     source: res.data.one_info.pull_m3u8_address,
                     width: "100%",
                     height: "460px",
-                    autoplay: false,
+                    autoplay: true,
                     cover: res.data.one_info.tzk_img,
                     isLive: true,
                     rePlay: false,

src/pages/zbkc/homework.vue

@@ -128,6 +128,7 @@ let noSayId = [];
 
 
 function filePre(item) {
+    console.log(item,'预览查看');
     emits('filePre', item)
 }