Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
Y
ybf
Project
Project
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
xulili
ybf
Commits
927961a3
Commit
927961a3
authored
5 years ago
by
leiqingsong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
送券活动用户头像
parent
21d3670f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
9 deletions
+18
-9
activeDetail.vue
wx_application/src/views/active/activeDetail.vue
+16
-6
activeList.vue
wx_application/src/views/active/activeList.vue
+2
-3
No files found.
wx_application/src/views/active/activeDetail.vue
View file @
927961a3
...
@@ -3,7 +3,9 @@
...
@@ -3,7 +3,9 @@
<img
class=
"bg"
src=
"../../../public/img/activeDetail_bg.jpg"
alt=
"bg"
/>
<img
class=
"bg"
src=
"../../../public/img/activeDetail_bg.jpg"
alt=
"bg"
/>
<template
v-if=
"active_type === 'coupon'"
>
<template
v-if=
"active_type === 'coupon'"
>
<div
class=
"coupon"
>
<div
class=
"coupon"
>
<div
class=
"user-icon"
>
用户头像
</div>
<div
class=
"user-icon"
>
<img
:src=
"userIcon"
alt=
"icon"
>
</div>
<p
class=
"slogan"
>
送你限量优惠券,手慢无~
</p>
<p
class=
"slogan"
>
送你限量优惠券,手慢无~
</p>
<div
class=
"coupon-content"
>
<div
class=
"coupon-content"
>
<img
src=
"../../../public/img/coupon.png"
alt=
"coupon_bg"
/>
<img
src=
"../../../public/img/coupon.png"
alt=
"coupon_bg"
/>
...
@@ -117,6 +119,7 @@ export default {
...
@@ -117,6 +119,7 @@ export default {
components
:
{
wxAuth
},
components
:
{
wxAuth
},
data
()
{
data
()
{
return
{
return
{
userIcon
:
'/img/photo.png'
,
couponDetail
:
{},
couponDetail
:
{},
game_end
:
false
,
game_end
:
false
,
res_error
:
false
,
res_error
:
false
,
...
@@ -185,11 +188,13 @@ export default {
...
@@ -185,11 +188,13 @@ export default {
this
.
currentUrl
=
location
.
href
;
this
.
currentUrl
=
location
.
href
;
this
.
active_id
=
this
.
$route
.
query
.
id
;
this
.
active_id
=
this
.
$route
.
query
.
id
;
this
.
active_type
=
this
.
$route
.
query
.
active_type
;
this
.
active_type
=
this
.
$route
.
query
.
active_type
;
this
.
userIcon
=
this
.
$route
.
query
.
headurl
?
decodeURIComponent
(
this
.
$route
.
query
.
headurl
)
:
''
;
// 验证用户是否登录
// 验证用户是否登录
if
(
!
sessionStorage
.
getItem
(
"userId"
))
{
if
(
!
sessionStorage
.
getItem
(
"userId"
))
{
// 1.获取code
// 1.获取code
if
(
this
.
$route
.
query
.
unionid
===
undefined
)
{
if
(
this
.
$route
.
query
.
unionid
===
undefined
)
{
// this.getUnionid();
console
.
log
(
'query'
,
this
.
$route
.
query
);
this
.
getUnionid
();
}
else
{
}
else
{
this
.
userBaseInfo
.
unionid
=
JSON
.
stringify
(
this
.
$route
.
query
.
unionid
);
this
.
userBaseInfo
.
unionid
=
JSON
.
stringify
(
this
.
$route
.
query
.
unionid
);
this
.
userBaseInfo
.
openid
=
JSON
.
stringify
(
this
.
$route
.
query
.
openid
);
this
.
userBaseInfo
.
openid
=
JSON
.
stringify
(
this
.
$route
.
query
.
openid
);
...
@@ -273,8 +278,6 @@ export default {
...
@@ -273,8 +278,6 @@ export default {
if
(
this
.
active_type
===
"wheel"
)
{
if
(
this
.
active_type
===
"wheel"
)
{
let
cur_date
=
new
Date
();
let
cur_date
=
new
Date
();
let
end_time
=
new
Date
(
this
.
timeLine
);
let
end_time
=
new
Date
(
this
.
timeLine
);
console
.
log
(
cur_date
);
console
.
log
(
end_time
);
if
(
end_time
-
cur_date
>
0
)
{
if
(
end_time
-
cur_date
>
0
)
{
this
.
timer
=
setInterval
(()
=>
{
this
.
timer
=
setInterval
(()
=>
{
CoutDown
(
this
.
timeLine
);
CoutDown
(
this
.
timeLine
);
...
@@ -288,7 +291,6 @@ export default {
...
@@ -288,7 +291,6 @@ export default {
},
},
handleCheckAuth
()
{
handleCheckAuth
()
{
this
.
showAuthDialog
=
false
;
this
.
showAuthDialog
=
false
;
// this.getUnionid();
},
},
getUnionid
()
{
getUnionid
()
{
let
redirect_uri
=
encodeURIComponent
(
let
redirect_uri
=
encodeURIComponent
(
...
@@ -297,7 +299,8 @@ export default {
...
@@ -297,7 +299,8 @@ export default {
window
.
location
.
href
=
`http://wxsyls.oysd.cn/getwxuserinfo.aspx?jump=
${
redirect_uri
}
`
;
window
.
location
.
href
=
`http://wxsyls.oysd.cn/getwxuserinfo.aspx?jump=
${
redirect_uri
}
`
;
},
},
Start_Game
()
{
Start_Game
()
{
if
(
this
.
$route
.
query
.
iswxClient
===
"false"
)
{
// 在微信端打开 会有身份验证 路径中会带上 unionid
if
(
this
.
$route
.
query
.
unionid
===
undefined
)
{
this
.
$toast
(
"企业微信端不能参与抽奖活动"
);
this
.
$toast
(
"企业微信端不能参与抽奖活动"
);
return
;
return
;
}
}
...
@@ -410,6 +413,11 @@ export default {
...
@@ -410,6 +413,11 @@ export default {
border-radius
:
50%
;
border-radius
:
50%
;
background
:
#fff
;
background
:
#fff
;
// filter: blur(2px);
// filter: blur(2px);
img
{
width
:
100%
;
height
:
100%
;
border-radius
:
50%
;
}
}
}
.slogan
{
.slogan
{
...
@@ -440,6 +448,7 @@ export default {
...
@@ -440,6 +448,7 @@ export default {
justify-content
:
space-around
;
justify-content
:
space-around
;
align-items
:
center
;
align-items
:
center
;
.money
{
.money
{
text-align
:
center
;
font-size
:
32px
;
font-size
:
32px
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
...
@@ -447,6 +456,7 @@ export default {
...
@@ -447,6 +456,7 @@ export default {
height
:
70px
;
height
:
70px
;
}
}
.other
{
.other
{
padding-left
:
15px
;
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
400
;
font-weight
:
400
;
p
{
p
{
...
...
This diff is collapsed.
Click to expand it.
wx_application/src/views/active/activeList.vue
View file @
927961a3
...
@@ -64,7 +64,7 @@ import * as API_Active from "@/api/active";
...
@@ -64,7 +64,7 @@ import * as API_Active from "@/api/active";
export
default
{
export
default
{
data
()
{
data
()
{
return
{
return
{
flag
:
1
,
flag
:
2
,
wheelActive_limit
:
3
,
wheelActive_limit
:
3
,
wheelList_finished
:
false
,
wheelList_finished
:
false
,
couponActive_limit
:
3
,
couponActive_limit
:
3
,
...
@@ -149,8 +149,7 @@ export default {
...
@@ -149,8 +149,7 @@ export default {
path
:
"/activeDetail"
,
path
:
"/activeDetail"
,
query
:
{
query
:
{
id
:
active_id
,
id
:
active_id
,
active_type
:
type
,
active_type
:
type
iswxClient
:
"false"
}
}
});
});
}
}
...
...
This diff is collapsed.
Click to expand it.
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