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
1141d8ad
Commit
1141d8ad
authored
Dec 18, 2019
by
zhanghaozhe
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
备用方案
parent
bed0b0bf
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
5 deletions
+3
-5
src/components/activity/newyear-2019/landing/index.js
+1
-2
src/components/activity/newyear-2019/treasure-box/team.js
+2
-3
No files found.
src/components/activity/newyear-2019/landing/index.js
View file @
1141d8ad
...
@@ -289,8 +289,7 @@ class Landing extends Component {
...
@@ -289,8 +289,7 @@ class Landing extends Component {
const
{
data
}
=
res
.
data
const
{
data
}
=
res
.
data
return
data
.
url
return
data
.
url
}).
then
(
text
=>
{
}).
then
(
text
=>
{
//todo text
QRCode
.
toDataURL
(
text
)
QRCode
.
toDataURL
(
'm.julyedu.com'
)
.
then
(
url
=>
{
.
then
(
url
=>
{
Popup
({
Popup
({
title
:
'提醒服务'
,
title
:
'提醒服务'
,
...
...
src/components/activity/newyear-2019/treasure-box/team.js
View file @
1141d8ad
...
@@ -102,9 +102,8 @@ class TeamInfo extends Component {
...
@@ -102,9 +102,8 @@ class TeamInfo extends Component {
// 直接跳转
// 直接跳转
if
(
!
getParam
(
'version'
))
{
if
(
!
getParam
(
'version'
))
{
//todo 域名
// this.props.history.push('/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
this
.
props
.
history
.
push
(
'/activity/newyear-2019/landing?origin=1&treasure_code='
+
treasure_code
);
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code='
+
treasure_code
);
// window.location.assign('https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code=' + treasure_code);
}
else
{
}
else
{
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code='
+
treasure_code
+
'&version='
+
getParam
(
'version'
));
window
.
location
.
assign
(
'https://h5.julyedu.com/activity/newyear-2019/landing?origin=1&treasure_code='
+
treasure_code
+
'&version='
+
getParam
(
'version'
));
}
}
...
...
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