Merge branch 'zhaoj'

src/pages/zbkc/detail.vue

@@ -56,7 +56,7 @@
                 </div>
                 <div class="mt-20px" v-if="chapter_info.vod_mp4_address && chapter_info.vod_mp4_address !== ''"
                     id="player-con"></div>
-                <div v-else-if="chapter_info.status == '3'"
+                <div v-else-if="chapter_info.status == '3' && !chapter_info.vod_mp4_address"
                     class="mt-20px w-full h-460px bg-hex-000 flex items-center justify-center text-hex-fff text-18px">
                     回看视频生成中……
                 </div>
@@ -126,7 +126,7 @@ function getChapterDetail() {
                     {
                         id: "player-con",
                         // source: res.data.one_info.tzk_video_file?.split('|')[0],
-                        source: res.data.one_info.pull_m3u8_address,
+                        source: res.data.one_info.vod_mp4_address,
                         width: "100%",
                         height: "460px",
                         autoplay: false,

src/pages/zbkc/detailIsLive.vue

@@ -44,8 +44,8 @@
                                         </div>
                                         <div class="d-line"></div>
                                         <div class="w-100px h-100px">
-                                            <qrcode-vue v-if="chapter_info.tzk_video_file"
-                                                :value="chapter_info.ttz_video_file" size="100" level="H" />
+                                            <qrcode-vue v-if="chapter_info.pull_m3u8_address"
+                                                :value="chapter_info.pull_m3u8_address" size="100" level="H" />
                                         </div>
                                         <h3 class="ml-15px text-12px text-black">手机扫码分享</h3>
                                     </div>