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
a7dad399
Commit
a7dad399
authored
Dec 20, 2019
by
FE
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '00-formal' into dev
parents
82c32aeb
df97e0f6
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
3 deletions
+5
-3
src/components/activity/newyear-2019/preheat/YearCourse/index.js
+3
-1
src/components/activity/newyear-2019/year-wish/index.js
+2
-2
No files found.
src/components/activity/newyear-2019/preheat/YearCourse/index.js
View file @
a7dad399
...
@@ -461,7 +461,7 @@ class YearCourse extends Component {
...
@@ -461,7 +461,7 @@ class YearCourse extends Component {
const
{
history
}
=
this
.
props
const
{
history
}
=
this
.
props
if
(
getParam
(
'version'
))
{
if
(
getParam
(
'version'
))
{
let
data
=
{
let
data
=
{
title
:
`【仅剩
2
个名额】我
${
params
.
price
}
元拼了《
${
params
.
course_title
}
》`
,
title
:
`【仅剩
${
params
.
number
}
个名额】我
${
params
.
price
}
元拼了《
${
params
.
course_title
}
》`
,
desc
:
params
.
course_title
,
desc
:
params
.
course_title
,
link
:
`
${
API
.
m
}
/togroup?id=
${
oid
}
`
,
link
:
`
${
API
.
m
}
/togroup?id=
${
oid
}
`
,
imgUrl
:
params
.
image_name
,
imgUrl
:
params
.
image_name
,
...
@@ -798,6 +798,7 @@ class YearCourse extends Component {
...
@@ -798,6 +798,7 @@ class YearCourse extends Component {
item
.
is_assemble
==
1
&&
item
.
is_assemble
==
1
&&
<
a
<
a
onClick
=
{()
=>
this
.
toInviteFriends
(
item
.
order_id
,
{
onClick
=
{()
=>
this
.
toInviteFriends
(
item
.
order_id
,
{
number
:
item
.
number
,
course_title
:
item
.
course_title
,
course_title
:
item
.
course_title
,
image_name
:
item
.
image_name
,
image_name
:
item
.
image_name
,
price
:
0.01
price
:
0.01
...
@@ -928,6 +929,7 @@ class YearCourse extends Component {
...
@@ -928,6 +929,7 @@ class YearCourse extends Component {
val
.
type
===
2
&&
val
.
type
===
2
&&
<
a
<
a
onClick
=
{()
=>
this
.
toInviteFriends
(
val
.
order_id
,
{
onClick
=
{()
=>
this
.
toInviteFriends
(
val
.
order_id
,
{
number
:
val
.
number
,
course_title
:
val
.
course_title
,
course_title
:
val
.
course_title
,
image_name
:
val
.
image_name
,
image_name
:
val
.
image_name
,
price
:
val
.
pdd_price
price
:
val
.
pdd_price
...
...
src/components/activity/newyear-2019/year-wish/index.js
View file @
a7dad399
...
@@ -68,8 +68,7 @@ class YarnWish extends Component {
...
@@ -68,8 +68,7 @@ class YarnWish extends Component {
const
{
history
}
=
this
.
props
const
{
history
}
=
this
.
props
if
(
getParam
(
'version'
))
{
if
(
getParam
(
'version'
))
{
let
data
=
{
let
data
=
{
// TODO, 剩余名额临时用假数据
title
:
`【仅剩
${
params
.
number
}
个名额】我
${
params
.
price
}
元拼了《
${
params
.
course_title
}
》`
,
title
:
`【仅剩2个名额】我
${
params
.
price
}
元拼了《
${
params
.
course_title
}
》`
,
desc
:
params
.
course_title
,
desc
:
params
.
course_title
,
link
:
`
${
API
.
m
}
/togroup?id=
${
oid
}
`
,
link
:
`
${
API
.
m
}
/togroup?id=
${
oid
}
`
,
imgUrl
:
params
.
image_name
,
imgUrl
:
params
.
image_name
,
...
@@ -263,6 +262,7 @@ class YarnWish extends Component {
...
@@ -263,6 +262,7 @@ class YarnWish extends Component {
(
item
.
type
===
2
||
item
.
type
===
7
)
&&
(
item
.
type
===
2
||
item
.
type
===
7
)
&&
<
a
<
a
onClick
=
{()
=>
this
.
toInviteFriends
(
item
.
order_id
,
{
onClick
=
{()
=>
this
.
toInviteFriends
(
item
.
order_id
,
{
number
:
item
.
number
,
course_title
:
item
.
course_title
,
course_title
:
item
.
course_title
,
image_name
:
item
.
image_name
,
image_name
:
item
.
image_name
,
price
:
item
.
type
===
2
?
item
.
pdd_price
:
0.01
price
:
item
.
type
===
2
?
item
.
pdd_price
:
0.01
...
...
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