Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mr-julyedu
Overview
Overview
Details
Activity
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
baiguangyao
mr-julyedu
Commits
a981fa38
Commit
a981fa38
authored
Jun 11, 2019
by
xuzhenghua
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
detail
parent
39f37417
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
561 additions
and
296 deletions
+561
-296
src/assets/css/variable.scss
+1
-0
src/common/NavBar/index.js
+4
-4
src/components/detail/index.js
+9
-6
src/components/detail/index.scss
+1
-51
src/components/detail/outline/index.js
+36
-15
src/components/detail/shareRank/index.js
+37
-14
src/components/detail/shareRank/index.scss
+17
-1
src/components/my/index.scss
+80
-65
src/components/order/index.js
+28
-21
src/components/order/order.scss
+161
-114
src/router/router-config.js
+5
-0
yarn.lock
+182
-5
No files found.
src/assets/css/variable.scss
View file @
a981fa38
...
...
@@ -71,6 +71,7 @@ $bg_0198FE: #0198FE;
$bg_F4AAA7
:
#F4AAA7
;
$bg_E02E24
:
#E02E24
;
$bg_007FD0
:
#007FD0
;
$bg_FF0000
:
#FF0000
;
/*
...
...
src/common/NavBar/index.js
View file @
a981fa38
...
...
@@ -6,25 +6,25 @@ const navLinkConfig = [
{
to
:
'/'
,
exact
:
true
,
icon
:
'iconshouye'
,
icon
:
'iconshouye
-xianxing
'
,
text
:
'首页'
},
{
to
:
'/classify'
,
exact
:
false
,
icon
:
'icon
iconfront-16
'
,
icon
:
'icon
fenlei-xianxing
'
,
text
:
'分类'
},
{
to
:
'/study'
,
exact
:
false
,
icon
:
'iconxuexi'
,
icon
:
'iconxuexi
-xianxing
'
,
text
:
'学习'
},
{
to
:
'/my'
,
exact
:
false
,
icon
:
'icon
home
'
,
icon
:
'icon
wode-xianxing
'
,
text
:
'我的'
}
]
...
...
src/components/detail/index.js
View file @
a981fa38
...
...
@@ -102,15 +102,15 @@ class Detail extends Component {
{
courseInfo
.
is_baoming
===
1
&&
<
div
className
=
'group'
>
上课
QQ
群:
{
courseInfo
.
course_qq
}
,加群请备注您的学号:
{
courseInfo
.
course_qq
}
上课
QQ
群:
{
courseInfo
.
course_qq
}
,加群请备注您的学号:
{
courseInfo
.
uid
}
<
/div
>
}
{
/*vip课程显示*/
}
{
this
.
state
.
isvip
===
1
&&
courseInfo
.
vip_range
&&
<
div
className
=
"vip"
>
<
p
>
已开通年会员:
2019
/
03
/
02
—
2020
/
03
/
02
<
/p
>
<
p
>
年会员
QQ
群:
967114537
,加群请备注您的学号:
479409
<
/p
>
<
p
>
已开通年会员:
{
courseInfo
.
vip_range
}
<
/p
>
<
p
>
年会员
QQ
群:
{
courseInfo
.
course_qq
}
,加群请备注您的学号:
{
courseInfo
.
uid
}
<
/p
>
<
/div
>
}
...
...
@@ -133,10 +133,13 @@ class Detail extends Component {
{
/*单集购买*/
}
<
Single
singleBox
=
{
this
.
state
.
singleBox
}
boxHide
=
{
this
.
boxHide
}
data
=
{
this
.
state
.
singMess
}
title
=
{
courseInfo
.
course_title
}
/
>
title
=
{
courseInfo
.
course_title
}
/
>
{
/*分享赚钱*/
}
<
ShareRank
shareRank
=
{
this
.
state
.
shareRank
}
openRanking
=
{
this
.
openRanking
}
boxHide
=
{
this
.
boxHide
}
/
>
{
courseInfo
.
is_dist
&&
<
ShareRank
shareRank
=
{
this
.
state
.
shareRank
}
openRanking
=
{
this
.
openRanking
}
boxHide
=
{
this
.
boxHide
}
/
>
}
{
/*砍价*/
}
<
Bargain
/>
...
...
src/components/detail/index.scss
View file @
a981fa38
...
...
@@ -113,7 +113,7 @@
}
.group
,
.vip
{
margin
:
0
12px
;
margin
:
10px
12px
0
12px
;
padding
:
10px
12px
;
text-align
:
center
;
color
:
$white
;
...
...
@@ -129,53 +129,4 @@
background
:
linear-gradient
(
-90deg
,
$bg_EBA216
0%
,
$bg_EBC05A
100%
);
}
.share-ranking
{
height
:
60px
;
line-height
:
25px
;
padding
:
15px
12px
;
border-top
:
8px
solid
$bg_f5f5f5
;
display
:
flex
;
position
:
relative
;
font-size
:
12px
;
.title
{
font-size
:
14px
;
margin-right
:
12px
;
}
.ranking-mess
{
margin-right
:
20px
;
img
{
width
:
22px
;
height
:
22px
;
border-radius
:
50%
;
vertical-align
:
middle
;
}
i
{
display
:
inline-block
;
margin-left
:
5px
;
color
:
$color_333
;
font-style
:
normal
;
}
}
.ranking-ellipsis
{
width
:
22px
;
height
:
22px
;
border-radius
:
50%
;
}
.share
{
position
:
absolute
;
right
:
12px
;
padding
:
5px
6px
;
border
:
1px
solid
$red
;
border-radius
:
3px
;
color
:
$red
;
background-color
:
$bg_fff
;
}
}
}
\ No newline at end of file
src/components/detail/outline/index.js
View file @
a981fa38
import
React
,
{
Component
}
from
'react'
import
{
Tabs
,
WhiteSpace
}
from
'antd-mobile'
import
'./index.scss'
import
{
api
,
getParam
,
http
}
from
"@/utils"
;
class
OutLine
extends
Component
{
constructor
(
props
)
{
super
(
props
)
this
.
state
=
{
stageInfo
:
[]
}
}
htmlDecode
=
(
content
)
=>
{
...
...
@@ -14,15 +18,24 @@ class OutLine extends Component {
return
e
.
childNodes
.
length
===
0
?
""
:
e
.
childNodes
[
0
].
nodeValue
;
}
componentDidMount
()
{
http
.
get
(
`
${
api
.
home
}
/m/course/syllabuses/
${
getParam
(
'id'
)}
`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
===
200
)
{
this
.
setState
({
stageInfo
:
res
.
data
.
data
})
}
})
}
render
()
{
const
tabs
=
[
{
title
:
'介绍'
},
{
title
:
'大纲'
}
];
let
stageInfo
=
''
let
introduce
=
''
if
(
this
.
props
.
data
.
stage_info
&&
this
.
props
.
data
.
course_info
)
{
stageInfo
=
this
.
props
.
data
.
stage_info
if
(
this
.
props
.
data
.
course_info
)
{
introduce
=
this
.
props
.
data
.
course_info
}
return
(
...
...
@@ -34,12 +47,12 @@ class OutLine extends Component {
<
p
>
讲师:
{
introduce
.
teachers
}
<
/p
>
<
p
>
课时:
{
introduce
.
course_hour
}
<
/p
>
<
p
>
时间:
{
introduce
.
start_time
}
<
/p
>
<
div
className
=
'dec'
dangerouslySetInnerHTML
=
{{
__html
:
this
.
htmlDecode
(
introduce
.
intro
)}}
><
/div
>
<
div
className
=
'dec'
dangerouslySetInnerHTML
=
{{
__html
:
this
.
htmlDecode
(
introduce
.
intro
)}}
><
/div
>
<
/div
>
{
/*大纲*/
}
<
div
className
=
'outline'
>
{
stageInfo
&&
stageInfo
.
length
>
0
&&
stageInfo
.
map
((
item
,
index
)
=>
{
this
.
state
.
stageInfo
&&
this
.
state
.
stageInfo
.
length
>
0
&&
this
.
state
.
stageInfo
.
map
((
item
,
index
)
=>
{
return
(
<
div
className
=
'stagebox'
key
=
{
index
}
>
<
h1
className
=
'stage text-overflow-1'
>
{
item
.
stage_name
}
<
/h1
>
...
...
@@ -49,37 +62,45 @@ class OutLine extends Component {
<
ul
key
=
{
index
}
>
<
h2
className
=
'classhour'
>
<
span
className
=
'title text-overflow-1'
>
{
item
.
name
}
<
/span
>
{
/*
class_status
0-未购买未开单集购买
1-未购买已开单集购买
2-已购买直播结束已上传视频
3-已购买未开课、已购买直播结束
4-已购买直播中
5-课程不能试听
6-可试听且有试听权限
7-可试听但无试听权限
*/
}
{
// 试听
item
.
is_video
===
1
&&
item
.
class_status
===
7
&&
<
span
className
=
'btn-right-10 audition'
onClick
=
{
this
.
props
.
toAudition
}
>
试听
<
i
className
=
'iconfont iconcelluar'
><
/i
>
<
/span
>
}
{
// 未购买未开单集购买:上锁标志,点击提示购买
item
.
is_class
===
0
&&
item
.
video_auth
===
0
&&
item
.
is_video
===
0
&&
item
.
class_status
===
0
&&
<
i
className
=
'iconfont iconiconfront-74 icon-right-22'
><
/i
>
}
{
// 未购买已开单集购买:显示单集价格,点击购买单集
item
.
is_class
===
1
&&
item
.
video_auth
===
0
&&
item
.
class_status
===
1
&&
<
span
className
=
'btn-right-10 singleset'
onClick
=
{
e
=>
this
.
props
.
toSingleset
(
item
)}
>
¥
{
item
.
class_price
}
<
/span
>
onClick
=
{
e
=>
this
.
props
.
toSingleset
(
item
)}
>
¥
{
item
.
class_price
}
<
/span
>
}
{
// 已购买直播中:正在直播,点击进入直播间
item
.
class_status
===
4
&&
item
.
video_auth
===
1
&&
item
.
is_video
===
4
&&
<
span
className
=
'live icon-right-22'
>
正在直播
<
i
className
=
'iconfont icondanseshixintubiao-23'
><
/i></
span
>
}
{
// 已购买直播结束已上传视频:正常播放按钮,点击播放课程
item
.
video_auth
===
1
&&
item
.
is_video
===
5
&&
item
.
class_status
===
2
&&
<
i
className
=
'iconfont icondanseshixintubiao-23 icon-right-22'
><
/i
>
}
{
// 已购买未开课、已购买直播结束:空
}
<
/h2
>
{
item
.
point
.
map
((
item
,
index
)
=>
{
...
...
src/components/detail/shareRank/index.js
View file @
a981fa38
...
...
@@ -5,12 +5,21 @@ import {api, getParam, http} from "@/utils";
class
ShareRank
extends
Component
{
constructor
(
props
)
{
super
(
props
)
this
.
state
=
{
list
:
''
,
rankingslice
:
''
}
}
componentDidMount
()
{
// http.get(`${api.home}/dist/rankList/${getParam('id')`).then((res) => {
//
// })
http
.
get
(
`
${
api
.
home
}
/dist/rankList/
${
getParam
(
'id'
)}
`
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
===
200
)
{
this
.
setState
({
list
:
res
.
data
.
data
,
rankingslice
:
res
.
data
.
data
.
slice
(
0
,
2
)
})
}
})
}
// 关闭弹窗
...
...
@@ -23,12 +32,17 @@ class ShareRank extends Component {
<
div
className
=
'share-ranking'
>
<
span
className
=
"title"
>
排行榜:
<
/span
>
<
div
className
=
'ranking-box'
onClick
=
{
this
.
props
.
openRanking
}
>
<
span
className
=
"ranking-mess"
><
img
src
=
"https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/4c5ccac604.jpg"
alt
=
""
/><
i
>
22
元
<
/i></
span
>
<
span
className
=
"ranking-mess"
><
img
src
=
"https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/4c5ccac604.jpg"
alt
=
""
/><
i
>
22
元
<
/i></
span
>
{
this
.
state
.
rankingslice
&&
this
.
state
.
rankingslice
.
length
>
0
&&
this
.
state
.
rankingslice
.
map
((
item
,
index
)
=>
{
return
(
<
span
key
=
{
index
}
className
=
"ranking-mess"
>
<
img
src
=
{
item
.
head_imgurl
}
alt
=
""
/>
<
i
>
{
item
.
amount
}
元
<
/i
>
<
/span
>
)
})
}
<
img
className
=
"ranking-ellipsis"
src
=
"https://julyedu-img.oss-cn-beijing.aliyuncs.com/Image/train/ellipsis.png"
alt
=
""
/>
<
/div
>
...
...
@@ -43,12 +57,21 @@ class ShareRank extends Component {
<
span
className
=
"tips"
>
只展示前
9
名用户
<
/span
>
<
/div
>
<
ul
>
<
li
>
<
img
src
=
"https://julyedu-img-public.oss-cn-beijing.aliyuncs.com/Public/Image/e769a844b4.png"
alt
=
""
/>
<
span
className
=
'course-title'
>
机器学习集机器学习集
<
/span
>
<
span
className
=
'course-price'
>
270
元
<
/span
>
<
/li
>
{
this
.
state
.
list
&&
this
.
state
.
list
.
length
>
0
&&
this
.
state
.
list
.
map
((
item
,
index
)
=>
{
return
(
<
li
key
=
{
index
}
>
<
img
src
=
{
item
.
head_imgurl
}
alt
=
""
/>
<
span
className
=
'course-title'
>
{
item
.
user_name
}
<
/span
>
<
span
className
=
'course-price'
>
{
item
.
amount
}
元
<
/span
>
<
/li
>
)
})
}
<
/ul
>
<
div
className
=
'shareBtn'
>
<
button
>
分享赚
67
元
<
/button
>
<
/div
>
<
/div
>
<
i
onClick
=
{
this
.
colse
}
className
=
{
'iconfont iconiconfront-2 close'
}
><
/i
>
<
/div
>
...
...
src/components/detail/shareRank/index.scss
View file @
a981fa38
...
...
@@ -20,7 +20,7 @@
.ranking-mess
{
float
:
left
;
margin-right
:
20
px
;
margin-right
:
15
px
;
img
{
width
:
22px
;
...
...
@@ -129,6 +129,22 @@
}
}
}
.shareBtn
{
width
:
100%
;
height
:
44px
;
text-align
:
center
;
button
{
border
:
none
;
width
:
105px
;
height
:
24px
;
margin-top
:
10px
;
background
:
linear-gradient
(
90deg
,
$bg_FF0000
0%
,
$bg_FF4000
100%
);
border-radius
:
12px
;
font-size
:
14px
;
color
:
$white
;
}
}
}
.close
{
...
...
src/components/my/index.scss
View file @
a981fa38
.my-tab
{
width
:
100%
;
height
:
44px
;
font-size
:
$font_16
;
background
:
$bg_f7f9fc
;
}
.my-list
{
.avatar-wrap
{
padding
:
15px
20px
;
.flex-container
{
.my-tab
{
width
:
100%
;
height
:
44px
;
font-size
:
$font_16
;
background
:
$bg_f7f9fc
;
}
.my-list
{
.avatar-wrap
{
padding
:
15px
20px
;
}
}
.my-isvip
{
width
:
100%
;
height
:
43px
;
background-image
:
url("./image/vip_bg.png")
;
background-size
:
cover
;
background-repeat
:
no-repeat
;
border-radius
:
3px
;
}
.my-stu
{
font-size
:
12px
;
}
}
.my-isvip
{
width
:
100%
;
height
:
43px
;
background-image
:
url("./image/vip_bg.png")
;
background-size
:
cover
;
background-repeat
:
no-repeat
;
border-radius
:
3px
;
}
.my-stu
{
font-size
:
12px
;
}
// 修改List组件默认样式
.am-list-item
{
padding-left
:
22px
;
padding-right
:
8px
;
}
.am-list-item
.am-list-line-multiple
{
padding-right
:
0px
!
important
;
}
// 修改List组件默认样式
.am-list-item
{
padding-left
:
22px
;
padding-right
:
8px
;
}
.am-list-item
.am-list-line-multiple
{
padding-right
:
0px
!
important
;
}
.am-list-thumb
{
img
{
width
:
64px
;
height
:
64px
;
.am-list-thumb
{
img
{
width
:
64px
;
height
:
64px
;
}
}
}
.am-list-brief
{
color
:
$color_333
!
important
;
}
.am-list-header
{
padding
:
2
.5px
0
;
background
:
$bg_f5f5f5
;
}
.am-list-content
{
i
{
vertical-align
:
middle
;
margin-top
:
-1px
;
display
:
inline-block
;
margin-right
:
12px
;
margin
:
10px
12px
10px
0
;
font-size
:
30px
!
important
;
.am-list-brief
{
color
:
$color_333
!
important
;
}
}
.
am-list-line-multiple
:
:
after
{
background-color
:
transparent
!
important
;
}
.my-list
{
.
am-list-body
:
:
after
{
.am-list-header
{
padding
:
2
.5px
0
;
background
:
$bg_f5f5f5
;
}
.am-list-content
{
i
{
vertical-align
:
middle
;
margin-top
:
-1px
;
display
:
inline-block
;
margin-right
:
12px
;
margin
:
10px
12px
10px
0
;
font-size
:
30px
!
important
;
}
}
.
am-list-line-multiple
:
:
after
{
background-color
:
transparent
!
important
;
}
.my-list
{
.
am-list-body
:
:
after
{
background-color
:
transparent
!
important
;
}
}
.am-list-content
i
{
margin
:
0
;
margin-top
:
-4px
;
margin-right
:
10px
;
}
.
am-list-body
:
:
before
{
background-color
:
transparent
!
important
;
height
:
0
!
important
;
}
}
.am-list-content
i
{
margin
:
0
;
margin-top
:
-4px
;
margin-right
:
10px
;
}
.
am-list-body
:
:
before
{
background-color
:
transparent
!
important
;
height
:
0
!
important
;
}
}
\ No newline at end of file
src/components/order/index.js
View file @
a981fa38
import
React
,
{
Component
}
from
'react'
;
import
{
Flex
,
NavBar
,
List
}
from
'antd-mobile'
;
import
{
OrderItem
}
from
'@/common/index'
import
{
Link
}
from
'react-router-dom'
import
"./order.scss"
...
...
@@ -37,7 +38,7 @@ const mockData = [
function
OrderList
(
props
)
{
const
listData
=
props
.
list
;
return
(
<
div
style
=
{{
"padding"
:
"0 15px"
}}
>
<
div
>
{
listData
.
map
((
item
,
index
)
=>
{
const
Info
=
(
...
...
@@ -50,7 +51,7 @@ function OrderList(props) {
<
/p
>
<
/div
>
)
return
(
<
OrderItem
{...
item
}
key
=
{
index
}
info
=
{
Info
}
>
<
div
className
=
"order-prefer"
>
...
...
@@ -75,7 +76,7 @@ class Order extends Component {
constructor
(
props
)
{
super
(
props
);
this
.
state
=
{
perfect
:
true
}
}
handleClick
=
()
=>
{
...
...
@@ -94,22 +95,28 @@ class Order extends Component {
>
课程报名
<
/NavBar
>
<
div
className
=
"order-information"
>
<
i
className
=
"iconfont iconiconfront-6 order-addsize"
><
/i
>
<
div
className
=
"order-infotext"
>
完善报名信息
<
/div
>
<
i
className
=
"iconfont iconiconfront-70 order-next"
><
/i
>
<
/div
>
<
div
className
=
"order-information"
>
<
i
className
=
"iconfont iconiconfront-20"
><
/i
>
<
div
className
=
"order-cell"
>
<
div
className
=
"name"
>
姓名
:
张三
<
/div
>
<
div
>
电话
:
13266532323
<
/div
>
<
/div
>
<
div
className
=
"order-cell"
>
<
div
>
QQ
:
1084251364
<
/div
>
{
!
this
.
state
.
perfect
&&
<
Link
to
=
'/orderinfo'
className
=
"order-information"
>
<
i
className
=
"iconfont iconiconfront-6 order-addsize"
><
/i
>
<
div
className
=
"order-infotext"
>
完善报名信息
<
/div
>
<
i
className
=
"iconfont iconiconfront-70 order-next"
><
/i
>
<
/Link
>
}
{
this
.
state
.
perfect
&&
<
div
className
=
"order-information2"
>
<
i
className
=
"iconfont iconiconfront-20"
><
/i
>
<
div
className
=
"order-cell"
>
<
div
className
=
"name"
>
姓名
:
张三
<
/div
>
<
div
>
电话
:
13266532323
<
/div
>
<
/div
>
<
div
className
=
"order-cell"
>
<
div
>
QQ
:
1084251364
<
/div
>
<
/div
>
<
/div
>
<
/div
>
}
<
div
className
=
"order-list"
>
<
OrderList
list
=
{
mockData
}
/
>
<
/div
>
...
...
@@ -121,7 +128,7 @@ class Order extends Component {
extra
=
{
<
i
className
=
"iconfont icondanseshixintubiao-5"
><
/i>
}
>
余额抵扣
<
span
className
=
"order-balanceprice"
>
(
账户余额
:
<
i
className
=
"order-money"
>
1
元
<
/i>
)
</
span
>
<
span
className
=
"order-balanceprice"
>
(
账户余额
:
<
i
className
=
"order-money"
>
1
元
<
/i>
)
</
span
>
<
i
className
=
"iconfont iconiconfront-22"
><
/i
>
<
/Item
>
<
/List
>
...
...
@@ -140,14 +147,14 @@ class Order extends Component {
<
span
className
=
"order-preprice-price"
>
¥
200.50
<
/span
>
<
/div
>
<
/div
>
<
button
type
=
"button"
className
=
"order-button
"
>
<
button
type
=
"button"
className
=
"order-button"
>
<
span
className
=
"order-button-text"
>
提交订单
<
/span
>
<
/button
>
<
/div
>
<
/Flex.Item
>
<
/Flex
>
<
/div
>
)
}
...
...
src/components/order/order.scss
View file @
a981fa38
.order-wrapper
{
width
:
100%
;
margin-bottom
:
50px
;
background-color
:
$bg_f5f5f5
;
}
.order-tab
{
.order-wrapper
{
width
:
100%
;
margin-bottom
:
50px
;
background-color
:
$bg_f5f5f5
;
.order-tab
{
color
:
$black
;
background
:
$bg_f7f9fc
;
}
.order-information
{
}
.order-information
{
display
:
flex
;
width
:
100%
;
overflow
:
hidden
;
padding
:
2
8
px
15px
;
padding
:
2
9
px
15px
;
color
:
$color_555
;
background-color
:
$bg_fff
;
position
:
relative
;
}
.
order-information
:
:
before
{
}
.
order-information
:
:
before
{
content
:
''
;
left
:
0
;
right
:
0
;
...
...
@@ -26,109 +29,137 @@
background
:
-webkit-repeating-linear-gradient
(
135deg
,
#ff6c6c
0
,
#ff6c6c
20%
,
transparent
0
,
transparent
25%
,
#1989fa
0
,
#1989fa
45%
,
transparent
0
,
transparent
50%
);
background
:
repeating-linear-gradient
(
-45deg
,
#ff6c6c
0
,
#ff6c6c
20%
,
transparent
0
,
transparent
25%
,
#1989fa
0
,
#1989fa
45%
,
transparent
0
,
transparent
50%
);
background-size
:
80px
;
}
.order-cell
{
}
.order-cell
{
width
:
50%
;
height
:
45px
;
font-size
:
$font_14
;
color
:
$color_333
;
margin-left
:
20px
;
line-height
:
20px
;
display
:
inline-block
;
vertical-align
:
middle
;
.name
{
margin-bottom
:
10px
;
.name
{
margin-bottom
:
10px
;
}
}
.order-addsize
{
font-size
:
32px
!
important
;
}
.order-addsize
{
font-size
:
22px
!
important
;
margin-bottom
:
0px
;
height
:
22px
;
color
:
$active
;
}
.order-next
{
line-height
:
48px
;
margin-bottom
:
0px
;
}
.order-list
{
line-height
:
22px
;
}
.order-next
{
line-height
:
22px
;
margin-bottom
:
0px
;
}
.order-list
{
margin-top
:
8px
;
background-color
:
$white
;
}
.order-infotext
{
.public-content
{
padding
:
10px
15px
;
}
}
.order-infotext
{
flex
:
1
;
line-height
:
48px
;
height
:
22px
;
line-height
:
22px
;
margin-left
:
10px
;
font-size
:
$font_16
;
color
:
$color_555
;
}
.order-info
{
}
.order-info
{
color
:
$color_666
;
font-size
:
$font_14
;
.order-title
{
height
:
16px
;
line-height
:
16px
;
color
:
$color_333
;
font-size
:
$font_16
;
}
.order-content
{
margin-top
:
10px
;
color
:
$color_666
;
font-size
:
$font_14
;
line-height
:
18px
;
}
.order-des
{
margin-top
:
10px
;
}
.order-newprice
{
color
:
$redprice
;
font-size
:
$font_16
;
margin-right
:
15px
;
.order-title
{
height
:
16px
;
line-height
:
16px
;
color
:
$color_333
;
font-size
:
$font_16
;
}
.order-price
{
color
:
$color_999
;
font-size
:
$font_12
;
text-decoration
:
line-through
;
.order-content
{
margin-top
:
10px
;
color
:
$color_666
;
font-size
:
$font_14
;
line-height
:
18px
;
}
}
.order-bar
{
.order-des
{
margin-top
:
10px
;
}
.order-newprice
{
color
:
$redprice
;
font-size
:
$font_16
;
margin-right
:
15px
;
}
.order-price
{
color
:
$color_999
;
font-size
:
$font_12
;
text-decoration
:
line-through
;
}
}
.order-bar
{
width
:
100%
;
position
:
fixed
;
bottom
:
0
;
z-index
:
2
;
height
:
50px
;
display
:
flex
;
font-size
:
14px
;
align-items
:
center
;
background-color
:
$bg_fff
;
margin-top
:
30%
;
}
.order-course
{
}
.order-course
{
margin-left
:
20px
;
.order-course-text
{
font-size
:
$font_16
;
color
:
$color_333
;
.order-course-text
{
font-size
:
$font_16
;
color
:
$color_333
;
}
}
.order-bar-text
{
}
.order-bar-text
{
flex
:
1
;
font-weight
:
500
;
text-align
:
right
;
color
:
#323233
;
padding-right
:
12px
;
.order-amount
{
font-size
:
$font_14
;
color
:
$color_333
;
.order-amount-price
{
color
:
$redprice
;
}
}
.order-preprice
{
font-size
:
$font_12
;
color
:
$color_555
;
}
}
.order-button
{
padding-right
:
20px
;
.order-amount
{
font-size
:
$font_14
;
color
:
$color_333
;
.order-amount-price
{
color
:
$redprice
;
}
}
.order-preprice
{
font-size
:
$font_12
;
color
:
$color_555
;
}
}
.order-button
{
width
:
110px
;
height
:
50px
;
display
:
inline-block
;
position
:
relative
;
padding
:
0
;
background-color
:
$bg_ff9898
;
background-color
:
$bg_ff9898
;
color
:
$white
;
line-height
:
48px
;
font-size
:
16px
;
...
...
@@ -138,51 +169,66 @@
-webkit-appearance
:
none
;
-webkit-text-size-adjust
:
100%
;
border
:
1px
solid
transparent
;
}
.order-button-text
{
}
}
.order-item
{
.am-list-item
{
padding-left
:
15px
;
}
}
.v-list-item
{
.v-list-item
{
margin-top
:
8px
;
padding
:
10px
15px
0
15px
;
.content
{
border-bottom
:
none
;
}
}
.order-prefer
{
.am-list
{
border-top
:
1px
solid
#e7eaf1
;
.content
{
border-bottom
:
none
;
}
.order-prefer-text
{
}
.order-prefer
{
.am-list-line
{
padding
:
0
15px
;
}
}
.order-balanceprice
{
}
.order-balanceprice
{
color
:
$color_666
;
font-size
:
$font_12
;
.order-money
{
color
:
#ff2121
;
font-size
:
$font_12
!
important
;
font-weight
:
normal
;
font-style
:
inherit
;
vertical-align
:
middle
;
margin
:
0
;
.order-money
{
color
:
#ff2121
;
font-size
:
$font_12
!
important
;
font-weight
:
normal
;
font-style
:
inherit
;
vertical-align
:
middle
;
margin
:
0
;
}
}
}
.am-list-item
.am-list-line
.am-list-content
{
.am-list-item
.am-list-line
.am-list-content
{
color
:
$color_333
;
}
.order-balance
{
margin-top
:
8px
;
.am-list-content
{
color
:
$color_333
;
font-size
:
$font_16
;
}
.order-list
{
.am-list-item
{
padding-left
:
0
!
important
;
}
}
.order-balance
{
height
:
44px
;
line-height
:
44px
;
margin
:
8px
0
50px
0
;
.am-list-item
{
padding-left
:
0
!
important
;
}
.am-list-line
{
padding
:
0
15px
;
}
.am-list-content
{
color
:
$color_333
;
font-size
:
$font_16
;
.iconiconfront-22
{
font-size
:
18px
;
margin-left
:
15px
;
}
}
}
}
\ No newline at end of file
src/router/router-config.js
View file @
a981fa38
...
...
@@ -6,6 +6,7 @@ import Classify from '@/components/classify';
import
My
from
'@/components/my'
;
import
CourseList
from
'@/components/classify/courselist'
;
import
Order
from
'@/components/order/index'
;
import
Orderinfo
from
'@/components/order/orderinfo'
;
import
Preferential
from
'@/components/preferential/index'
;
import
Search
from
'@/components/search/index'
import
SearchResult
from
'@/components/search/search-result'
...
...
@@ -59,6 +60,10 @@ export default [
component
:
Order
},
{
path
:
'/orderinfo'
,
component
:
Orderinfo
},
{
path
:
'/detail'
,
component
:
Detail
},
...
...
yarn.lock
View file @
a981fa38
...
...
@@ -854,7 +854,7 @@
dependencies:
regenerator-runtime "^0.13.2"
"@babel/runtime@^7.4.4":
"@babel/runtime@^7.
2.0", "@babel/runtime@^7.
4.4":
version "7.4.5"
resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.4.5.tgz#582bb531f5f9dc67d2fcb682979894f75e253f12"
integrity sha512-TuI4qpWZP6lGOGIuGWtp9sPluqYICmbk8T/1vpSysqJxRPkudh/ofFWyqdcMsDf2s7KvDL4/YHgKyvcS3g9CJQ==
...
...
@@ -1062,6 +1062,19 @@
"@types/unist" "*"
"@types/vfile-message" "*"
"@videojs/http-streaming@1.9.3":
version "1.9.3"
resolved "https://registry.yarnpkg.com/@videojs/http-streaming/-/http-streaming-1.9.3.tgz#c971050495fb58d2b4c6ee0246bb03cc750635b1"
integrity sha512-gNdqyvhxTU67optzxiywHXi/z2+Ju0b6hNth0V7BsL7YAH+R1StIKmmp6SsfFZQfrNW5ykYFoR95M/AT5cg9Ug==
dependencies:
aes-decrypter "3.0.0"
global "^4.3.0"
m3u8-parser "4.3.0"
mpd-parser "0.7.0"
mux.js "5.1.1"
url-toolkit "^2.1.3"
video.js "^6.8.0 || ^7.0.0"
"@webassemblyjs/ast@1.7.11":
version "1.7.11"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
...
...
@@ -1280,6 +1293,15 @@ address@1.0.3, address@^1.0.1:
resolved "https://registry.yarnpkg.com/address/-/address-1.0.3.tgz#b5f50631f8d6cec8bd20c963963afb55e06cbce9"
integrity sha512-z55ocwKBRLryBs394Sm3ushTtBeg6VAeuku7utSoSnsJKvKcnXFIyC6vh27n3rXyxSgkJBBCAvyOn7gSUcTYjg==
aes-decrypter@3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/aes-decrypter/-/aes-decrypter-3.0.0.tgz#7848a1c145b9fdbf57ae3e2b5b1bc7cf0644a8fb"
integrity sha1-eEihwUW5/b9Xrj4rWxvHzwZEqPs=
dependencies:
commander "^2.9.0"
global "^4.3.2"
pkcs7 "^1.0.2"
ajv-errors@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
...
...
@@ -2555,7 +2577,7 @@ comma-separated-tokens@^1.0.0:
resolved "https://registry.yarnpkg.com/comma-separated-tokens/-/comma-separated-tokens-1.0.6.tgz#3cd3d8adc725ab473843db338bcdfd4a7bb087bf"
integrity sha512-f20oA7jsrrmERTS70r3tmRSxR8IJV2MTN7qe6hzgX+3ARfXrdMJFvGWvWQK0xpcBurg9j9eO2MiqzZ8Y+/UPCA==
commander@*, commander@^2.11.0, commander@^2.19.0, commander@~2.20.0:
commander@*, commander@^2.11.0, commander@^2.19.0, commander@
^2.9.0, commander@
~2.20.0:
version "2.20.0"
resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
...
...
@@ -2861,6 +2883,11 @@ crypto-browserify@^3.11.0:
randombytes "^2.0.0"
randomfill "^1.0.3"
crypto-js@^3.1.9-1:
version "3.1.9-1"
resolved "https://registry.yarnpkg.com/crypto-js/-/crypto-js-3.1.9-1.tgz#fda19e761fc077e01ffbfdc6e9fdfc59e8806cd8"
integrity sha1-/aGedh/Ad+Af+/3G6f38WeiAbNg=
css-animation@1.x, css-animation@^1.3.2:
version "1.5.0"
resolved "https://registry.yarnpkg.com/css-animation/-/css-animation-1.5.0.tgz#c96b9097a5ef74a7be8480b45cc44e4ec6ca2bf5"
...
...
@@ -3391,6 +3418,11 @@ dom-serializer@0:
domelementtype "^1.3.0"
entities "^1.1.1"
dom-walk@^0.1.0:
version "0.1.1"
resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
integrity sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg=
domain-browser@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda"
...
...
@@ -3556,7 +3588,7 @@ error-ex@^1.2.0, error-ex@^1.3.1:
dependencies:
is-arrayish "^0.2.1"
es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.1, es-abstract@^1.7.0:
es-abstract@^1.11.0, es-abstract@^1.12.0, es-abstract@^1.5.
0, es-abstract@^1.5.
1, es-abstract@^1.7.0:
version "1.13.0"
resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
...
...
@@ -4237,6 +4269,13 @@ follow-redirects@^1.0.0, follow-redirects@^1.3.0:
dependencies:
debug "^3.2.6"
for-each@^0.3.3:
version "0.3.3"
resolved "https://registry.yarnpkg.com/for-each/-/for-each-0.3.3.tgz#69b447e88a0a5d32c3e7084f3f1710034b21376e"
integrity sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==
dependencies:
is-callable "^1.1.3"
for-in@^0.1.3:
version "0.1.8"
resolved "https://registry.yarnpkg.com/for-in/-/for-in-0.1.8.tgz#d8773908e31256109952b1fdb9b3fa867d2775e1"
...
...
@@ -4386,7 +4425,7 @@ fstream@^1.0.0, fstream@^1.0.2:
mkdirp ">=0.5 0"
rimraf "2"
function-bind@^1.1.1:
function-bind@^1.
0.2, function-bind@^1.
1.1:
version "1.1.1"
resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
...
...
@@ -4512,6 +4551,14 @@ global-prefix@^3.0.0:
kind-of "^6.0.2"
which "^1.3.1"
global@4.3.2, global@^4.3.0, global@^4.3.1, global@^4.3.2, global@~4.3.0:
version "4.3.2"
resolved "https://registry.yarnpkg.com/global/-/global-4.3.2.tgz#e76989268a6c74c38908b1305b10fc0e394e9d0f"
integrity sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=
dependencies:
min-document "^2.19.0"
process "~0.5.1"
globals@^11.1.0, globals@^11.7.0:
version "11.11.0"
resolved "https://registry.yarnpkg.com/globals/-/globals-11.11.0.tgz#dcf93757fa2de5486fbeed7118538adf789e9c2e"
...
...
@@ -5061,6 +5108,11 @@ indexof@0.0.1:
resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
individual@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/individual/-/individual-2.0.0.tgz#833b097dad23294e76117a98fb38e0d9ad61bb97"
integrity sha1-gzsJfa0jKU52EXqY+zjg2a1hu5c=
inflight@^1.0.4:
version "1.0.6"
resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
...
...
@@ -5208,7 +5260,7 @@ is-buffer@^2.0.0:
resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-2.0.3.tgz#4ecf3fcf749cbd1e472689e109ac66261a25e725"
integrity sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw==
is-callable@^1.1.4:
is-callable@^1.1.
3, is-callable@^1.1.
4:
version "1.1.4"
resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
...
...
@@ -5327,6 +5379,11 @@ is-fullwidth-code-point@^2.0.0:
resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
is-function@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-function/-/is-function-1.0.1.tgz#12cfb98b65b57dd3d193a3121f5f6e2f437602b5"
integrity sha1-Es+5i2W1fdPRk6MSH19uL0N2ArU=
is-generator-fn@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-generator-fn/-/is-generator-fn-1.0.0.tgz#969d49e1bb3329f6bb7f09089be26578b2ddd46a"
...
...
@@ -6114,6 +6171,11 @@ jsx-ast-utils@^2.0.1:
dependencies:
array-includes "^3.0.3"
keycode@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/keycode/-/keycode-2.2.0.tgz#3d0af56dc7b8b8e5cba8d0a97f107204eec22b04"
integrity sha1-PQr1bce4uOXLqNCpfxByBO7CKwQ=
killable@^1.0.0:
version "1.0.1"
resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
...
...
@@ -6433,6 +6495,13 @@ lru-cache@^5.1.1:
dependencies:
yallist "^3.0.2"
m3u8-parser@4.3.0:
version "4.3.0"
resolved "https://registry.yarnpkg.com/m3u8-parser/-/m3u8-parser-4.3.0.tgz#4b4e988f87b6d8b2401d209a1d17798285a9da04"
integrity sha512-bVbjuBMoVIgFL1vpXVIxjeaoB5TPDJRb0m5qiTdM738SGqv/LAmsnVVPlKjM4fulm/rr1XZsKM+owHm+zvqxYA==
dependencies:
global "^4.3.2"
make-dir@^2.0.0:
version "2.1.0"
resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
...
...
@@ -6655,6 +6724,13 @@ mimic-fn@^2.0.0:
resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
min-document@^2.19.0:
version "2.19.0"
resolved "https://registry.yarnpkg.com/min-document/-/min-document-2.19.0.tgz#7bd282e3f5842ed295bb748cdd9f1ffa2c824685"
integrity sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=
dependencies:
dom-walk "^0.1.0"
mini-css-extract-plugin@0.5.0:
version "0.5.0"
resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
...
...
@@ -6769,6 +6845,14 @@ move-concurrently@^1.0.1:
rimraf "^2.5.4"
run-queue "^1.0.3"
mpd-parser@0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/mpd-parser/-/mpd-parser-0.7.0.tgz#d36e3322579fce23d657f71a3c2f3e6cc5ce4002"
integrity sha512-nkzVIkecaDz3q7p4ToN3GR0FV2Odbh0w2sJ8ijsyw79JcBrJoUD3KHIiI8gL0hEDlex7mrVpTxXBsRHowUBmPw==
dependencies:
global "^4.3.2"
url-toolkit "^2.1.1"
ms@2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
...
...
@@ -6797,6 +6881,11 @@ mute-stream@0.0.7:
resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
mux.js@5.1.1:
version "5.1.1"
resolved "https://registry.yarnpkg.com/mux.js/-/mux.js-5.1.1.tgz#0e95f048b4ac51d413c9ddc2d78e4cefad8d06de"
integrity sha512-Mf/UYmh5b8jvUP+jmrTbETnyFZprMdbT0RxKm/lJ/4d2Q3xdc5GaHaRPI1zVV5D3+6uxArVPm78QEb1RsrmaQw==
nan@^2.10.0, nan@^2.12.1:
version "2.13.2"
resolved "https://registry.yarnpkg.com/nan/-/nan-2.13.2.tgz#f51dc7ae66ba7d5d55e1e6d4d8092e802c9aefe7"
...
...
@@ -7408,6 +7497,14 @@ parse-glob@^3.0.4:
is-extglob "^1.0.0"
is-glob "^2.0.0"
parse-headers@^2.0.0:
version "2.0.2"
resolved "https://registry.yarnpkg.com/parse-headers/-/parse-headers-2.0.2.tgz#9545e8a4c1ae5eaea7d24992bca890281ed26e34"
integrity sha512-/LypJhzFmyBIDYP9aDVgeyEb5sQfbfY5mnDq4hVhlQ69js87wXfmEI5V3xI6vvXasqebp0oCytYFLxsBVfCzSg==
dependencies:
for-each "^0.3.3"
string.prototype.trim "^1.1.2"
parse-json@^2.2.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
...
...
@@ -7563,6 +7660,11 @@ pinkie@^2.0.0:
resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870"
integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA=
pkcs7@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/pkcs7/-/pkcs7-1.0.2.tgz#b6dba527528c2942bfc122ce2dafcdb5e59074e7"
integrity sha1-ttulJ1KMKUK/wSLOLa/NteWQdOc=
pkg-dir@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-1.0.0.tgz#7a4b508a8d5bb2d629d447056ff4e9c9314cf3d4"
...
...
@@ -8296,6 +8398,11 @@ process@^0.11.10:
resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
integrity sha1-czIwDoQBYb2j5podHZGn1LwW8YI=
process@~0.5.1:
version "0.5.2"
resolved "https://registry.yarnpkg.com/process/-/process-0.5.2.tgz#1638d8a8e34c2f440a91db95ab9aeb677fc185cf"
integrity sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8=
progress@^2.0.0:
version "2.0.3"
resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
...
...
@@ -9358,6 +9465,13 @@ run-queue@^1.0.0, run-queue@^1.0.3:
dependencies:
aproba "^1.1.1"
rust-result@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/rust-result/-/rust-result-1.0.0.tgz#34c75b2e6dc39fe5875e5bdec85b5e0f91536f72"
integrity sha1-NMdbLm3Dn+WHXlveyFteD5FTb3I=
dependencies:
individual "^2.0.0"
rxjs@^6.1.0, rxjs@^6.4.0:
version "6.4.0"
resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
...
...
@@ -9370,6 +9484,13 @@ safe-buffer@5.1.2, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, s
resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
safe-json-parse@4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-4.0.0.tgz#7c0f578cfccd12d33a71c0e05413e2eca171eaac"
integrity sha1-fA9XjPzNEtM6ccDgVBPi7KFx6qw=
dependencies:
rust-result "^1.0.0"
safe-regex@^1.1.0:
version "1.1.0"
resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
...
...
@@ -9976,6 +10097,15 @@ string-width@^3.0.0:
is-fullwidth-code-point "^2.0.0"
strip-ansi "^5.1.0"
string.prototype.trim@^1.1.2:
version "1.1.2"
resolved "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.1.2.tgz#d04de2c89e137f4d7d206f086b5ed2fae6be8cea"
integrity sha1-0E3iyJ4Tf019IG8Ia17S+ua+jOo=
dependencies:
define-properties "^1.1.2"
es-abstract "^1.5.0"
function-bind "^1.0.2"
string_decoder@^1.0.0, string_decoder@^1.1.1:
version "1.2.0"
resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.2.0.tgz#fe86e738b19544afe70469243b2a1ee9240eae8d"
...
...
@@ -10391,6 +10521,11 @@ tslib@^1.9.0, tslib@^1.9.3:
resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286"
integrity sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==
tsml@1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/tsml/-/tsml-1.0.1.tgz#89f8218b9d9e257f47d7f6b56d01c5a4d2c68fc3"
integrity sha1-ifghi52eJX9H1/a1bQHFpNLGj8M=
tty-browserify@0.0.0:
version "0.0.0"
resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
...
...
@@ -10599,6 +10734,11 @@ url-parse@^1.4.3:
querystringify "^2.0.0"
requires-port "^1.0.0"
url-toolkit@^2.1.1, url-toolkit@^2.1.3:
version "2.1.6"
resolved "https://registry.yarnpkg.com/url-toolkit/-/url-toolkit-2.1.6.tgz#6d03246499e519aad224c44044a4ae20544154f2"
integrity sha512-UaZ2+50am4HwrV2crR/JAf63Q4VvPYphe63WGeoJxeu8gmOm0qxPt+KsukfakPNrX9aymGNEkkaoICwn+OuvBw==
url@^0.11.0:
version "0.11.0"
resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
...
...
@@ -10722,6 +10862,33 @@ vfile@^4.0.0:
unist-util-stringify-position "^2.0.0"
vfile-message "^2.0.0"
"video.js@^6.8.0 || ^7.0.0", video.js@^7.5.4:
version "7.5.4"
resolved "https://registry.yarnpkg.com/video.js/-/video.js-7.5.4.tgz#7c76d44123be48f98333ab50b19d7683bfa8aba6"
integrity sha512-+U3FyLVFbnJdEC6TVMv8U75c8VM00vmVY8TSfFthnvo7/6rz3LFg2Pd3TTGNbV2pEmBhkLLYO+dvmqMNUyc2ZA==
dependencies:
"@babel/runtime" "^7.2.0"
"@videojs/http-streaming" "1.9.3"
global "4.3.2"
keycode "^2.2.0"
safe-json-parse "4.0.0"
tsml "1.0.1"
videojs-font "3.1.0"
videojs-vtt.js "0.14.1"
xhr "2.4.0"
videojs-font@3.1.0:
version "3.1.0"
resolved "https://registry.yarnpkg.com/videojs-font/-/videojs-font-3.1.0.tgz#ac33be9b517fe19299f61cccd2b3c7d75a1c6960"
integrity sha512-rxB68SVgbHD+kSwoNWNCHicKJuR2ga3bGfvGxmB+8fupsiLbnyCwTBVtrZUq4bZnD64mrKP1DxHiutxwrs59pQ==
videojs-vtt.js@0.14.1:
version "0.14.1"
resolved "https://registry.yarnpkg.com/videojs-vtt.js/-/videojs-vtt.js-0.14.1.tgz#da583eb1fc9c81c826a9432b706040e8dea49911"
integrity sha512-YxOiywx6N9t3J5nqsE5WN2Sw4CSqVe3zV+AZm2T4syOc2buNJaD6ZoexSdeszx2sHLU/RRo2r4BJAXFDQ7Qo2Q==
dependencies:
global "^4.3.1"
vm-browserify@0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73"
...
...
@@ -11149,6 +11316,16 @@ x-is-string@^0.1.0:
resolved "https://registry.yarnpkg.com/x-is-string/-/x-is-string-0.1.0.tgz#474b50865af3a49a9c4657f05acd145458f77d82"
integrity sha1-R0tQhlrzpJqcRlfwWs0UVFj3fYI=
xhr@2.4.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"
integrity sha1-4W5mpF+GmGHu76tBbV7/ci3ECZM=
dependencies:
global "~4.3.0"
is-function "^1.0.1"
parse-headers "^2.0.0"
xtend "^4.0.0"
xml-name-validator@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/xml-name-validator/-/xml-name-validator-3.0.0.tgz#6ae73e06de4d8c6e47f9fb181f78d648ad457c6a"
...
...
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