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
1529e08f
Commit
1529e08f
authored
Nov 03, 2019
by
FE
Browse files
Options
Browse Files
Download
Plain Diff
pull and solce
parents
2c2dadca
06a850cb
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
13 deletions
+5
-13
src/components/activity/index.js
+1
-8
src/components/activity/invite.js
+1
-1
src/components/blessingPreheat/live/index.js
+2
-2
src/components/order/index.js
+1
-2
No files found.
src/components/activity/index.js
View file @
1529e08f
...
@@ -19,14 +19,7 @@ class Activity extends Component {
...
@@ -19,14 +19,7 @@ class Activity extends Component {
if
(
this
.
props
.
user
.
hasError
)
{
if
(
this
.
props
.
user
.
hasError
)
{
this
.
props
.
history
.
push
(
'/passport'
);
this
.
props
.
history
.
push
(
'/passport'
);
}
else
{
}
else
{
http
.
get
(
`
${
API
.
home
}
/sys/receive/reg/gift`
).
then
(
res
=>
{
Toast
.
info
(
'领取成功,你可前往七月在线官网/APP进行查看'
,
2
);
let
{
code
,
msg
}
=
res
.
data
;
if
(
code
===
200
)
{
Toast
.
info
(
'领取成功,你可前往七月在线官网/APP进行查看'
,
2
);
}
else
{
Toast
.
info
(
msg
,
2
);
}
})
}
}
}
}
...
...
src/components/activity/invite.js
View file @
1529e08f
...
@@ -111,7 +111,7 @@ class Invite extends Component {
...
@@ -111,7 +111,7 @@ class Invite extends Component {
isWeiXin
:
true
,
isWeiXin
:
true
,
});
});
}
else
{
}
else
{
history
.
push
(
`invite?shareuid=
${
jsCookie
.
get
(
'uid'
)}
&new=1&inviteCode=
${
inviteCode
}
`
)
history
.
push
(
`
/
invite?shareuid=
${
jsCookie
.
get
(
'uid'
)}
&new=1&inviteCode=
${
inviteCode
}
`
)
this
.
setState
({
this
.
setState
({
showTip
:
true
,
showTip
:
true
,
});
});
...
...
src/components/blessingPreheat/live/index.js
View file @
1529e08f
...
@@ -73,10 +73,10 @@ class Live extends Component {
...
@@ -73,10 +73,10 @@ class Live extends Component {
if
(
user
.
hasError
)
{
if
(
user
.
hasError
)
{
history
.
push
(
'/passport/login'
)
history
.
push
(
'/passport/login'
)
}
}
http
.
get
(
`
${
API
.
home
}
/sys/createLiveQrcode/
${
id
}
`
)
http
.
get
(
`
${
API
[
'base-api'
]
}
/sys/createLiveQrcode/
${
id
}
`
)
.
then
(
res
=>
{
.
then
(
res
=>
{
const
{
data
}
=
res
const
{
data
}
=
res
if
(
data
.
code
==
200
)
{
if
(
data
.
errno
==
200
)
{
QRCode
.
toDataURL
(
data
.
data
.
url
,
(
err
,
url
)
=>
{
QRCode
.
toDataURL
(
data
.
data
.
url
,
(
err
,
url
)
=>
{
Popup
({
Popup
({
title
:
'扫码关注“七月在线”服务号即可预约'
,
title
:
'扫码关注“七月在线”服务号即可预约'
,
...
...
src/components/order/index.js
View file @
1529e08f
...
@@ -145,8 +145,7 @@ class Order extends Component {
...
@@ -145,8 +145,7 @@ class Order extends Component {
ischeck
:
this
.
state
.
useBalance
,
ischeck
:
this
.
state
.
useBalance
,
}
}
http
.
post
(
`
${
API
[
'base-api'
]}
/pdd/m`
,
params
).
then
(
res
=>
{
http
.
post
(
`
${
API
[
'base-api'
]}
/pdd/m`
,
params
).
then
(
res
=>
{
console
.
log
(
res
);
if
(
Number
(
res
.
data
.
errno
)
===
200
)
{
if
(
res
.
data
.
errno
===
200
)
{
sessionStorage
.
removeItem
(
'orderUseCacheObj'
);
sessionStorage
.
removeItem
(
'orderUseCacheObj'
);
if
(
res
.
data
.
data
.
pay_jump
===
1
)
{
if
(
res
.
data
.
data
.
pay_jump
===
1
)
{
this
.
props
.
history
.
push
(
`/togroup?id=
${
res
.
data
.
data
.
oid
}
`
);
this
.
props
.
history
.
push
(
`/togroup?id=
${
res
.
data
.
data
.
oid
}
`
);
...
...
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