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
4e8550c8
Commit
4e8550c8
authored
Jun 10, 2019
by
华国豪
🙄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完成任务
parent
d75bb90c
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
13 additions
and
7 deletions
+13
-7
IceCreamTask.vue
src/components/taskPage/IceCream/IceCreamTask.vue
+2
-2
assignment.vue
src/components/taskPage/IceCream/assignment.vue
+4
-1
myExchange.vue
src/components/taskPage/IceCream/myExchange.vue
+4
-1
raffleTickets.vue
src/components/taskPage/IceCream/raffleTickets.vue
+2
-2
index.js
src/plugins/index.js
+1
-1
No files found.
src/components/taskPage/IceCream/IceCreamTask.vue
View file @
4e8550c8
...
@@ -247,11 +247,11 @@
...
@@ -247,11 +247,11 @@
<!-- 全家桶 -->
<!-- 全家桶 -->
<allHome
v-show=
"allHomeShow"
@
closeMyWindow=
"closeMyWindow"
name=
'allHome'
/>
<allHome
v-show=
"allHomeShow"
@
closeMyWindow=
"closeMyWindow"
name=
'allHome'
/>
<!-- 抽奖券 -->
<!-- 抽奖券 -->
<
raffleTickets
v-show=
"raffleTicketsShow"
@
closeMyWindow=
"closeMyWindow"
name=
'raffleTickets'
/
>
<
!-- <raffleTickets v-if="raffleTicketsShow" @closeMyWindow="closeMyWindow" name='raffleTickets'/> --
>
<!-- 我的兑换 -->
<!-- 我的兑换 -->
<myExchange
v-if=
"myExchangeShow"
@
closeMyWindow=
"closeMyWindow"
:ActivityID=
'ActivityInfo.id'
:zoom=
"zoom"
name=
'myExchange'
/>
<myExchange
v-if=
"myExchangeShow"
@
closeMyWindow=
"closeMyWindow"
:ActivityID=
'ActivityInfo.id'
:zoom=
"zoom"
name=
'myExchange'
/>
<!-- 我的任务 -->
<!-- 我的任务 -->
<myAssignment
v-
show
=
"myAssignmentShow"
@
closeMyWindow=
"closeMyWindow"
:zoom=
"zoom"
name=
'myAssignment'
/>
<myAssignment
v-
if
=
"myAssignmentShow"
@
closeMyWindow=
"closeMyWindow"
:zoom=
"zoom"
name=
'myAssignment'
/>
<!-- 签到 -->
<!-- 签到 -->
<signCalendar
v-if=
"signCalendarShow"
@
closeMyWindow=
"closeMyWindow"
:ActivityID=
'ActivityInfo.id'
:zoom=
"zoom"
name=
'signCalendar'
/>
<signCalendar
v-if=
"signCalendarShow"
@
closeMyWindow=
"closeMyWindow"
:ActivityID=
'ActivityInfo.id'
:zoom=
"zoom"
name=
'signCalendar'
/>
<!-- 我的冰淇淋 -->
<!-- 我的冰淇淋 -->
...
...
src/components/taskPage/IceCream/assignment.vue
View file @
4e8550c8
...
@@ -121,7 +121,7 @@
...
@@ -121,7 +121,7 @@
<p
class=
"_info"
>
{{
item
.
awardMaterials
}}
</p>
<p
class=
"_info"
>
{{
item
.
awardMaterials
}}
</p>
</div>
</div>
<div
class=
"item_btn"
>
<div
class=
"item_btn"
>
<img
v-if=
"item.taskStatus === 0"
src=
"../../../assets/img/task/renwu_qu.png"
alt
>
<img
v-if=
"item.taskStatus === 0"
src=
"../../../assets/img/task/renwu_qu.png"
@
click=
"goUrl(item.taskLink)"
>
<span
class=
"_gray _green"
v-else-if=
"item.taskStatus === 1"
>
已完成
</span>
<span
class=
"_gray _green"
v-else-if=
"item.taskStatus === 1"
>
已完成
</span>
<span
class=
"_gray"
v-else
>
未完成
</span>
<span
class=
"_gray"
v-else
>
未完成
</span>
</div>
</div>
...
@@ -170,6 +170,9 @@ export default {
...
@@ -170,6 +170,9 @@ export default {
},
},
close
:
function
()
{
close
:
function
()
{
this
.
$emit
(
"closeMyWindow"
,
"myAssignment"
);
this
.
$emit
(
"closeMyWindow"
,
"myAssignment"
);
},
goUrl
:
function
(
path
)
{
this
.
$router
.
push
({
path
:
path
});
}
}
},
},
mounted
()
{
mounted
()
{
...
...
src/components/taskPage/IceCream/myExchange.vue
View file @
4e8550c8
...
@@ -92,7 +92,7 @@
...
@@ -92,7 +92,7 @@
<div
class=
"item_img"
>
<div
class=
"item_img"
>
<img
:src=
"item.imgs"
alt=
""
>
<img
:src=
"item.imgs"
alt=
""
>
</div>
</div>
<span
class=
"item_name"
>
{{
item
.
name
}}
</span>
<span
class=
"item_name"
@
click=
"goUrl('myPointOrder')"
>
{{
item
.
name
}}
</span>
</div>
</div>
</div>
</div>
<div
@
mouseover=
"closeShow = 1"
@
mouseout=
"closeShow = 2"
class=
"myExchange_close"
@
click=
"close"
>
<div
@
mouseover=
"closeShow = 1"
@
mouseout=
"closeShow = 2"
class=
"myExchange_close"
@
click=
"close"
>
...
@@ -133,6 +133,9 @@ export default {
...
@@ -133,6 +133,9 @@ export default {
close
:
function
()
{
close
:
function
()
{
this
.
$emit
(
'closeMyWindow'
,
'Exchange'
)
this
.
$emit
(
'closeMyWindow'
,
'Exchange'
)
},
},
goUrl
:
function
(
path
)
{
this
.
$router
.
push
({
path
:
path
});
}
},
mounted
(){
},
mounted
(){
this
.
getActivityGoods
()
this
.
getActivityGoods
()
}
}
...
...
src/components/taskPage/IceCream/raffleTickets.vue
View file @
4e8550c8
...
@@ -61,8 +61,8 @@
...
@@ -61,8 +61,8 @@
<div
class=
"raffleTickets_bg"
>
<div
class=
"raffleTickets_bg"
>
<div>
<div>
<div
class=
"tips"
>
<div
class=
"tips"
>
<p>
抽奖券
</p>
<p>
{{
raffleTicketsData
.
mName
}}
</p>
<
p
class=
"small"
>
仅限于(2019年8月21日 21:)“ 狂欢夜·瓜分百万现金 ”活动中使用
</p
>
<
!--
<p
class=
"small"
>
仅限于(2019年8月21日 21:)“ 狂欢夜·瓜分百万现金 ”活动中使用
</p>
--
>
</div>
</div>
</div>
</div>
<img
@
click=
"close"
src=
"../../../assets/img/task/des_close.png"
alt=
""
>
<img
@
click=
"close"
src=
"../../../assets/img/task/des_close.png"
alt=
""
>
...
...
src/plugins/index.js
View file @
4e8550c8
...
@@ -31,7 +31,7 @@ export default {
...
@@ -31,7 +31,7 @@ export default {
DomainUrl
:
domainUrl
,
DomainUrl
:
domainUrl
,
//常用提交数据URL
//常用提交数据URL
PostUrl
:
domainUrl
+
"/api/common/post"
,
PostUrl
:
domainUrl
+
"/api/common/post"
,
javaUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://efficient.oytour.com"
:
"http://47.96.12.235:9001"
)
:
"http://192.168.2.
215
:9000"
,
javaUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
(
locationName
.
indexOf
(
'oytour'
)
!==
-
1
?
"http://efficient.oytour.com"
:
"http://47.96.12.235:9001"
)
:
"http://192.168.2.
106
:9000"
,
ViittoFileUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://imgfile.oytour.com"
:
'http://192.168.2.214:8130'
,
ViittoFileUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://imgfile.oytour.com"
:
'http://192.168.2.214:8130'
,
UploadUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://upload.oytour.com"
:
"http://192.168.2.214:8120"
,
UploadUrl
:
locationName
.
indexOf
(
'oytour'
)
!==
-
1
||
locationName
.
indexOf
(
'viitto'
)
!==
-
1
?
"http://upload.oytour.com"
:
"http://192.168.2.214:8120"
,
LocalFileStreamDownLoadUrl
:
domainUrl
+
"/api/file/GetFileFromWebApi"
,
LocalFileStreamDownLoadUrl
:
domainUrl
+
"/api/file/GetFileFromWebApi"
,
...
...
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