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
3f991cb0
Commit
3f991cb0
authored
Oct 18, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优惠券
parent
e103d061
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
354 additions
and
93 deletions
+354
-93
src/common/deposit/end-expansion-alert/index.js
+27
-0
src/common/deposit/end-expansion-alert/index.scss
+22
-0
src/components/coupons/Coupon/coupon.scss
+60
-7
src/components/coupons/Coupon/index.js
+179
-54
src/components/coupons/myCoupons/index.js
+66
-32
No files found.
src/common/deposit/end-expansion-alert/index.js
0 → 100644
View file @
3f991cb0
import
React
from
'react'
import
{
Modal
}
from
'antd-mobile'
import
'./index.scss'
export
default
function
({
start_amount
,
limit_amount
,
onCancel
=
()
=>
{
},
onConfirm
})
{
const
content
=
(
<>
<
div
className
=
"end-expansion-alert-ques"
>
{
`你的
${
start_amount
}
元优惠券正在膨胀中,
确定要结束膨胀吗?`
}
<
/div
>
<
div
className
=
"end-expansion-alert-hint"
>
{
`离
${
limit_amount
}
元只差一点点了!继续膨胀,优惠更多哦`
}
<
/div
>
<
/
>
)
Modal
.
alert
(
'温馨提示'
,
content
,
[
{
text
:
'再考虑下'
,
onPress
:
onCancel
,
style
:
{
color
:
'#333'
}},
{
text
:
'确定结束膨胀'
,
onPress
:
onConfirm
}
])
}
src/common/deposit/end-expansion-alert/index.scss
0 → 100644
View file @
3f991cb0
.am-modal
{
width
:
300px
;
&
-title
{
font-size
:
15px
;
}
}
.end-expansion-alert
{
&
-ques
{
width
:
200px
;
margin
:
0
auto
20px
;
text-align
:
center
;
color
:
#666
;
font-size
:
15px
;
}
&
-hint
{
color
:
#999
;
font-size
:
12px
;
}
}
src/components/coupons/Coupon/coupon.scss
View file @
3f991cb0
$bg_type1
:
#FE6161
;
$bg_type2
:
#E0B97B
;
$bg_voucher
:
#FE6161
;
$bg_free
:
#E0B97B
;
$bg_expand
:
#8361FE
;
.coupon
{
position
:
relative
;
margin-bottom
:
15px
;
...
...
@@ -27,13 +28,14 @@ $bg_type2: #E0B97B;
}
}
.course-title
{
.course-title
{
width
:
68
.37%
;
margin
:
0
auto
4px
;
white-space
:
nowrap
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
font-size
:
$font_16
;
text-align
:
center
;
}
.expire
{
...
...
@@ -43,14 +45,18 @@ $bg_type2: #E0B97B;
}
&
.coupon-type1
{
background
:
$bg_
type1
;
background
:
$bg_
voucher
;
}
&
.coupon-type2
{
background
:
$E0B97B
;
}
&
.invalid
{
&
.coupon-type4
{
background
:
$bg_expand
;
}
&
.invalid
{
background
:
$color_999
;
}
...
...
@@ -87,6 +93,44 @@ $bg_type2: #E0B97B;
transform
:
translateY
(
50%
);
}
}
.progress-container
{
width
:
299px
;
margin
:
0
auto
;
.denomination
{
font-size
:
15px
;
line-height
:
1
.3em
;
color
:
#F8E71C
;
span
{
transform
:
scale
(
0
.9
);
}
}
.progress-bar-container
{
position
:
relative
;
height
:
7px
;
background
:
#5C2FFF
;
border-radius
:
4px
;
overflow
:
hidden
;
margin-bottom
:
6px
;
.progress-bar
{
position
:
absolute
;
left
:
0
;
top
:
0
;
height
:
100%
;
background
:
#F8E71C
;
border-radius
:
4px
;
}
}
.money
{
display
:
flex
;
justify-content
:
space-between
;
}
}
}
.coupon-des
{
...
...
@@ -117,5 +161,15 @@ $bg_type2: #E0B97B;
background
:
transparent
;
-webkit-appearance
:
none
;
}
.stop-expanding
{
padding
:
3px
8px
;
border
:
1px
solid
#FF3131
;
border-radius
:
10px
;
-webkit-appearance
:
none
;
background
:
transparent
;
color
:
#FF3131
;
font-size
:
10px
;
}
}
}
\ No newline at end of file
}
src/components/coupons/Coupon/index.js
View file @
3f991cb0
import
React
,
{
PureComponent
}
from
'react'
import
'./coupon.scss'
import
classnames
from
'classnames'
import
{
http
}
from
"@/utils"
import
showAlert
from
'@common/deposit/end-expansion-alert'
import
{
Toast
}
from
'antd-mobile'
class
Coupon
extends
PureComponent
{
VOUCHER
=
1
//代金券
FREE
=
2
//免单券
EXPAND
=
4
//膨胀全
pick
=
()
=>
{
let
{
useCoupon
,
invalid
}
=
this
.
props
!
invalid
&&
useCoupon
&&
useCoupon
(
this
.
props
.
id
)
...
...
@@ -14,73 +22,191 @@ class Coupon extends PureComponent {
this
.
props
.
useCoupon
(
this
.
props
.
id
)
}
ExchangeCourse
=
(
e
)
=>
{
this
.
props
.
toExchangeCourse
(
e
,
this
.
props
.
code
)
this
.
props
.
toExchangeCourse
(
e
,
this
.
props
.
code
)
}
stopExpanding
=
(
id
,
e
)
=>
{
const
{
start_amount
,
limit_amount
}
=
this
.
props
e
.
stopPropagation
()
showAlert
({
start_amount
,
limit_amount
,
onConfirm
:
()
=>
{
http
.
post
(
`
${
API
.
home
}
/m/end_expansion`
,
{
id
})
.
then
(
res
=>
{
const
{
data
}
=
res
if
(
data
.
code
==
200
)
{
this
.
props
.
endExpansion
(
id
)
}
else
{
Toast
.
info
(
data
.
msg
)
}
})
}
})
}
render
()
{
let
{
ctype
,
amount
,
format_expire_time
,
limit_course
,
invalid
,
course_title
,
showUseButton
,
id
,
cod
e
,
s
electedCouponId
,
showUseButton
format_expire_tim
e
,
s
tart_amount
,
limit_amount
}
=
this
.
props
return
(
<
li
className
=
'coupon'
onClick
=
{
this
.
pick
}
>
<
div
className
=
{
classnames
(
'coupon-info'
,
invalid
?
'invalid'
:
`coupon-type
${
ctype
}
`
)}
>
<
p
className
=
'type'
>
{
ctype
===
1
?
'代金券'
:
'课程券'
}
<
/p
>
{
ctype
===
1
?
<
p
className
=
'denomination'
>
{
amount
}
<
span
>
元
<
/span></
p
>
:
<
p
className
=
'course-title'
>
{
course_title
}
<
/p
>
let
top
,
bottom
}
<
p
className
=
'expire'
>
有效期至:
{
format_expire_time
}
<
/p
>
{
selectedCouponId
===
id
&&
<
i
className
=
{
classnames
(
'iconfont icondanseshixintubiao-5'
,
{
check
:
!
invalid
})}
/
>
}
<
ul
>
switch
(
ctype
)
{
case
this
.
VOUCHER
:
top
=
(
<>
<
p
className
=
'denomination'
>
{
amount
}
<
span
>
元
<
/span></
p
>
<
p
className
=
'expire'
>
有效期至:
{
format_expire_time
}
<
/p
>
<
/
>
)
bottom
=
(
<>
<
span
className
=
{
'limit'
}
>
可用于大于代金券金额的课程
<
/span
>
{
new
Array
(
19
).
fill
(
'a'
).
map
((
item
,
index
)
=>
{
return
<
li
key
=
{
index
}
/
>
})
showUseButton
&&
ctype
==
this
.
VOUCHER
&&
<
button
className
=
'use'
onClick
=
{
this
.
GoToUse
}
>
立即使用
<
/button
>
}
<
/ul
>
<
/div
>
<
div
className
=
"coupon-des"
>
<
span
className
=
'limit'
>
{
limit_course
===
0
?
'可用于大于代金券金额的课程'
:
`仅适用于《
${
course_title
}
》`
}
<
/span
>
{
showUseButton
&&
ctype
==
1
&&
<
button
className
=
'use'
onClick
=
{
this
.
GoToUse
}
>
立即使用
<
/button
>
}
{
showUseButton
&&
ctype
==
2
&&
<
button
className
=
'use'
onClick
=
{(
e
)
=>
this
.
ExchangeCourse
(
e
)}
>
立即兑换
<
/button
>
}
<
/
>
)
break
case
this
.
FREE
:
top
=
(
<>
<
p
className
=
'course-title'
>
{
course_title
}
<
/p
>
<
p
className
=
'expire'
>
有效期至:
{
format_expire_time
}
<
/p
>
<
/
>
)
bottom
=
(
<>
<
span
className
=
{
'limit'
}
>
{
`仅适用于《
${
course_title
}
》`
}
<
/span
>
{
showUseButton
&&
ctype
==
this
.
FREE
&&
<
button
className
=
'use'
onClick
=
{(
e
)
=>
this
.
ExchangeCourse
(
e
)}
>
立即兑换
<
/button
>
}
<
/
>
)
break
case
this
.
EXPAND
:
if
(
!
start_amount
)
{
top
=
(
<>
<
p
className
=
'denomination'
>
{
amount
}
<
span
>
元
<
/span></
p
>
<
p
className
=
'expire'
>
有效期至:
{
format_expire_time
}
<
/p
>
<
/
>
)
}
else
{
top
=
(
<>
<
div
className
=
"progress-container"
>
<
p
className
=
'denomination'
>
{
amount
}
<
span
>
元
<
/span></
p
>
<
div
className
=
{
'progress-bar-container'
}
>
<
span
className
=
{
'progress-bar'
}
style
=
{{
width
:
`
${
Math
.
round
((
amount
-
start_amount
)
/
limit_amount
*
100
)}
%`
}}
><
/span
>
<
/div
>
<
div
className
=
{
'money'
}
>
<
span
>
{
start_amount
}
元
<
/span
>
<
span
>
{
limit_amount
}
元
<
/span
>
<
/div
>
<
/div
>
<
/
>
)
}
bottom
=
(
<>
<
span
className
=
{
'limit'
}
>
全场通用
<
/span
>
{
start_amount
&&
<
button
className
=
'stop-expanding'
onClick
=
{
this
.
stopExpanding
.
bind
(
this
,
id
)}
>
立即结束膨胀
<
/button
>
}
<
/
>
)
break
}
return
(
<
BaseCoupon
{...
this
.
props
}
top
=
{
top
}
VOUCHER
=
{
this
.
VOUCHER
}
FREE
=
{
this
.
FREE
}
EXPAND
=
{
this
.
EXPAND
}
pick
=
{
this
.
pick
}
bottom
=
{
bottom
}
/
>
)
}
}
<
/div
>
<
/li
>
);
function
BaseCoupon
(
{
pick
,
ctype
,
invalid
,
top
,
VOUCHER
,
FREE
,
EXPAND
,
selectedCouponId
,
id
,
bottom
})
{
let
couponTypes
=
{
[
VOUCHER
]:
'代金券'
,
[
FREE
]:
'课程券'
,
[
EXPAND
]:
'膨胀券'
}
return
(
<
li
className
=
'coupon'
onClick
=
{
pick
}
>
<
div
className
=
{
classnames
(
'coupon-info'
,
invalid
?
'invalid'
:
`coupon-type
${
ctype
}
`
)}
>
<
p
className
=
'type'
>
{
couponTypes
[
ctype
]}
<
/p
>
{
top
}
{
selectedCouponId
===
id
&&
<
i
className
=
{
classnames
(
'iconfont icondanseshixintubiao-5'
,
{
check
:
!
invalid
})}
/
>
}
<
ul
>
{
new
Array
(
19
).
fill
(
'a'
).
map
((
item
,
index
)
=>
{
return
<
li
key
=
{
index
}
/
>
})
}
<
/ul
>
<
/div
>
<
div
className
=
"coupon-des"
>
{
bottom
}
<
/div
>
<
/li
>
)
}
export
default
Coupon
\ No newline at end of file
export
default
Coupon
src/components/coupons/myCoupons/index.js
View file @
3f991cb0
import
React
,
{
PureComponent
}
from
'react'
;
import
React
,
{
PureComponent
}
from
'react'
import
'./index.scss'
import
RedeemBar
from
"../RedeemBar"
;
import
RedeemBar
from
"../RedeemBar"
import
Coupon
from
'../Coupon'
import
{
http
,
getParam
}
from
'@/utils'
import
{
WithFullSize
}
from
'@/HOCs'
import
{
Toast
}
from
'antd-mobile'
import
{
isEmpty
}
from
'lodash'
import
{
connect
}
from
'react-redux'
;
import
{
http
,
getParam
}
from
'@/utils'
import
{
WithFullSize
}
from
'@/HOCs'
import
{
Toast
}
from
'antd-mobile'
import
{
isEmpty
}
from
'lodash'
import
{
connect
}
from
'react-redux'
@
connect
()
class
UseCoupon
extends
PureComponent
{
...
...
@@ -30,7 +30,7 @@ class UseCoupon extends PureComponent {
const
{
state
}
=
this
.
props
.
location
if
(
state
&&
state
.
from
)
{
if
(
state
.
from
===
'/my'
)
{
this
.
getMyCoupons
()
;
this
.
getMyCoupons
()
this
.
setState
({
showUseButton
:
true
})
...
...
@@ -38,7 +38,7 @@ class UseCoupon extends PureComponent {
if
(
!
this
.
state
.
courseId
)
{
location
.
state
&&
location
.
state
.
from
?
history
.
replace
(
location
.
state
.
from
)
:
history
.
goBack
()
}
this
.
getAllCoupons
()
;
this
.
getAllCoupons
()
}
}
}
...
...
@@ -50,7 +50,7 @@ class UseCoupon extends PureComponent {
// 兑换
exchange
=
()
=>
{
const
{
location
:
{
state
=
{}}}
=
this
.
props
;
const
{
location
:
{
state
=
{}}}
=
this
.
props
if
(
this
.
state
.
redeemCode
!==
''
)
{
http
.
post
(
`
${
API
.
home
}
/m/coupon/exchange`
,
{
code
:
this
.
state
.
redeemCode
,
...
...
@@ -88,7 +88,7 @@ class UseCoupon extends PureComponent {
invalid_coupons
:
[...
this
.
state
.
invalid_coupons
,
coupon
],
showUseButton
:
null
,
redeemCode
:
''
})
;
})
}
else
{
this
.
setState
({
valid_coupons
:
[...
this
.
state
.
valid_coupons
,
coupon
],
...
...
@@ -109,26 +109,47 @@ class UseCoupon extends PureComponent {
}
getMyCoupons
=
()
=>
{
http
.
get
(
`
${
API
.
home
}
/m/coupon/all`
)
.
then
(
res
=>
{
const
data
=
res
.
data
if
(
data
.
code
===
200
)
{
this
.
setState
({
couponList
:
isEmpty
(
data
.
data
)
?
[]
:
data
.
data
})
}
else
{
Toast
.
info
(
data
.
msg
)
}
Promise
.
all
([
http
.
get
(
`
${
API
.
home
}
/m/coupon/all`
),
http
.
get
(
`
${
API
.
home
}
/m/coupon/expansion`
)
]).
then
((
coupons
)
=>
{
let
myCoupons
=
[]
const
[
allCoupons
,
expansionCoupons
]
=
coupons
const
{
data
:
all
}
=
allCoupons
const
{
data
:
expansion
}
=
expansionCoupons
if
(
all
.
code
==
200
)
{
Array
.
isArray
(
all
.
data
)
&&
(
myCoupons
=
myCoupons
.
concat
(
all
.
data
))
}
else
{
Toast
.
info
(
all
.
msg
)
}
if
(
expansion
.
code
==
200
)
{
Array
.
isArray
(
expansion
.
data
)
&&
(
expansion
.
data
=
expansion
.
data
.
map
(
item
=>
(
item
.
ctype
=
4
,
item
)))
&&
(
myCoupons
=
myCoupons
.
concat
(
expansion
.
data
))
}
else
{
Toast
.
info
(
expansion
.
msg
)
}
this
.
setState
({
couponList
:
myCoupons
})
})
}
getAllCoupons
=
()
=>
{
http
.
post
(
`
${
API
.
home
}
/m/coupon/select`
,
{
course_id
:
this
.
state
.
courseId
})
Promise
.
all
([
http
.
post
(
`
${
API
.
home
}
/m/coupon/select`
,
{
course_id
:
this
.
state
.
courseId
}),
http
.
get
(
`
${
API
.
home
}
/m/expansion`
)
]).
then
((
coupons
)
=>
{
})
/*http.post(`${API.home}/m/coupon/select`, {course_id: this.state.courseId})
.then(res => {
const data = res.data
if (data.code === 200) {
const
inuse_coupon
=
data
.
data
[
'inuse_coupon'
]
;
const inuse_coupon = data.data['inuse_coupon']
this.setState({
...
...
@@ -142,12 +163,13 @@ class UseCoupon extends PureComponent {
} else {
Toast.info(data.msg)
}
})
})*/
// http.get(`${API.home}/m/expansion`)
}
// 立即兑换课程
toExchangeCourse
=
(
e
,
code
)
=>
{
e
.
stopPropagation
()
;
e
.
stopPropagation
()
http
.
post
(
`
${
API
[
'base-api'
]}
/pay/miandan/
${
code
}
`
,
{}).
then
(
res
=>
{
const
data
=
res
.
data
if
(
data
.
errno
===
200
)
{
...
...
@@ -163,7 +185,7 @@ class UseCoupon extends PureComponent {
}
useCoupon
=
val
=>
{
const
{
history
,
dispatch
}
=
this
.
props
const
{
history
}
=
this
.
props
const
coupon
=
this
.
state
.
couponList
.
find
(
item
=>
item
.
id
===
val
)
if
(
val
)
{
...
...
@@ -172,8 +194,8 @@ class UseCoupon extends PureComponent {
if
(
coupon
[
'limit_course'
]
===
0
)
{
history
.
push
(
`/classify`
)
}
else
{
history
.
push
(
`/detail?id=
${
coupon
[
'limit_course'
]}
`
)
;
return
false
;
history
.
push
(
`/detail?id=
${
coupon
[
'limit_course'
]}
`
)
return
false
}
}
else
{
...
...
@@ -233,7 +255,7 @@ class UseCoupon extends PureComponent {
// 开始学习
toStudy
=
(
vCourseId
,
isHaveVideo
)
=>
{
const
{
history
}
=
this
.
props
;
const
{
history
}
=
this
.
props
if
(
isHaveVideo
==
0
)
{
Toast
.
info
(
'尚未开课,开课后立即上传课程~'
,
2
)
}
else
{
...
...
@@ -251,6 +273,18 @@ class UseCoupon extends PureComponent {
})
}
endExpansion
=
id
=>
{
this
.
setState
({
couponList
:
this
.
state
.
couponList
.
map
(
item
=>
{
if
(
item
.
id
===
id
)
{
delete
item
.
start_amount
}
return
item
})
})
}
render
()
{
const
{
state
}
=
this
.
props
.
location
const
{
showUseButton
,
selectedCouponId
}
=
this
.
state
...
...
@@ -273,6 +307,7 @@ class UseCoupon extends PureComponent {
select
=
{
this
.
select
}
useCoupon
=
{
this
.
useCoupon
}
toExchangeCourse
=
{
this
.
toExchangeCourse
}
endExpansion
=
{
this
.
endExpansion
}
/
>
{
this
.
state
.
invalid_coupons
.
length
>
0
&&
...
...
@@ -296,7 +331,7 @@ class UseCoupon extends PureComponent {
courseCouponData
=
{
this
.
state
.
courseCouponData
}
/
>
}
<
/div
>
)
;
)
}
}
...
...
@@ -351,4 +386,4 @@ function FreeCouponCourse(props) {
)
}
export
default
WithFullSize
(
UseCoupon
);
\ No newline at end of file
export
default
WithFullSize
(
UseCoupon
)
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