Commit a5c44bac authored by xiabin's avatar xiabin

Merge remote-tracking branch 'origin/dev' into dev

parents 33f4959e ba182ce0
...@@ -13,6 +13,17 @@ $this->title = '发布课程'; ...@@ -13,6 +13,17 @@ $this->title = '发布课程';
AppAsset::addScript($this, '@web/assets/course_publish.js'); AppAsset::addScript($this, '@web/assets/course_publish.js');
AppAsset::addCss($this, '@web/assets/css/course_publish.css'); AppAsset::addCss($this, '@web/assets/css/course_publish.css');
?> ?>
<!-- 课程审核未通过提示信息
<div class="alert alert-warning">
<p><i class="glyphicon glyphicon-ban-circle"></i> <b>经过审核,该课堂因为以下原因未通过审核,请根据原因进行修改。不明白之处可联系我们。</b></p>
<p>讲师您好,感谢您的参与!您的课堂因“……“未能通过审核,请修改后重新提交。</p>
<p>烦请确认修改后再提交审核,勿重复操作,谢谢!</p>
<p>如有审核疑问,请联系 企业QQ 800008782,写明具体课堂及疑问。</p>
<p>办公时间:工作日9:30-18:00</p>
</div>
-->
<div class="send-class" id="publishMain"> <div class="send-class" id="publishMain">
<div class="tit">发布课程</div> <div class="tit">发布课程</div>
......
...@@ -858,7 +858,7 @@ a,a:hover,a:link { ...@@ -858,7 +858,7 @@ a,a:hover,a:link {
font-size: 48px; font-size: 48px;
padding-top: 170px; padding-top: 170px;
} }
.video-main p { .video-main > p {
font-size: 16px; font-size: 16px;
margin-top: 40px; margin-top: 40px;
line-height: 1.8; line-height: 1.8;
...@@ -886,6 +886,28 @@ a,a:hover,a:link { ...@@ -886,6 +886,28 @@ a,a:hover,a:link {
.look-video a { .look-video a {
color: #f7b940; color: #f7b940;
} }
.has-icon-part {
position: absolute;
left: 0;
width: 100%;
height: 110px;
top: 50%;
margin-top: -55px;
}
.has-icon-part > p > span {
display: block;
}
.has-icon-part p a {
display: inline-block;
color: #fff;
padding-bottom: 40px;
}
.has-icon-part p span a {
color: #f7b940;
}
.has-icon-part span.icon-play {
font-size: 48px;
}
.vjs-big-play-centered .vjs-big-play-button { .vjs-big-play-centered .vjs-big-play-button {
z-index: 2!important; z-index: 2!important;
} }
......
...@@ -9,14 +9,19 @@ ...@@ -9,14 +9,19 @@
<template v-if="showTips"> <template v-if="showTips">
<img v-if="videoInfo.freeTime == 0" :src="videoInfo.previewUrl" width="100%" height="auto"> <img v-if="videoInfo.freeTime == 0" :src="videoInfo.previewUrl" width="100%" height="auto">
<div class="play-mask-box"> <div class="play-mask-box">
<div class="look-video"> <div v-if="videoInfo.freeTime >0" class="look-video">
<p v-if="videoInfo.freeTime >0">本课程可试看{{videoInfo.freeTime}}分钟</p> <p>本课程可试看{{videoInfo.freeTime}}分钟</p>
<p v-else>本课程为付费课程,{{videoInfo.price}} <a @click="pay" href="javascript:;">立即购买</a></p> </div>
<div v-else class="has-icon-part">
<p>
<a href="#"><span class="icon-play"></span></a>
<span>本课程为付费课程,{{videoInfo.price}} <a @click="pay" href="javascript:;">立即购买</a></span>
</p>
</div> </div>
</div> </div>
</template> </template>
</div> </div>
</template> </template>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment