Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in
Toggle navigation
H
h5-base
Project
Project
Details
Activity
Releases
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
new-sing
h5-base
Commits
e32feead
Commit
e32feead
authored
Jan 08, 2019
by
wangwei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev2' into local
parents
5b1eeb14
8ffc7eda
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
activity.vue
src/components/buy/activity.vue
+0
-1
activityInvite.vue
src/components/buy/activityInvite.vue
+3
-2
No files found.
src/components/buy/activity.vue
View file @
e32feead
...
...
@@ -367,7 +367,6 @@
},
getInviteResult
(){
getInviteResultApi
().
then
(
res
=>
{
console
.
log
(
res
)
this
.
earnings
=
res
.
earnings
;
this
.
userNum
=
res
.
user_num
;
});
...
...
src/components/buy/activityInvite.vue
View file @
e32feead
...
...
@@ -184,7 +184,7 @@
width
,
top
}
=
document
.
getElementById
(
'capture'
).
getClientRects
()[
0
];
document
.
getElementById
(
'capture'
).
style
.
width
=
width
+
'px'
;
//
document.getElementById('capture').style.width = width + 'px';
let
o
=
this
.
getOffsetRect
(
this
.
$refs
.
imageWrapper
);
let
{
height1
,
...
...
@@ -197,7 +197,7 @@
async
:
true
,
timeout
:
500
,
scrollX
:
1
,
scale
:
3
,
scale
:
4
,
width
:
width1
,
height
:
height1
,
letterRendering
:
true
,
...
...
@@ -430,6 +430,7 @@
}
.img-cvs{
position: absolute;
background: rgb(253, 168, 19);
width: 518 / 2 * @toVw;
top: 25 * @toVh;
left: 113 / 2 * @toVw;
...
...
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