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
187e8ed5
Commit
187e8ed5
authored
Jun 17, 2019
by
huangyuanyuan
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://gitlab.oytour.com/huaguohao/athena
parents
6b838f0f
632b7aeb
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
9 deletions
+9
-9
Home.vue
src/components/Home.vue
+3
-3
newHead.vue
src/components/global/newHead.vue
+2
-2
HomePage.vue
src/components/newPersonalCenter/block/HomePage.vue
+4
-4
No files found.
src/components/Home.vue
View file @
187e8ed5
...
...
@@ -451,15 +451,15 @@
</div>
</div>
<el-row
style=
"margin: 20px 0;cursor: pointer;"
>
<!-- 冰糕活动跳转 -->
<
!--
<
el-row
style=
"margin: 20px 0;cursor: pointer;"
>
<img
@
click=
"FootgoUrl('IceCreamTask')"
class=
"huodong_img"
src=
"../assets/img/active/huodong_img1.png"
alt
>
</
el-row
>
</
!
-->
--
>
<!-- 景点门票 -->
<div
class=
"Ticket_spots"
>
<ul
class=
"common_ul_tab"
>
...
...
src/components/global/newHead.vue
View file @
187e8ed5
...
...
@@ -267,12 +267,12 @@
</div>
</li>
<!-- 活动中心 -->
<li
:class=
"{_active: navActive === 9}"
style=
"width: auto;"
>
<
!-- <
li :class="{_active: navActive === 9}" style="width: auto;">
<div @click="handleSelect('/IceCreamTask', 9), navActive = 9">
<img style="z-index: -1;position: absolute;top: -27px;" src="../../assets/img/task/nav_bg.png" alt="">
<img src="../../assets/img/task/nav_text.png" alt="">
</div>
</li>
</li>
-->
</ul>
</div>
</el-row>
...
...
src/components/newPersonalCenter/block/HomePage.vue
View file @
187e8ed5
...
...
@@ -10,22 +10,22 @@
<!-- 订单信息 -->
<OrderInfo/>
<!-- 活动链接 -->
<
!--
<
el-row
class=
"active"
>
<el-row
class=
"active"
>
<img
@
click=
"goUrl('TurnaroundDraw')"
class=
"huodong_img"
src=
"../../../assets/img/active/huodong_img.png"
alt
>
</el-row>
-->
<el-row
class=
"active"
>
</el-row>
<
!--
<
el-row
class=
"active"
>
<img
@
click=
"goUrl('IceCreamTask')"
class=
"huodong_img"
src=
"../../../assets/img/active/huodong_img2.png"
alt
>
</el-row>
</el-row>
-->
<!-- 即将过期优惠券 -->
<OverCoupon/>
</el-col>
...
...
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