Skip to content

T
tea_resources_pc
Commit ce7e8fbf authored by 张伯涛's avatar 张伯涛
Browse files
Options

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

parent a1ba6a7b
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 37 deletions
.env.test
View file @ ce7e8fbf
......@@ -4,3 +4,7 @@ ENV = 'production'
# 测试环境
# base api
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'
src/views/courseResources/courseDetails/index.vue
View file @ ce7e8fbf
......@@ -136,36 +136,36 @@
</div>
</div>
<div
:class="'price price-' + (courseDetails.lessonPrice ? 'charge' : 'free')"
>
<span v-if="courseDetails.lessonPrice === 0" style="color: #F96F21">￥0.00</span>
{{ formatPrice(courseDetails.lessonPrice) }}
<div v-if="courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 1 " class="priceLine" />
<span
v-if="userToken && $store.getters.roles[0].roleKey === 'unit_admin'
&& courseDetails.lessonPrice !== 0 && courseDetails.tryout !== '1'"
:class="courseDetails.lessonIsPay === 1 ? 'buyStatus' : 'buyStatusNo'"
>
{{ courseDetails.lessonIsPay === 1 ? '（已购买）' : '（未购买）' }}</span>
<span
v-if="userToken && $store.getters.roles[0].roleKey !== 'unit_admin'
&& courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay=== 0 && courseDetails.tryout !== '1'"
class="buyStatusNo"
>
{{ '（未购买）' }}
</span>
<!-- 登录&&不是免费&&没有购买，看看是不是试用-->
<span
v-if=" (userToken && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 0 &&
courseDetails.beginTrialTime) || courseDetails.tryout === '1' && courseDetails.lessonIsPay !== 1"
class="probationClass"
>(试用中)</span>
<!-- availableTrialTime表示剩余学习天数-->
<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.chapterName" class="lastStudy_class">上次学习：{{ courseDetails.chapterName }}</span>
</div>
<!-- <div-->
<!-- :class="'price price-' + (courseDetails.lessonPrice ? 'charge' : 'free')"-->
<!-- >-->
<!-- <span v-if="courseDetails.lessonPrice === 0" style="color: #F96F21">￥0.00</span>-->
<!-- {{ formatPrice(courseDetails.lessonPrice) }}-->
<!-- <div v-if="courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 1 " class="priceLine" />-->
<!-- <span-->
<!-- v-if="userToken && $store.getters.roles[0].roleKey === 'unit_admin'-->
<!-- && courseDetails.lessonPrice !== 0 && courseDetails.tryout !== '1'"-->
<!-- :class="courseDetails.lessonIsPay === 1 ? 'buyStatus' : 'buyStatusNo'"-->
<!-- >-->
<!-- {{ courseDetails.lessonIsPay === 1 ? '（已购买）' : '（未购买）' }}</span>-->
<!-- <span-->
<!-- v-if="userToken && $store.getters.roles[0].roleKey !== 'unit_admin'-->
<!-- && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay=== 0 && courseDetails.tryout !== '1'"-->
<!-- class="buyStatusNo"-->
<!-- >-->
<!-- {{ '（未购买）' }}-->
<!-- </span>-->
<!-- &lt;!&ndash; 登录&&不是免费&&没有购买，看看是不是试用&ndash;&gt;-->
<!-- <span-->
<!-- v-if=" (userToken && courseDetails.lessonPrice !== 0 && courseDetails.lessonIsPay === 0 &&-->
<!-- courseDetails.beginTrialTime) || courseDetails.tryout === '1' && courseDetails.lessonIsPay !== 1"-->
<!-- class="probationClass"-->
<!-- >(试用中)</span>-->
<!-- &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">如需继续学习，请联系管理员续期！</span>-->
<!-- <span v-if="courseDetails.chapterName" class="lastStudy_class">上次学习：{{ courseDetails.chapterName }}</span>-->
<!-- </div>-->
</div>
</div>
<div class="bottom-box">
......@@ -916,7 +916,7 @@ export default {
flex: 1;
.info-top {
height: 100%;
.title-box {
display: flex;
align-items: center;
......@@ -981,11 +981,11 @@ export default {
}
.subTitle {
height: 95px;
font-size: 14px;
font-weight: 400;
color: #6f6f6f;
margin-top: 12px;
height: 16px;
text-overflow: ellipsis;
display: -webkit-box; /* 适用于 WebKit 浏览器，如 Chrome 和 Safari */
-webkit-line-clamp: 1; /* 限制显示的行数，此处设置为 1 行 */
......
src/views/learningPlatform/index.vue
View file @ ce7e8fbf
......@@ -26,7 +26,7 @@
<div class="learningPlatform_title">学习平台架构</div>
<div class="learningPlatform_titleDivider"> <el-divider /></div>
<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>
<!-- 丰富运营功能 -->
......@@ -458,13 +458,13 @@ export default {
.learningPlatform_content {
width: 1920px;
height: 863px;
height: 573px;
background-color: #FFFFFF;
display: flex;
justify-content: center;
.el-image {
width: 1201px;
height: 799px;
width: 1200px;
height: 503px;
}
}
.learningPlatform_content2 {
......
src/views/lessionLearn/index.vue
View file @ ce7e8fbf
......@@ -84,7 +84,7 @@
<!-- </div>-->
<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
v-if="currentSection.isTest==='0' && updateTest && !isExam"
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