Merge branch 'player-20251117-v1' into master-20251210

# Conflicts:
#	src/views/study/coursenew.vue
This commit is contained in:
joshen
2025-12-10 15:30:16 +08:00
4 changed files with 3161 additions and 20 deletions

View File

@@ -9,7 +9,7 @@
<div style="margin: 0px 80px">
<div class="banner-crumbs">
<router-link to="/course"
><span class="crumbs-first">课程列表</span></router-link
><span class="crumbs-first">课程列表</span></router-link
>
<span class="crumbs-line"> &gt; </span>
<span class="crumbs-last">课程详情</span>
@@ -384,7 +384,7 @@
class="el-icon-document"
style="margin-right: 9px; margin-left: 9px"
></i
>ai文稿
>AI文稿
<img
src="@/assets/images/course/wengaoTip.png"
alt=""
@@ -749,12 +749,12 @@
</div>
</div>
<!-- ai播放器相关 -->
<div
v-show="courestab == 4"
style="padding-left: 17px; padding-top: 20px;background-color: #fff;"
>
<div style="padding: 30px;line-height: 24px;letter-spacing: 0.3px;color: rgba(102, 102, 102, 1);">
{{ courseInfo.summaryContent || '' }}
<div
v-show="courestab == 4"
style="padding-left: 17px; padding-top: 20px;background-color: #fff;"
>
<div style="padding: 30px;line-height: 24px;letter-spacing: 0.3px;color: rgba(102, 102, 102, 1);">
{{ courseInfo.summaryContent || '' }}
</div>
</div>
</div>
@@ -1185,6 +1185,8 @@ export default {
let ctime = parseInt(nowDate.getTime() / 1000);
let beforeUrl = parseInt(nowDate.getTime() / 1000) + "/" + fid;
let urlSign = encodeURIComponent(encrypt(beforeUrl));
console.log(fid, 'fid');
console.log(u, 'u');
cookies.set("PLAYSIGN_TIME", ctime); //写客户端的cookie保存
//以下判断是为了区分本地环境和服务器环境
if (process.env.NODE_ENV == "development") {