Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
tea_resources_pc
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张伯涛
tea_resources_pc
Commits
ce7e8fbf
Commit
ce7e8fbf
authored
Jul 23, 2024
by
张伯涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
图片替换,视频水印透明度修改
parent
a1ba6a7b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
41 additions
and
37 deletions
+41
-37
.env.test
.env.test
+4
-0
groupNew.png
src/assets/image/groupNew.png
+0
-0
index.vue
src/views/courseResources/courseDetails/index.vue
+32
-32
index.vue
src/views/learningPlatform/index.vue
+4
-4
index.vue
src/views/lessionLearn/index.vue
+1
-1
No files found.
.env.test
View file @
ce7e8fbf
...
@@ -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'
src/assets/image/groupNew.png
0 → 100644
View file @
ce7e8fbf
284 KB
src/views/courseResources/courseDetails/index.vue
View file @
ce7e8fbf
...
@@ -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>
--
>
<!-- 登录&&不是免费&&没有购买,看看是不是试用
-->
<!-- <!– 登录&&不是免费&&没有购买,看看是不是试用–>
-->
<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表示剩余学习天数
-->
<!-- <!– 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"
>
还剩
{{
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 行 */
...
...
src/views/learningPlatform/index.vue
View file @
ce7e8fbf
...
@@ -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/group
New
.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
:
86
3px
;
height
:
57
3px
;
background-color
:
#FFFFFF
;
background-color
:
#FFFFFF
;
display
:
flex
;
display
:
flex
;
justify-content
:
center
;
justify-content
:
center
;
.el-image
{
.el-image
{
width
:
120
1
px
;
width
:
120
0
px
;
height
:
799
px
;
height
:
503
px
;
}
}
}
}
.learningPlatform_content2
{
.learningPlatform_content2
{
...
...
src/views/lessionLearn/index.vue
View file @
ce7e8fbf
...
@@ -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"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment