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
e2ecada9
Commit
e2ecada9
authored
Jun 13, 2019
by
wangshuo
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of gitlab.julyedu.com:baiguangyao/mr-julyedu
parents
6bac8218
904554c4
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
371 additions
and
119 deletions
+371
-119
src/assets/css/variable.scss
+2
-1
src/common/Course/index.js
+3
-2
src/common/VList/index.js
+4
-1
src/components/Index/index.js
+14
-8
src/components/classify/courselist.js
+12
-3
src/components/classify/index.js
+9
-5
src/components/classify/index.scss
+62
-57
src/components/detail/btnstatus/index.js
+1
-1
src/components/my/index.js
+47
-35
src/components/myOrders/index.js
+2
-2
src/components/preferential/index.js
+14
-1
src/components/preferential/index.scss
+2
-1
src/components/purchased/index.js
+90
-0
src/components/purchased/index.scss
+100
-0
src/components/shopCart/cartList.js
+1
-1
src/router/router-config.js
+8
-1
No files found.
src/assets/css/variable.scss
View file @
e2ecada9
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
$active
:
#09f
;
$active
:
#09f
;
$white
:
#fff
;
$white
:
#fff
;
$black
:
#000
;
$black
:
#000
;
$red
:
#
f
21
;
$red
:
#
FF21
21
;
$redprice
:
#ff3131
;
$redprice
:
#ff3131
;
$color_333
:
#333
;
$color_333
:
#333
;
$color_555
:
#555
;
$color_555
:
#555
;
...
@@ -72,6 +72,7 @@ $bg_F4AAA7: #F4AAA7;
...
@@ -72,6 +72,7 @@ $bg_F4AAA7: #F4AAA7;
$bg_E02E24
:
#E02E24
;
$bg_E02E24
:
#E02E24
;
$bg_007FD0
:
#007FD0
;
$bg_007FD0
:
#007FD0
;
$bg_FF0000
:
#FF0000
;
$bg_FF0000
:
#FF0000
;
$bg_FFF4CE
:
#FFF4CE
;
/*
/*
...
...
src/common/Course/index.js
View file @
e2ecada9
import
React
from
'react'
;
import
React
from
'react'
;
import
'./course.scss'
import
'./course.scss'
import
{
Link
}
from
"react-router-dom"
;
const
Course
=
(
props
)
=>
{
const
Course
=
(
props
)
=>
{
return
(
return
(
<
li
className
=
'course-item'
>
<
li
className
=
'course-item'
>
{
props
.
top
}
{
props
.
top
}
<
a
href
=
"/#"
>
<
Link
to
=
{
`/detail?id=
${
props
.
id
}
`
}
>
<
img
src
=
{
props
.
img
}
alt
=
""
/>
<
img
src
=
{
props
.
img
}
alt
=
""
/>
<
p
className
=
"course-title text-overflow-2"
>
{
props
.
title
}
<
/p
>
<
p
className
=
"course-title text-overflow-2"
>
{
props
.
title
}
<
/p
>
<
/
a
>
<
/
Link
>
{
props
.
bottom
}
{
props
.
bottom
}
<
/li
>
<
/li
>
);
);
...
...
src/common/VList/index.js
View file @
e2ecada9
import
React
from
'react'
;
import
React
from
'react'
;
import
'./index.scss'
import
'./index.scss'
import
{
Link
}
from
'react-router-dom'
const
VList
=
(
props
)
=>
{
const
VList
=
(
props
)
=>
{
return
(
return
(
...
@@ -7,7 +8,9 @@ const VList = (props) => {
...
@@ -7,7 +8,9 @@ const VList = (props) => {
<
div
className
=
"content"
>
<
div
className
=
"content"
>
<
div
className
=
"cover"
>
<
div
className
=
"cover"
>
{
props
.
status
}
{
props
.
status
}
<
img
src
=
{
props
.
img
}
alt
=
""
/>
<
Link
to
=
{
`/detail?id=
${
props
.
id
}
`
}
>
<
img
src
=
{
props
.
img
}
alt
=
""
/>
<
/Link
>
<
/div
>
<
/div
>
{
props
.
info
}
{
props
.
info
}
<
/div
>
<
/div
>
...
...
src/components/Index/index.js
View file @
e2ecada9
...
@@ -8,6 +8,7 @@ import LazyLoad from 'react-lazy-load'
...
@@ -8,6 +8,7 @@ import LazyLoad from 'react-lazy-load'
import
{
http
,
api
}
from
'@/utils'
import
{
http
,
api
}
from
'@/utils'
import
LiveRoom
from
'./liveRoom'
import
LiveRoom
from
'./liveRoom'
import
{
Link
}
from
"react-router-dom"
;
import
{
Link
}
from
"react-router-dom"
;
import
{
Toast
}
from
'antd-mobile'
const
animateTypes
=
Swiper
.
animateTypes
const
animateTypes
=
Swiper
.
animateTypes
...
@@ -26,27 +27,27 @@ class Index extends Component {
...
@@ -26,27 +27,27 @@ class Index extends Component {
{
{
'src'
:
require
(
'./image/freeclass_icon.png'
),
'src'
:
require
(
'./image/freeclass_icon.png'
),
'name'
:
'公开课'
,
'name'
:
'公开课'
,
'href'
:
'
'
'href'
:
'/study/free-course
'
},
},
{
{
'src'
:
require
(
'./image/jingpin_icon.png'
),
'src'
:
require
(
'./image/jingpin_icon.png'
),
'name'
:
'精品特惠'
,
'name'
:
'精品特惠'
,
'href'
:
'/preferential'
'href'
:
'/preferential'
},
},
{
{
'src'
:
require
(
'./image/zjxj_icon.png'
),
'src'
:
require
(
'./image/zjxj_icon.png'
),
'name'
:
'赚奖学金'
,
'name'
:
'赚奖学金'
,
'href'
:
'
'
'href'
:
'/scholarship
'
},
},
{
{
'src'
:
require
(
'./image/mryt_icon.png'
),
'src'
:
require
(
'./image/mryt_icon.png'
),
'name'
:
'每日一题'
,
'name'
:
'每日一题'
,
'href'
:
'
'
'href'
:
'/examination
'
},
},
{
{
'src'
:
require
(
'./image/qynx_icon.png'
),
'src'
:
require
(
'./image/qynx_icon.png'
),
'name'
:
'企业内训'
,
'name'
:
'企业内训'
,
'href'
:
'
'
'href'
:
'http://m-active.julyedu.com
'
}
}
]
]
}
}
...
@@ -61,7 +62,10 @@ class Index extends Component {
...
@@ -61,7 +62,10 @@ class Index extends Component {
lives
:
res
.
data
.
data
.
lives
,
lives
:
res
.
data
.
data
.
lives
,
modules
:
res
.
data
.
data
.
modules
modules
:
res
.
data
.
data
.
modules
})
})
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
)
}
}
})
})
}
}
...
@@ -168,6 +172,7 @@ function TopSwiper({bannerList}) {
...
@@ -168,6 +172,7 @@ function TopSwiper({bannerList}) {
<
/Swiper
>
<
/Swiper
>
)
)
}
}
function
CourseList
({
modules
})
{
function
CourseList
({
modules
})
{
let
isOdd
=
modules
.
list
.
length
%
2
===
0
let
isOdd
=
modules
.
list
.
length
%
2
===
0
let
filterList
=
isOdd
?
modules
.
list
:
modules
.
list
.
slice
(
1
)
let
filterList
=
isOdd
?
modules
.
list
:
modules
.
list
.
slice
(
1
)
...
@@ -176,11 +181,11 @@ function CourseList({modules}) {
...
@@ -176,11 +181,11 @@ function CourseList({modules}) {
<
h2
className
=
"title"
>
{
modules
.
name
}
<
/h2
>
<
h2
className
=
"title"
>
{
modules
.
name
}
<
/h2
>
{
{
modules
.
show_more
===
1
&&
modules
.
show_more
===
1
&&
<
a
className
=
"more"
href
=
"/#"
>
更多
><
/a
>
<
a
className
=
"more"
href
=
'/classify'
>
更多
><
/a
>
}
}
{
{
modules
.
show_more
===
2
&&
modules
.
show_more
===
2
&&
<
a
className
=
"more"
href
=
"/#"
>
更多
><
/a
>
<
a
className
=
"more"
href
=
{
modules
.
more_page
}
>
更多
><
/a
>
}
}
<
LazyLoad
offset
=
{
50
}
>
<
LazyLoad
offset
=
{
50
}
>
<
ul
className
=
'course-detail'
>
<
ul
className
=
'course-detail'
>
...
@@ -215,7 +220,8 @@ function CourseList({modules}) {
...
@@ -215,7 +220,8 @@ function CourseList({modules}) {
<
/div
>
<
/div
>
)
)
return
(
return
(
<
Course
key
=
{
index
}
top
=
{
top
}
data
=
{
item
}
bottom
=
{
bottom
}
img
=
{
item
.
course_img_small
}
title
=
{
item
.
course_title
}
><
/Course
>
<
Course
key
=
{
index
}
top
=
{
top
}
data
=
{
item
}
bottom
=
{
bottom
}
img
=
{
item
.
course_img_small
}
title
=
{
item
.
course_title
}
id
=
{
item
.
course_id
}
><
/Course
>
)
)
})
})
}
}
...
...
src/components/classify/courselist.js
View file @
e2ecada9
...
@@ -4,6 +4,8 @@ import {Tabs, WhiteSpace} from 'antd-mobile';
...
@@ -4,6 +4,8 @@ import {Tabs, WhiteSpace} from 'antd-mobile';
import
'./courselist.scss'
;
import
'./courselist.scss'
;
import
HeaderSearch
from
'../../common/HeaderSearch/index'
import
HeaderSearch
from
'../../common/HeaderSearch/index'
import
{
http
,
api
,
getParam
}
from
"@/utils"
;
import
{
http
,
api
,
getParam
}
from
"@/utils"
;
import
{
Toast
}
from
'antd-mobile'
import
{
Link
}
from
'react-router-dom'
class
Classify
extends
Component
{
class
Classify
extends
Component
{
...
@@ -47,7 +49,10 @@ class Classify extends Component {
...
@@ -47,7 +49,10 @@ class Classify extends Component {
allClass
:
arr3
allClass
:
arr3
})
})
}
}
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
)
}
}
})
})
.
catch
(
err
=>
{
.
catch
(
err
=>
{
console
.
log
(
err
)
console
.
log
(
err
)
...
@@ -127,15 +132,19 @@ class Classify extends Component {
...
@@ -127,15 +132,19 @@ class Classify extends Component {
{
this
.
state
.
data
&&
this
.
state
.
data
.
length
>
0
&&
this
.
state
.
data
.
map
((
item
,
index
)
=>
{
{
this
.
state
.
data
&&
this
.
state
.
data
.
length
>
0
&&
this
.
state
.
data
.
map
((
item
,
index
)
=>
{
const
Info
=
(
const
Info
=
(
<
div
className
=
"info"
>
<
div
className
=
"info"
>
<
p
className
=
'title'
>
{
item
.
course_title
}
<
/p
>
<
p
className
=
'title'
>
<
Link
to
=
{
`/detail?id=
${
item
.
course_id
}
`
}
>
{
item
.
course_title
}
<
/Link
>
<
/p
>
<
p
className
=
'contact text-overflow-2'
>
{
item
.
desc
}
<
/p
>
<
p
className
=
'contact text-overflow-2'
>
{
item
.
desc
}
<
/p
>
<
div
className
=
'des'
>
<
div
className
=
'des'
>
{
item
.
is_buy
===
0
&&
<
p
className
=
"course-price"
>
{
!
item
.
is_buy
&&
<
p
className
=
"course-price"
>
<
span
className
=
"new"
>
¥
{
item
.
price0
}
<
/span
>
<
span
className
=
"new"
>
¥
{
item
.
price0
}
<
/span
>
<
span
className
=
"old"
>
¥
{
item
.
price1
}
<
/span
>
<
span
className
=
"old"
>
¥
{
item
.
price1
}
<
/span
>
<
/p
>
<
/p
>
}
}
{
item
.
is_buy
===
1
&&
{
item
.
is_buy
&&
<
a
href
=
"/#"
className
=
"isbuy"
>
已购买
<
/a
>
<
a
href
=
"/#"
className
=
"isbuy"
>
已购买
<
/a
>
}
}
<
/div
>
<
/div
>
...
...
src/components/classify/index.js
View file @
e2ecada9
...
@@ -2,7 +2,8 @@ import React, {Component} from 'react';
...
@@ -2,7 +2,8 @@ import React, {Component} from 'react';
import
{
WithTab
}
from
'@/HOCs'
import
{
WithTab
}
from
'@/HOCs'
import
'./index.scss'
;
import
'./index.scss'
;
import
{
http
,
api
}
from
"@/utils"
;
import
{
http
,
api
}
from
"@/utils"
;
import
{
Link
}
from
'react-router-dom'
import
{
Link
}
from
'react-router-dom'
import
{
Toast
}
from
'antd-mobile'
class
Classify
extends
Component
{
class
Classify
extends
Component
{
constructor
(
props
)
{
constructor
(
props
)
{
...
@@ -34,8 +35,10 @@ class Classify extends Component {
...
@@ -34,8 +35,10 @@ class Classify extends Component {
special
:
res
.
data
.
data
.
special
[
2
],
special
:
res
.
data
.
data
.
special
[
2
],
})
})
}
}
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
)
}
}
})
})
}
}
...
@@ -43,9 +46,9 @@ class Classify extends Component {
...
@@ -43,9 +46,9 @@ class Classify extends Component {
return
(
return
(
<
div
className
=
'class-box'
>
<
div
className
=
'class-box'
>
<
div
className
=
"class-title"
>
分类
<
/div
>
<
div
className
=
"class-title"
>
分类
<
/div
>
<
ClassCourseBox
data
=
{
this
.
state
.
camp
.
list
}
title
=
{
this
.
state
.
camp
.
name
}
type
=
{
1
}
/
>
<
ClassCourseBox
data
=
{
this
.
state
.
camp
.
list
}
title
=
{
this
.
state
.
camp
.
name
}
type
=
{
1
}
/
>
<
ClassCourseBox
data
=
{
this
.
state
.
employment
.
list
}
title
=
{
this
.
state
.
employment
.
name
}
type
=
{
1
}
/
>
<
ClassCourseBox
data
=
{
this
.
state
.
employment
.
list
}
title
=
{
this
.
state
.
employment
.
name
}
type
=
{
1
}
/
>
<
ClassCourseBox
data
=
{
this
.
state
.
basics
.
list
}
title
=
{
this
.
state
.
basics
.
name
}
type
=
{
2
}
/
>
<
ClassCourseBox
data
=
{
this
.
state
.
basics
.
list
}
title
=
{
this
.
state
.
basics
.
name
}
type
=
{
2
}
/
>
<
ClassCourseBox
data
=
{
this
.
state
.
advanced
.
list
}
title
=
{
this
.
state
.
advanced
.
name
}
type
=
{
2
}
/
>
<
ClassCourseBox
data
=
{
this
.
state
.
advanced
.
list
}
title
=
{
this
.
state
.
advanced
.
name
}
type
=
{
2
}
/
>
<
div
className
=
"vip"
>
<
div
className
=
"vip"
>
{
this
.
state
.
special
.
list
&&
this
.
state
.
special
.
list
.
length
>
0
&&
this
.
state
.
special
.
list
.
map
((
item
,
index
)
=>
{
{
this
.
state
.
special
.
list
&&
this
.
state
.
special
.
list
.
length
>
0
&&
this
.
state
.
special
.
list
.
map
((
item
,
index
)
=>
{
...
@@ -69,7 +72,8 @@ function ClassCourseA({data}) {
...
@@ -69,7 +72,8 @@ function ClassCourseA({data}) {
{
{
data
&&
data
.
length
>
0
&&
data
.
map
((
item
,
index
)
=>
{
data
&&
data
.
length
>
0
&&
data
.
map
((
item
,
index
)
=>
{
return
(
return
(
<
Link
to
=
{
`/detail?id=
${
item
.
course_id
}
`
}
key
=
{
index
}
className
=
'item-banner'
><
img
src
=
{
item
.
course_img
}
alt
=
""
/><
/Link
>
<
Link
to
=
{
`/detail?id=
${
item
.
course_id
}
`
}
key
=
{
index
}
className
=
'item-banner'
><
img
src
=
{
item
.
course_img
}
alt
=
""
/><
/Link
>
)
)
})
})
}
}
...
...
src/components/classify/index.scss
View file @
e2ecada9
.class-box
{
.class-box
{
background-color
:
$bg_fff
;
background-color
:
$bg_fff
;
.class-title
{
.class-title
{
width
:
100%
;
width
:
100%
;
height
:
44px
;
height
:
44px
;
line-height
:
44px
;
line-height
:
44px
;
text-align
:
center
;
text-align
:
center
;
background-color
:
#F7F9FC
;
background-color
:
#F7F9FC
;
font-size
:
16px
;
font-size
:
16px
;
color
:
$color_333
;
}
.class-course
{
width
:
100%
;
margin-top
:
20px
;
padding
:
0
15px
;
.course-items-title
{
font-size
:
14px
;
color
:
$color_333
;
color
:
$color_333
;
img
{
margin-right
:
8px
;
width
:
10px
;
height
:
11px
;
}
}
}
.
items-box
{
.
class-course
{
display
:
flex
;
width
:
100%
;
justify-content
:
space-between
;
margin-top
:
20px
;
flex-wrap
:
wrap
;
padding
:
0
15px
;
.item-banner
{
.course-items-title
{
display
:
inline-block
;
font-size
:
14px
;
width
:
30
.5%
;
color
:
$color_333
;
height
:
76px
;
margin-top
:
10px
;
img
{
img
{
width
:
100%
;
margin-right
:
8px
;
height
:
100%
;
width
:
10px
;
border-radius
:
3
px
;
height
:
11
px
;
}
}
}
}
.item-label
{
.items-box
{
display
:
inline-block
;
display
:
flex
;
width
:
30
.5%
;
flex-wrap
:
wrap
;
height
:
30px
;
line-height
:
30px
;
.item-banner
{
text-align
:
center
;
display
:
inline-block
;
background-color
:
$bg_f4f4f4
;
width
:
30
.5%
;
border-radius
:
15px
;
height
:
76px
;
margin-top
:
15px
;
margin-top
:
10px
;
margin-bottom
:
-5px
;
img
{
width
:
100%
;
height
:
100%
;
border-radius
:
3px
;
}
}
.item-label
{
display
:
inline-block
;
width
:
30
.5%
;
height
:
30px
;
line-height
:
30px
;
text-align
:
center
;
background-color
:
$bg_f4f4f4
;
border-radius
:
15px
;
margin-top
:
15px
;
margin-bottom
:
-5px
;
margin-right
:
12px
;
}
:nth-of-type
(
3n
)
{
margin-right
:
0
;
}
}
}
}
}
}
.vip
{
width
:
100%
;
height
:
130px
;
border-radius
:
5px
;
margin-top
:
20px
;
margin-bottom
:
50px
;
padding
:
0
15px
;
img
{
.vip
{
width
:
100%
;
width
:
100%
;
height
:
1
06
px
;
height
:
1
30
px
;
border-radius
:
5px
;
border-radius
:
5px
;
margin-top
:
20px
;
margin-bottom
:
50px
;
padding
:
0
15px
;
img
{
width
:
100%
;
height
:
106px
;
border-radius
:
5px
;
}
}
}
}
}
}
src/components/detail/btnstatus/index.js
View file @
e2ecada9
...
@@ -135,7 +135,7 @@ class BtnStatus extends Component {
...
@@ -135,7 +135,7 @@ class BtnStatus extends Component {
{
/*特殊课程*/
}
{
/*特殊课程*/
}
{
{
info
.
isbaoming
===
0
&&
this
.
state
.
isbuy
===
2
0
&&
<
div
className
=
'btns-box'
>
<
div
className
=
'btns-box'
>
<
a
className
=
'consult-l'
href
=
"https://q.url.cn/AB8aue?_type=wpa&qidian=true"
>
<
a
className
=
'consult-l'
href
=
"https://q.url.cn/AB8aue?_type=wpa&qidian=true"
>
<
i
className
=
'iconfont iconerji'
><
/i
>
<
i
className
=
'iconfont iconerji'
><
/i
>
...
...
src/components/my/index.js
View file @
e2ecada9
import
React
,
{
PureComponent
}
from
'react'
;
import
React
,
{
PureComponent
}
from
'react'
;
import
{
Flex
,
WhiteSpace
,
NavBar
,
List
}
from
'antd-mobile'
;
import
{
Flex
,
WhiteSpace
,
NavBar
,
List
}
from
'antd-mobile'
;
import
'./index.scss'
;
import
'./index.scss'
;
import
Avatar
from
'./image/avatar.png'
;
import
Avatar
from
'./image/avatar.png'
;
import
Vip
from
'./image/vip.png'
;
import
Vip
from
'./image/vip.png'
;
import
{
WithTab
}
from
'@/HOCs'
import
{
WithTab
}
from
'@/HOCs'
import
{
Link
}
from
"react-router-dom"
;
import
{
Link
}
from
"react-router-dom"
;
// import UnVip from './image/unVIP.png';
// import UnVip from './image/unVIP.png';
...
@@ -12,7 +12,12 @@ const Item = List.Item;
...
@@ -12,7 +12,12 @@ const Item = List.Item;
const
Brief
=
Item
.
Brief
;
const
Brief
=
Item
.
Brief
;
class
My
extends
PureComponent
{
class
My
extends
PureComponent
{
constructor
(
props
)
{
super
(
props
)
this
.
state
=
{
data
:
[]
}
}
render
()
{
render
()
{
let
{
history
}
=
this
.
props
;
let
{
history
}
=
this
.
props
;
return
(
return
(
...
@@ -26,10 +31,10 @@ class My extends PureComponent {
...
@@ -26,10 +31,10 @@ class My extends PureComponent {
我的
我的
<
/NavBar
>
<
/NavBar
>
{
/* <List className="my-list">
{
/* <List className="my-list">
<Item
<Item
className="avatar-wrap"
className="avatar-wrap"
arrow="horizontal"
arrow="horizontal"
multipleLine
multipleLine
thumb={Avatar}
thumb={Avatar}
onClick={() => { }}>
onClick={() => { }}>
<Brief>点击登录</Brief>
<Brief>点击登录</Brief>
...
@@ -61,22 +66,26 @@ class My extends PureComponent {
...
@@ -61,22 +66,26 @@ class My extends PureComponent {
<
i
className
=
"iconfont iconiconfront-27"
><
/i
>
<
i
className
=
"iconfont iconiconfront-27"
><
/i
>
已购课程
已购课程
<
/Item
>
<
/Item
>
<
Item
<
Link
to
=
'/shopcart'
>
arrow
=
"horizontal"
<
Item
onClick
=
{()
=>
{
arrow
=
"horizontal"
}}
onClick
=
{()
=>
{
>
}}
<
i
className
=
"iconfont icongouwuche"
><
/i
>
>
购物车
<
i
className
=
"iconfont icongouwuche"
><
/i
>
<
/Item
>
购物车
<
Item
<
/Item
>
arrow
=
"horizontal"
<
/Link
>
onClick
=
{()
=>
{
<
Link
to
=
'/myorders'
>
}}
<
Item
>
arrow
=
"horizontal"
<
i
className
=
"iconfont iconiconfront-24"
><
/i
>
onClick
=
{()
=>
{
课程订单
}}
<
/Item
>
>
<
i
className
=
"iconfont iconiconfront-24"
><
/i
>
课程订单
<
/Item
>
<
/Link
>
<
Link
to
=
{{
<
Link
to
=
{{
pathname
:
'/coupons'
,
pathname
:
'/coupons'
,
state
:
{
state
:
{
...
@@ -91,17 +100,20 @@ class My extends PureComponent {
...
@@ -91,17 +100,20 @@ class My extends PureComponent {
<
/Item
>
<
/Item
>
<
/Link
>
<
/Link
>
<
/List
>
<
List
renderHeader
=
{()
=>
''
}
>
<
Item
arrow
=
"horizontal"
onClick
=
{()
=>
{
history
.
push
(
'/scholarship'
)
}}
>
<
i
className
=
"iconfont iconiconfront-51"
><
/i
>
赚奖学金
<
/Item
>
<
/List
>
<
/List
>
<
Link
to
=
'/scholarship'
>
<
List
renderHeader
=
{()
=>
''
}
>
<
Item
arrow
=
"horizontal"
onClick
=
{()
=>
{
}}
>
<
i
className
=
"iconfont iconiconfront-51"
><
/i
>
赚奖学金
<
/Item
>
<
/List
>
<
/Link
>
<
/Flex.Item
>
<
/Flex.Item
>
<
/Flex
>
<
/Flex
>
<
WhiteSpace
size
=
"lg"
/>
<
WhiteSpace
size
=
"lg"
/>
...
...
src/components/myOrders/index.js
View file @
e2ecada9
...
@@ -44,7 +44,7 @@ class MyOrders extends Component {
...
@@ -44,7 +44,7 @@ class MyOrders extends Component {
let
data
=
{
let
data
=
{
order_id
:
oid
order_id
:
oid
}
}
http
.
post
(
`
${
api
.
home
}
/m/
live/free_list
`
,
data
).
then
((
res
)
=>
{
http
.
post
(
`
${
api
.
home
}
/m/
cancel_order
`
,
data
).
then
((
res
)
=>
{
if
(
res
.
data
.
code
===
200
)
{
if
(
res
.
data
.
code
===
200
)
{
this
.
getList
()
this
.
getList
()
}
else
{
}
else
{
...
@@ -74,7 +74,7 @@ class MyOrders extends Component {
...
@@ -74,7 +74,7 @@ class MyOrders extends Component {
<
p
className
=
'order-title text-overflow-one'
>
<
p
className
=
'order-title text-overflow-one'
>
<
Link
to
=
{
`/detail?id=
${
item
.
course_id
}
`
}
>
{
item
.
course_title
}
<
/Link
>
<
Link
to
=
{
`/detail?id=
${
item
.
course_id
}
`
}
>
{
item
.
course_title
}
<
/Link
>
<
/p
>
<
/p
>
<
p
className
=
'order-content text-overflow-2'
>
item
.
simpledescription
<
/p
>
<
p
className
=
'order-content text-overflow-2'
>
{
item
.
description
}
<
/p
>
<
p
className
=
'order-des'
>
<
p
className
=
'order-des'
>
<
span
className
=
'order-newprice'
>
¥
{
item
.
pay_amount
}
<
/span
>
<
span
className
=
'order-newprice'
>
¥
{
item
.
pay_amount
}
<
/span
>
<
span
className
=
'order-price'
>
¥
{
item
.
price0
}
<
/span
>
<
span
className
=
'order-price'
>
¥
{
item
.
price0
}
<
/span
>
...
...
src/components/preferential/index.js
View file @
e2ecada9
...
@@ -4,6 +4,8 @@ import {Tabs, WhiteSpace} from 'antd-mobile'
...
@@ -4,6 +4,8 @@ import {Tabs, WhiteSpace} from 'antd-mobile'
import
'./index.scss'
import
'./index.scss'
import
HeaderSearch
from
'../../common/HeaderSearch/index'
import
HeaderSearch
from
'../../common/HeaderSearch/index'
import
{
http
,
api
}
from
"@/utils"
import
{
http
,
api
}
from
"@/utils"
import
{
Link
}
from
'react-router-dom'
import
{
Toast
}
from
'antd-mobile'
class
Preferential
extends
Component
{
class
Preferential
extends
Component
{
constructor
(
props
)
{
constructor
(
props
)
{
...
@@ -25,7 +27,10 @@ class Preferential extends Component {
...
@@ -25,7 +27,10 @@ class Preferential extends Component {
this
.
setState
({
this
.
setState
({
dataList
:
res
.
data
.
data
dataList
:
res
.
data
.
data
})
})
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
)
}
}
})
})
}
}
// 砍价专区
// 砍价专区
...
@@ -35,6 +40,8 @@ class Preferential extends Component {
...
@@ -35,6 +40,8 @@ class Preferential extends Component {
this
.
setState
({
this
.
setState
({
dataList
:
res
.
data
.
data
dataList
:
res
.
data
.
data
})
})
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
)
}
}
})
})
}
}
...
@@ -45,6 +52,8 @@ class Preferential extends Component {
...
@@ -45,6 +52,8 @@ class Preferential extends Component {
this
.
setState
({
this
.
setState
({
dataList
:
res
.
data
.
data
dataList
:
res
.
data
.
data
})
})
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
)
}
}
})
})
}
}
...
@@ -90,7 +99,11 @@ class Preferential extends Component {
...
@@ -90,7 +99,11 @@ class Preferential extends Component {
{
this
.
state
.
dataList
.
map
((
item
,
index
)
=>
{
{
this
.
state
.
dataList
.
map
((
item
,
index
)
=>
{
const
Info
=
(
const
Info
=
(
<
div
className
=
"info"
>
<
div
className
=
"info"
>
<
p
className
=
'title'
>
{
item
.
course_title
}
<
/p
>
<
p
className
=
'title'
>
<
Link
to
=
{
`/detail?id=
${
item
.
course_id
}
`
}
>
{
item
.
course_title
}
<
/Link
>
<
/p
>
<
p
className
=
'contact text-overflow-2'
>
{
item
.
course_desc
}
<
/p
>
<
p
className
=
'contact text-overflow-2'
>
{
item
.
course_desc
}
<
/p
>
<
div
className
=
'des'
>
<
div
className
=
'des'
>
{
item
.
is_buy
&&
{
item
.
is_buy
&&
...
...
src/components/preferential/index.scss
View file @
e2ecada9
...
@@ -22,7 +22,6 @@
...
@@ -22,7 +22,6 @@
.course-status
{
.course-status
{
background-color
:
rgba
(
224
,
46
,
36
,
0
.6
);
background-color
:
rgba
(
224
,
46
,
36
,
0
.6
);
}
}
}
}
}
}
...
@@ -38,6 +37,8 @@
...
@@ -38,6 +37,8 @@
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
white-space
:
nowrap
;
height
:
16px
;
line-height
:
16px
;
}
}
.contact
{
.contact
{
...
...
src/components/purchased/index.js
0 → 100644
View file @
e2ecada9
import
React
,
{
Component
}
from
'react'
;
import
'./index.scss'
;
import
{
HeaderBar
}
from
'../../common'
import
{
VList
}
from
'../../common'
import
{
http
,
api
}
from
"@/utils"
;
import
{
Link
}
from
'react-router-dom'
import
{
Toast
}
from
'antd-mobile'
import
{
connect
}
from
"react-redux"
;
class
Purchased
extends
Component
{
constructor
(
props
)
{
super
(
props
)
this
.
state
=
{
data
:
[]
}
}
componentDidMount
()
{
this
.
getList
()
}
componentDidUpdate
(
prevProps
,
prevState
)
{
const
{
user
}
=
this
.
props
console
.
log
(
user
&&
user
.
data
&&
user
.
data
.
uid
);
}
// 获取订单
getList
=
()
=>
{
http
.
get
(
`
${
api
.
home
}
/m/my/courses`
,).
then
((
res
)
=>
{
if
(
res
.
data
.
code
===
200
)
{
this
.
setState
({
data
:
res
.
data
.
data
})
}
else
{
Toast
.
info
(
res
.
data
.
msg
,
2
);
}
})
}
render
()
{
const
{
user
}
=
this
.
props
const
uid
=
user
&&
user
.
data
&&
user
.
data
.
uid
return
(
<
div
className
=
'purchased-box'
>
<
HeaderBar
title
=
{
'已购课程'
}
><
/HeaderBar
>
{
this
.
state
.
data
&&
this
.
state
.
data
.
length
>
0
?
<
div
className
=
"purchased-body"
>
<
div
className
=
'tip'
>
加群请备注您的学号:
{
uid
}
<
/div
>
{
this
.
state
.
data
.
map
((
item
,
index
)
=>
{
const
Info
=
(
<
div
className
=
"info"
>
<
p
className
=
'title'
>
<
Link
to
=
{
`/detail?id=
${
item
.
course_id
}
`
}
>
{
item
.
course_title
}
<
/Link
>
<
/p
>
<
p
className
=
'contact text-overflow-2'
>
{
item
.
simpledescription
}
<
/p
>
<
div
className
=
'des'
>
QQ
群:
{
item
.
course_qq
}
<
/div
>
<
/div
>
)
return
(
<
VList
key
=
{
index
}
img
=
{
item
.
image_name
}
id
=
{
item
.
course_id
}
info
=
{
Info
}
><
/VList
>
)
})
}
<
/div
>
:
<
div
className
=
"cart-tip"
>
<
p
><
i
className
=
'iconfont iconfridge'
><
/i></
p
>
<
p
className
=
'cart-mess'
>
您还没有课程哦,快去逛逛吧
~<
/p
>
<
Link
to
=
'/classify'
>
去逛逛
<
/Link
>
<
/div
>
}
<
/div
>
)
}
}
export
default
connect
(
state
=>
({
user
:
state
.
user
}),
null
)(
Purchased
)
src/components/purchased/index.scss
0 → 100644
View file @
e2ecada9
.purchased-box
{
width
:
100%
;
height
:
100%
;
background-color
:
$bg_f5f5f5
;
.tip
{
width
:
100%
;
height
:
30px
;
line-height
:
30px
;
font-size
:
12px
;
color
:
$color_333
;
text-align
:
center
;
background-color
:
$bg_FFF4CE
;
margin-bottom
:
10px
;
}
.purchased-body
{
background-color
:
$bg_fff
;
}
.v-list-item
{
background-color
:
#fff
;
.content
{
padding-bottom
:
10px
;
border-bottom
:
1px
solid
#e7eaf1
;
.cover
{
flex
:
inherit
;
width
:
42
.2%
;
img
{
width
:
100%
;
}
}
}
.info
{
width
:
52
.3%
;
position
:
relative
;
display
:
block
;
.title
{
font-size
:
16px
;
color
:
$color_333
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
white-space
:
nowrap
;
height
:
16px
;
line-height
:
16px
;
}
.contact
{
font-size
:
14px
;
color
:
$color_666
;
margin-top
:
14px
;
}
.des
{
position
:
absolute
;
bottom
:
5px
;
color
:
$red
;
font-size
:
14px
;
height
:
14px
;
line-height
:
14px
;
}
}
}
.cart-tip
{
color
:
#555
;
margin-top
:
140px
;
text-align
:
center
;
.iconfridge
{
font-size
:
21px
;
}
.cart-mess
{
font-size
:
12px
;
color
:
$color_666
;
}
a
{
display
:
inline-block
;
width
:
130px
;
height
:
30px
;
border
:
1px
solid
$bg_active
;
border-radius
:
15px
;
font-size
:
16px
;
margin-top
:
30px
;
color
:
$active
;
text-align
:
center
;
line-height
:
28px
;
}
}
}
\ No newline at end of file
src/components/shopCart/cartList.js
View file @
e2ecada9
...
@@ -27,7 +27,7 @@ class cartList extends Component {
...
@@ -27,7 +27,7 @@ class cartList extends Component {
:
<
div
className
=
"cart-tip"
>
:
<
div
className
=
"cart-tip"
>
<
p
><
i
className
=
'iconfont iconfridge'
><
/i></
p
>
<
p
><
i
className
=
'iconfont iconfridge'
><
/i></
p
>
<
p
className
=
'cart-mess'
>
这里是空的,快去逛逛吧
~<
/p
>
<
p
className
=
'cart-mess'
>
这里是空的,快去逛逛吧
~<
/p
>
<
Link
to
=
'/'
>
去逛逛
<
/Link
>
<
Link
to
=
'/
classify
'
>
去逛逛
<
/Link
>
<
/div
>
<
/div
>
}
}
<
/div
>
<
/div
>
...
...
src/router/router-config.js
View file @
e2ecada9
...
@@ -24,6 +24,7 @@ const Study = loadable(() => import(/* webpackChunkName: 'study'*/'@/components/
...
@@ -24,6 +24,7 @@ const Study = loadable(() => import(/* webpackChunkName: 'study'*/'@/components/
const
Video
=
loadable
(()
=>
import
(
/* webpackChunkName: 'video'*/
'@/components/video'
))
const
Video
=
loadable
(()
=>
import
(
/* webpackChunkName: 'video'*/
'@/components/video'
))
const
sharePoster
=
loadable
(()
=>
import
(
/* webpackChunkName: 'shareposter'*/
'@/components/sharePoster'
))
const
sharePoster
=
loadable
(()
=>
import
(
/* webpackChunkName: 'shareposter'*/
'@/components/sharePoster'
))
const
myOrders
=
loadable
(()
=>
import
(
/* webpackChunkName: 'myorders'*/
'@/components/myOrders'
))
const
myOrders
=
loadable
(()
=>
import
(
/* webpackChunkName: 'myorders'*/
'@/components/myOrders'
))
const
Purchased
=
loadable
(()
=>
import
(
/* webpackChunkName: 'purchased'*/
'@/components/purchased'
))
export
default
[
export
default
[
{
{
path
:
'/'
,
path
:
'/'
,
...
@@ -111,7 +112,13 @@ export default [
...
@@ -111,7 +112,13 @@ export default [
},
},
{
{
path
:
'/myorders'
,
path
:
'/myorders'
,
component
:
myOrders
component
:
myOrders
,
isPrivate
:
true
},
{
path
:
'/purchased'
,
component
:
Purchased
,
isPrivate
:
true
},
},
{
{
path
:
'/payOrder'
,
path
:
'/payOrder'
,
...
...
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