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
52d7f2a9
Commit
52d7f2a9
authored
Sep 24, 2019
by
IvyXia123
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
20190924
parent
9a34eb31
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
26 deletions
+30
-26
buy.vue
src/components/buy/buy.vue
+5
-4
index.vue
src/components/buy/index.vue
+6
-6
passShop.vue
src/components/buy/passShop.vue
+18
-14
share.vue
src/components/newLesson/share.vue
+1
-2
No files found.
src/components/buy/buy.vue
View file @
52d7f2a9
...
...
@@ -368,11 +368,12 @@ export default {
salesType
:
invite
?
invite
.
split
(
"-"
)[
1
]
:
"null"
,
salesID
:
invite
?
Number
(
invite
.
split
(
"-"
)[
2
])
:
0
});
if
(
window
.
location
.
href
.
indexOf
(
"gdt_vid"
)
>
-
1
)
{
json
.
gdt_vid
=
this
.
$route
.
query
.
gdt_vid
;
if
(
localStorage
.
getItem
(
"gdt_vid"
)
!=
'undefined'
){
json
.
gdt_vid
=
localStorage
.
getItem
(
"gdt_vid"
)
}
if
(
window
.
location
.
href
.
indexOf
(
"cct_user_id"
)
>
-
1
)
{
json
.
cct_user_id
=
this
.
$route
.
query
.
cct_user_id
;
if
(
localStorage
.
getItem
(
"cct_user_id"
)
!=
'undefined'
)
{
json
.
cct_user_id
=
localStorage
.
getItem
(
"cct_user_id"
)
}
if
(
window
.
location
.
href
.
indexOf
(
"group_order_id"
)
>
-
1
)
{
json
.
group_order_id
=
this
.
$route
.
query
.
group_order_id
;
...
...
src/components/buy/index.vue
View file @
52d7f2a9
...
...
@@ -360,9 +360,9 @@
goodsID
:
this
.
shopId
,
salesType
:
invite
?
invite
.
split
(
"-"
)[
1
]
:
"null"
,
salesID
:
invite
?
Number
(
invite
.
split
(
"-"
)[
2
])
:
0
,
gdt_vid
:
query
.
gdt_vid
,
cct_user_id
:
query
.
cct_user_id
,
redeem_code
:
this
.
$route
.
query
.
redeem_code
gdt_vid
:
comment
.
getUrlParam
()
.
gdt_vid
,
cct_user_id
:
comment
.
getUrlParam
()
.
cct_user_id
,
redeem_code
:
comment
.
getUrlParam
().
redeem_code
,
});
// debugger
this
.
$router
.
push
({
...
...
@@ -549,9 +549,9 @@
courseName
:
""
,
salesType
:
invite
?
invite
.
split
(
"-"
)[
1
]
:
"null"
,
salesID
:
invite
?
Number
(
invite
.
split
(
"-"
)[
2
])
:
0
,
gdt_vid
:
this
.
$route
.
query
.
gdt_vid
,
cct_user_id
:
this
.
$route
.
query
.
cct_user_id
,
redeem_code
:
this
.
$route
.
query
.
redeem_code
gdt_vid
:
comment
.
getUrlParam
()
.
gdt_vid
,
cct_user_id
:
comment
.
getUrlParam
()
.
cct_user_id
,
redeem_code
:
comment
.
getUrlParam
().
redeem_code
,
});
if
(
this
.
groupDetail
.
goods_type
===
2
)
{
if
(
localStorage
.
getItem
(
"cc_token"
))
{
...
...
src/components/buy/passShop.vue
View file @
52d7f2a9
...
...
@@ -303,11 +303,13 @@ export default {
};
},
mounted
()
{
console
.
log
(
comment
.
getUrlParam
().
gdt_vid
,
989898
)
this
.
getDetail
();
Toast
.
loading
({
mask
:
true
,
message
:
''
});
// document.body.addEventListener('focusout', () => { //软键盘关闭事件
// document.documentElement.scrollTop = 0
// document.body.scrollTop = 0
...
...
@@ -341,6 +343,7 @@ export default {
// this.
},
goToBuyPage
()
{
console
.
log
(
comment
.
getUrlParam
().
gdt_vid
,
2222
)
if
(
this
.
groupDetail
.
is_real
){
let
query
=
{
shopId
:
this
.
shopId
,
invite_code
:
this
.
invite_code
};
let
invite
=
this
.
invite_code
;
...
...
@@ -352,9 +355,9 @@ export default {
goodsID
:
this
.
shopId
,
salesType
:
invite
?
invite
.
split
(
"-"
)[
1
]
:
"null"
,
salesID
:
invite
?
Number
(
invite
.
split
(
"-"
)[
2
])
:
0
,
gdt_vid
:
this
.
$route
.
query
.
gdt_vid
,
cct_user_id
:
this
.
$route
.
query
.
cct_user_id
,
redeem_code
:
this
.
$route
.
query
.
redeem_code
gdt_vid
:
comment
.
getUrlParam
()
.
gdt_vid
,
cct_user_id
:
comment
.
getUrlParam
()
.
cct_user_id
,
redeem_code
:
comment
.
getUrlParam
().
redeem_code
,
});
if
(
this
.
groupId
)
{
...
...
@@ -371,6 +374,7 @@ export default {
query
:
{
shopId
:
this
.
shopId
,
invite_code
:
this
.
invite_code
,
gdt_vid
:
comment
.
getUrlParam
().
gdt_vid
,
type
:
""
}
});
...
...
@@ -399,9 +403,9 @@ export default {
goodsID
:
this
.
shopId
,
salesType
:
invite
?
invite
.
split
(
"-"
)[
1
]
:
"null"
,
salesID
:
invite
?
Number
(
invite
.
split
(
"-"
)[
2
])
:
0
,
gdt_vid
:
query
.
gdt_vid
,
cct_user_id
:
query
.
cct_user_id
,
redeem_code
:
this
.
$route
.
query
.
redeem_code
,
gdt_vid
:
localStorage
.
getItem
(
"gdt_vid"
)
,
cct_user_id
:
localStorage
.
getItem
(
"cct_user_id"
)
,
redeem_code
:
localStorage
.
getItem
(
"redeem_code"
)
,
});
// debugger
...
...
@@ -437,15 +441,16 @@ export default {
goodsID
:
this
.
shopId
.
toString
(),
salesType
:
invite
?
invite
.
split
(
'-'
)[
1
]:
'null'
,
salesID
:
invite
?
Number
(
invite
.
split
(
'-'
)[
2
]):
0
,
gdt_vid
:
this
.
$route
.
query
.
gdt_vid
,
cct_user_id
:
this
.
$route
.
query
.
cct_user_id
,
redeem_code
:
this
.
$route
.
query
.
redeem_code
gdt_vid
:
localStorage
.
getItem
(
"gdt_vid"
)
,
cct_user_id
:
localStorage
.
getItem
(
"cct_user_id"
)
,
redeem_code
:
localStorage
.
getItem
(
"redeem_code"
),
});
if
(
window
.
location
.
href
.
indexOf
(
'gdt_vid'
)
>-
1
){
json
.
gdt_vid
=
this
.
$route
.
query
.
gdt_vid
if
(
localStorage
.
getItem
(
"gdt_vid"
)
!=
'undefined'
){
json
.
gdt_vid
=
localStorage
.
getItem
(
"gdt_vid"
)
}
if
(
window
.
location
.
href
.
indexOf
(
'cct_user_id'
)
>-
1
){
json
.
cct_user_id
=
this
.
$route
.
query
.
cct_user_id
if
(
localStorage
.
getItem
(
"cct_user_id"
)
!=
'undefined'
){
json
.
cct_user_id
=
localStorage
.
getItem
(
"cct_user_id"
)
}
this
.
orderFlag
=
false
;
payApi
(
json
).
then
(
res
=>
{
...
...
@@ -724,7 +729,6 @@ export default {
this
.
onShare
(
1
);
this
.
handleInviteCode
();
}
console
.
log
(
sessionStorage
.
getItem
(
'clickTag'
),
979876896
)
if
(
sessionStorage
.
getItem
(
'clickTag'
)){
console
.
log
(
JSON
.
parse
(
localStorage
.
getItem
(
"userDesc"
)))
if
(
!
JSON
.
parse
(
localStorage
.
getItem
(
"userDesc"
)).
mobile
||
JSON
.
parse
(
localStorage
.
getItem
(
"userDesc"
)).
mobile
===
""
)
{
...
...
src/components/newLesson/share.vue
View file @
52d7f2a9
...
...
@@ -208,7 +208,6 @@
//console.log(window.sessionStorage.query);
getUserDetailApi
()
.
then
(
res
=>
{
alert
(
"获取头像"
)
console
.
log
(
res
)
this
.
avatarActive
=
res
.
avatar
this
.
nicknameActive
=
res
.
nickname
...
...
@@ -356,6 +355,7 @@
this
.
lastTime
=
Date
.
parse
(
new
Date
());
clearInterval
(
this
.
$store
.
state
.
timeout
);
this
.
userDetail
=
JSON
.
parse
(
localStorage
.
getItem
(
"userDesc"
));
console
.
log
(
this
.
userDetail
,
2323
)
this
.
nickname
=
this
.
userDetail
.
nickname
;
if
(
this
.
nickname
.
length
>=
6
)
{
this
.
nickname
=
this
.
nickname
.
slice
(
0
,
4
)
+
"..."
;
...
...
@@ -476,7 +476,6 @@
ctx
.
arc
(
357
,
173
,
60
,
0
,
2
*
Math
.
PI
);
ctx
.
clip
();
ctx
.
drawImage
(
this
,
297
,
113
,
120
,
120
);
alert
(
"生成图片"
)
let
dataURL
=
canvas
.
toDataURL
(
"image/jpg"
,
1.0
);
that
.
canvasData
=
dataURL
;
};
...
...
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