Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
Athena
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
华国豪
Athena
Commits
44a06396
Commit
44a06396
authored
May 31, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增弹窗列表
parent
310b38c7
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
141 additions
and
3 deletions
+141
-3
hebing.png
src/assets/img/task/hebing.png
+0
-0
hebing1.png
src/assets/img/task/hebing1.png
+0
-0
quanlist.png
src/assets/img/task/quanlist.png
+0
-0
weishiyong.png
src/assets/img/task/weishiyong.png
+0
-0
weishiyong2.png
src/assets/img/task/weishiyong2.png
+0
-0
yishiyong.png
src/assets/img/task/yishiyong.png
+0
-0
yishiyong2.png
src/assets/img/task/yishiyong2.png
+0
-0
yishiyongzhang.png
src/assets/img/task/yishiyongzhang.png
+0
-0
IceCreamTask.vue
src/components/taskPage/IceCream/IceCreamTask.vue
+16
-2
myTicket.vue
src/components/taskPage/IceCream/myTicket.vue
+4
-1
ticketList.vue
src/components/taskPage/IceCream/ticketList.vue
+121
-0
No files found.
src/assets/img/task/hebing.png
0 → 100644
View file @
44a06396
7.01 KB
src/assets/img/task/hebing1.png
0 → 100644
View file @
44a06396
6.58 KB
src/assets/img/task/quanlist.png
0 → 100644
View file @
44a06396
40.8 KB
src/assets/img/task/weishiyong.png
0 → 100644
View file @
44a06396
6.48 KB
src/assets/img/task/weishiyong2.png
0 → 100644
View file @
44a06396
8.41 KB
src/assets/img/task/yishiyong.png
0 → 100644
View file @
44a06396
6.22 KB
src/assets/img/task/yishiyong2.png
0 → 100644
View file @
44a06396
8.01 KB
src/assets/img/task/yishiyongzhang.png
0 → 100644
View file @
44a06396
5.42 KB
src/components/taskPage/IceCream/IceCreamTask.vue
View file @
44a06396
...
@@ -182,7 +182,9 @@
...
@@ -182,7 +182,9 @@
</div>
</div>
</div>
</div>
<!-- 我的奖券 -->
<!-- 我的奖券 -->
<myTicket
v-show=
"myTicketShow"
@
closeMyWindow=
"closeMyWindow"
name=
'Ticket'
/>
<myTicket
v-show=
"myTicketShow"
@
closeMyWindow=
"closeMyWindow"
@
openList=
"openList"
name=
'Ticket'
/>
<!-- 奖券列表 -->
<ticketList
v-show=
"ticketShow"
:ticketId=
'ticketId'
@
closeMyWindow=
"closeMyWindow"
/>
<!-- 活动说明 -->
<!-- 活动说明 -->
<description
v-show=
"descriptionShow"
:data=
"info"
@
closeMyWindow=
"closeMyWindow"
name=
'Active'
/>
<description
v-show=
"descriptionShow"
:data=
"info"
@
closeMyWindow=
"closeMyWindow"
name=
'Active'
/>
<!-- 全家桶 -->
<!-- 全家桶 -->
...
@@ -196,19 +198,23 @@ import myTicket from './myTicket'
...
@@ -196,19 +198,23 @@ import myTicket from './myTicket'
import
description
from
'./description'
import
description
from
'./description'
import
allHome
from
'./allHome'
import
allHome
from
'./allHome'
import
raffleTickets
from
'./raffleTickets'
import
raffleTickets
from
'./raffleTickets'
import
ticketList
from
'./ticketList'
export
default
{
export
default
{
components
:
{
components
:
{
myTicket
,
myTicket
,
description
,
description
,
allHome
,
allHome
,
raffleTickets
raffleTickets
,
ticketList
},
},
data
(){
data
(){
return
{
return
{
ticketId
:
0
,
myTicketShow
:
false
,
myTicketShow
:
false
,
descriptionShow
:
false
,
descriptionShow
:
false
,
allHomeShow
:
false
,
allHomeShow
:
false
,
raffleTicketsShow
:
true
,
raffleTicketsShow
:
true
,
ticketShow
:
false
,
info
:
'瓜分现金作为本次获得的爆点,吸引用户。能领到抽奖券的用户,肯定是已经交过客人,大部分会是交过10个人以上的用户,小概率会有人没有交到10个人的,所以看看能不能做0.88+8.8+18.8+68.8+288的现金红包(68的设定30个以内,288设定1个),其它都是小红包的,交客数量最多的前三随机获得288,前50随机获得68,其他人获得小红包。'
,
info
:
'瓜分现金作为本次获得的爆点,吸引用户。能领到抽奖券的用户,肯定是已经交过客人,大部分会是交过10个人以上的用户,小概率会有人没有交到10个人的,所以看看能不能做0.88+8.8+18.8+68.8+288的现金红包(68的设定30个以内,288设定1个),其它都是小红包的,交客数量最多的前三随机获得288,前50随机获得68,其他人获得小红包。'
,
list
:
[
list
:
[
{
{
...
@@ -234,6 +240,11 @@ export default {
...
@@ -234,6 +240,11 @@ export default {
]
]
}
}
},
methods
:{
},
methods
:{
openList
:
function
(
id
)
{
this
.
ticketId
=
id
this
.
myTicketShow
=
false
this
.
ticketShow
=
true
},
openLayer
:
function
(
obj
)
{
openLayer
:
function
(
obj
)
{
if
(
obj
.
id
===
2
)
{
if
(
obj
.
id
===
2
)
{
this
.
myTicketShow
=
true
;
this
.
myTicketShow
=
true
;
...
@@ -248,6 +259,9 @@ export default {
...
@@ -248,6 +259,9 @@ export default {
this
.
allHomeShow
=
false
this
.
allHomeShow
=
false
}
else
if
(
val
===
'raffleTickets'
)
{
}
else
if
(
val
===
'raffleTickets'
)
{
this
.
raffleTicketsShow
=
false
this
.
raffleTicketsShow
=
false
}
else
if
(
val
===
'ticket'
)
{
this
.
ticketShow
=
false
this
.
myTicketShow
=
true
}
}
}
}
},
mounted
(){
},
mounted
(){
...
...
src/components/taskPage/IceCream/myTicket.vue
View file @
44a06396
...
@@ -71,7 +71,7 @@
...
@@ -71,7 +71,7 @@
<div
class=
"item_img"
>
<div
class=
"item_img"
>
<img
:src=
"item.src"
alt=
""
>
<img
:src=
"item.src"
alt=
""
>
</div>
</div>
<span
class=
"item_name"
>
{{
item
.
name
}}
</span>
<span
class=
"item_name"
@
click=
"openList(item.id)"
>
{{
item
.
name
}}
</span>
</div>
</div>
</div>
</div>
<div
@
mouseover=
"closeShow = 1"
@
mouseout=
"closeShow = 2"
class=
"myTicket_close"
@
click=
"close"
>
<div
@
mouseover=
"closeShow = 1"
@
mouseout=
"closeShow = 2"
class=
"myTicket_close"
@
click=
"close"
>
...
@@ -123,6 +123,9 @@ export default {
...
@@ -123,6 +123,9 @@ export default {
},
methods
:{
},
methods
:{
close
:
function
()
{
close
:
function
()
{
this
.
$emit
(
'closeMyWindow'
,
'Ticket'
)
this
.
$emit
(
'closeMyWindow'
,
'Ticket'
)
},
openList
:
function
(
id
)
{
this
.
$emit
(
'openList'
,
id
)
}
}
},
mounted
(){
},
mounted
(){
...
...
src/components/taskPage/IceCream/ticketList.vue
0 → 100644
View file @
44a06396
<
style
>
.ticketList
{
width
:
100%
;
height
:
100%
;
background
:
rgba
(
0
,
0
,
0
,
.5
);
position
:
absolute
;
left
:
0
;
top
:
0
;
z-index
:
2018
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
.ticketList
.ticketList_bg
{
height
:
538px
;
width
:
300px
;
background
:
url('../../../assets/img/task/quanlist.png')
;
background-size
:
100%
100%
;
position
:
relative
;
}
.ticketList
.ticketList_close
{
position
:
absolute
;
right
:
-10px
;
top
:
-10px
;
cursor
:
pointer
;
}
.ticketList
.ticketList_close
img
{
width
:
36px
;
height
:
37px
;
}
.ticketList
.ticketList_box
{
padding
:
10px
;
}
.ticketList
.ticketList_tit
{
width
:
280px
;
height
:
85px
;
background
:
rgba
(
255
,
255
,
255
,
.68
);
border-top-left-radius
:
21px
;
border-top-right-radius
:
21px
;
}
.ticketList
.ticketList_tit
.top_btn
{
display
:
flex
;
justify-content
:
space-between
;
align-items
:
center
;
height
:
52px
;
padding
:
4px
8px
0
;
border-bottom
:
2px
dashed
rgba
(
255
,
148
,
21
,
1
);
}
.ticketList
.ticketList_tit
.top_btn
img
{
width
:
127px
;
height
:
40px
;
cursor
:
pointer
;
}
.ticketList
.el-checkbox__inner
{
border-radius
:
50%
;
}
</
style
>
<
template
>
<div
class=
"ticketList"
>
<div
class=
"ticketList_bg"
>
<div
class=
"ticketList_box"
>
<div
class=
"ticketList_tit"
>
<div
class=
"top_btn"
>
<div>
<img
v-if=
"activeNav === 1"
src=
"../../../assets/img/task/weishiyong2.png"
alt=
""
>
<img
v-else
@
click=
"activeNav = 1"
src=
"../../../assets/img/task/weishiyong.png"
alt=
""
>
</div>
<div>
<img
v-if=
"activeNav === 2"
src=
"../../../assets/img/task/yishiyong2.png"
alt=
""
>
<img
v-else
@
click=
"activeNav = 2"
src=
"../../../assets/img/task/yishiyong.png"
alt=
""
>
</div>
</div>
<div>
<el-checkbox
:indeterminate=
"isIndeterminate"
v-model=
"checkAll"
@
change=
"handleCheckAllChange"
>
全选
</el-checkbox>
<span>
合并
</span>
</div>
</div>
<div>
<el-checkbox-group
v-model=
"checkedCities"
@
change=
"handleCheckedCitiesChange"
>
<el-checkbox
v-for=
"city in cities"
:label=
"city"
:key=
"city"
>
{{
city
}}
</el-checkbox>
</el-checkbox-group>
</div>
</div>
<div
@
mouseover=
"closeShow = 1"
@
mouseout=
"closeShow = 2"
class=
"ticketList_close"
@
click=
"close"
>
<img
v-if=
"closeShow === 2"
src=
"../../../assets/img/task/close.png"
alt=
""
>
<img
v-else
src=
"../../../assets/img/task/close2.png"
alt=
""
>
</div>
</div>
</div>
</
template
>
<
script
>
const
cityOptions
=
[
'上海'
,
'北京'
,
'广州'
,
'深圳'
];
export
default
{
props
:
[
'id'
],
data
()
{
return
{
closeShow
:
1
,
activeNav
:
1
,
heckAll
:
false
,
checkedCities
:
[
'上海'
,
'北京'
],
cities
:
cityOptions
,
isIndeterminate
:
true
}
},
methods
:{
handleCheckAllChange
(
val
)
{
this
.
checkedCities
=
val
?
cityOptions
:
[];
this
.
isIndeterminate
=
false
;
},
handleCheckedCitiesChange
(
value
)
{
let
checkedCount
=
value
.
length
;
this
.
checkAll
=
checkedCount
===
this
.
cities
.
length
;
this
.
isIndeterminate
=
checkedCount
>
0
&&
checkedCount
<
this
.
cities
.
length
;
},
close
:
function
()
{
this
.
$emit
(
'closeMyWindow'
,
'ticket'
)
},
},
mounted
(){
}
}
</
script
>
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