Commit ce7e8fbf authored by 张伯涛's avatar 张伯涛

图片替换,视频水印透明度修改

parent a1ba6a7b
...@@ -4,3 +4,7 @@ ENV = 'production' ...@@ -4,3 +4,7 @@ ENV = 'production'
# 测试环境 # 测试环境
# base api # base api
VUE_APP_BASE_API = 'http://106.3.97.198:20024' VUE_APP_BASE_API = 'http://106.3.97.198:20024'
# VUE_APP_BASE_API = 'http://192.168.5.92:20024'
# 生产环境
# VUE_APP_BASE_API = '/AERCP/api'
...@@ -136,36 +136,36 @@ ...@@ -136,36 +136,36 @@
</div> </div>
</div> </div>
<div <!-- <div-->
:class="'price price-' + (courseDetails.lessonPrice ? 'charge' : 'free')" <!-- :class="'price price-' + (courseDetails.lessonPrice ? 'charge' : 'free')"-->
> <!-- >-->
<span v-if="courseDetails.lessonPrice === 0" style="color: #F96F21">¥0.00</span> <!-- <span v-if="courseDetails.lessonPrice === 0" style="color: #F96F21">¥0.00</span>-->
{{ formatPrice(courseDetails.lessonPrice) }} <!-- {{ formatPrice(courseDetails.lessonPrice) }}-->
<div v-if="courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 1 " class="priceLine" /> <!-- <div v-if="courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 1 " class="priceLine" />-->
<span <!-- <span-->
v-if="userToken && $store.getters.roles[0].roleKey === 'unit_admin' <!-- v-if="userToken && $store.getters.roles[0].roleKey === 'unit_admin'-->
&& courseDetails.lessonPrice !== 0 && courseDetails.tryout !== '1'" <!-- && courseDetails.lessonPrice !== 0 && courseDetails.tryout !== '1'"-->
:class="courseDetails.lessonIsPay === 1 ? 'buyStatus' : 'buyStatusNo'" <!-- :class="courseDetails.lessonIsPay === 1 ? 'buyStatus' : 'buyStatusNo'"-->
> <!-- >-->
{{ courseDetails.lessonIsPay === 1 ? '(已购买)' : '(未购买)' }}</span> <!-- {{ courseDetails.lessonIsPay === 1 ? '(已购买)' : '(未购买)' }}</span>-->
<span <!-- <span-->
v-if="userToken && $store.getters.roles[0].roleKey !== 'unit_admin' <!-- v-if="userToken && $store.getters.roles[0].roleKey !== 'unit_admin'-->
&& courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay=== 0 && courseDetails.tryout !== '1'" <!-- && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay=== 0 && courseDetails.tryout !== '1'"-->
class="buyStatusNo" <!-- class="buyStatusNo"-->
> <!-- >-->
{{ '(未购买)' }} <!-- {{ '(未购买)' }}-->
</span> <!-- </span>-->
<!-- 登录&&不是免费&&没有购买,看看是不是试用--> <!-- &lt;!&ndash; 登录&&不是免费&&没有购买,看看是不是试用&ndash;&gt;-->
<span <!-- <span-->
v-if=" (userToken && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 0 && <!-- v-if=" (userToken && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 0 &&-->
courseDetails.beginTrialTime) || courseDetails.tryout === '1' && courseDetails.lessonIsPay !== 1" <!-- courseDetails.beginTrialTime) || courseDetails.tryout === '1' && courseDetails.lessonIsPay !== 1"-->
class="probationClass" <!-- class="probationClass"-->
>(试用中)</span> <!-- >(试用中)</span>-->
<!-- availableTrialTime表示剩余学习天数--> <!-- &lt;!&ndash; availableTrialTime表示剩余学习天数&ndash;&gt;-->
<span v-if="courseDetails.availableTrialTime && courseDetails.availableTrialTime > 0" class="availableTrialTime_class">还剩{{ courseDetails.availableTrialTime }}天到期</span> <!-- <span v-if="courseDetails.availableTrialTime && courseDetails.availableTrialTime > 0" class="availableTrialTime_class">还剩{{ courseDetails.availableTrialTime }}天到期</span>-->
<span v-if="courseDetails.availableTrialTime && courseDetails.availableTrialTime === 0" class="availableTrialTime_class">如需继续学习,请联系管理员续期!</span> <!-- <span v-if="courseDetails.availableTrialTime && courseDetails.availableTrialTime === 0" class="availableTrialTime_class">如需继续学习,请联系管理员续期!</span>-->
<span v-if="courseDetails.chapterName" class="lastStudy_class">上次学习:{{ courseDetails.chapterName }}</span> <!-- <span v-if="courseDetails.chapterName" class="lastStudy_class">上次学习:{{ courseDetails.chapterName }}</span>-->
</div> <!-- </div>-->
</div> </div>
</div> </div>
<div class="bottom-box"> <div class="bottom-box">
...@@ -916,7 +916,7 @@ export default { ...@@ -916,7 +916,7 @@ export default {
flex: 1; flex: 1;
.info-top { .info-top {
height: 100%;
.title-box { .title-box {
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -981,11 +981,11 @@ export default { ...@@ -981,11 +981,11 @@ export default {
} }
.subTitle { .subTitle {
height: 95px;
font-size: 14px; font-size: 14px;
font-weight: 400; font-weight: 400;
color: #6f6f6f; color: #6f6f6f;
margin-top: 12px; margin-top: 12px;
height: 16px;
text-overflow: ellipsis; text-overflow: ellipsis;
display: -webkit-box; /* 适用于 WebKit 浏览器,如 Chrome 和 Safari */ display: -webkit-box; /* 适用于 WebKit 浏览器,如 Chrome 和 Safari */
-webkit-line-clamp: 1; /* 限制显示的行数,此处设置为 1 行 */ -webkit-line-clamp: 1; /* 限制显示的行数,此处设置为 1 行 */
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<div class="learningPlatform_title">学习平台架构</div> <div class="learningPlatform_title">学习平台架构</div>
<div class="learningPlatform_titleDivider"> <el-divider /></div> <div class="learningPlatform_titleDivider"> <el-divider /></div>
<div class="learningPlatform_content"> <div class="learningPlatform_content">
<img class="el-image" :src="require('@/assets/image/group.png')"> <img class="el-image" :src="require('@/assets/image/groupNew.png')">
</div> </div>
</div> </div>
<!-- 丰富运营功能 --> <!-- 丰富运营功能 -->
...@@ -458,13 +458,13 @@ export default { ...@@ -458,13 +458,13 @@ export default {
.learningPlatform_content { .learningPlatform_content {
width: 1920px; width: 1920px;
height: 863px; height: 573px;
background-color: #FFFFFF; background-color: #FFFFFF;
display: flex; display: flex;
justify-content: center; justify-content: center;
.el-image { .el-image {
width: 1201px; width: 1200px;
height: 799px; height: 503px;
} }
} }
.learningPlatform_content2 { .learningPlatform_content2 {
......
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
<!-- </div>--> <!-- </div>-->
<div class="playerContainer"> <div class="playerContainer">
<!-- 水印 --> <!-- 水印 -->
<div v-watermark="{text: name + phone, textColor: '#e7e7e7' }" class="my_course_video_box" /> <div v-watermark="{text: name + phone, width:400,height:200, textColor: 'rgba(255, 255, 255, 0.2)' }" class="my_course_video_box" />
<video-player <video-player
v-if="currentSection.isTest==='0' && updateTest && !isExam" v-if="currentSection.isTest==='0' && updateTest && !isExam"
id="videoPlay" id="videoPlay"
......
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