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
c77770c8
Commit
c77770c8
authored
Sep 29, 2019
by
黄媛媛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
23b72ea9
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
5 deletions
+12
-5
huaxue1.jpg
src/assets/img/juan/huaxue1.jpg
+0
-0
huaxue2.jpg
src/assets/img/juan/huaxue2.jpg
+0
-0
Home.vue
src/components/Home.vue
+5
-0
JuanSaid.vue
src/components/taskPage/JuanSaid.vue
+6
-4
loginNationalDay.vue
src/views/loginNationalDay.vue
+1
-1
No files found.
src/assets/img/juan/huaxue1.jpg
0 → 100644
View file @
c77770c8
683 KB
src/assets/img/juan/huaxue2.jpg
0 → 100644
View file @
c77770c8
433 KB
src/components/Home.vue
View file @
c77770c8
...
...
@@ -2,6 +2,11 @@
<div
v-loading=
"PageLoad"
class=
"Home commonF"
>
<div
class=
"Home_top"
>
<el-carousel
arrow=
"always"
height=
"300px"
:interval=
"10000"
trigger=
"click"
:style=
"
{'background':'#ddd'}">
<el-carousel-item>
<a
style=
"display:block;height:100%"
href=
"http://www.oytour.com/#/Juanski"
target=
"_blank"
>
<img
src=
'../assets/img/juan/huaxue1.jpg'
>
</a>
</el-carousel-item>
<el-carousel-item>
<a
style=
"display:block;height:100%"
href=
"http://www.oytour.com/#/FoodImg2"
target=
"_blank"
>
<img
src=
'../assets/img/juan/qiufenghuodong.jpg'
>
...
...
src/components/taskPage/JuanSaid.vue
View file @
c77770c8
...
...
@@ -5,7 +5,7 @@
transition
:
all
0.6s
;
}
.tst-one
{
background
:
url('../../assets/img/juan/
bg4_1
.jpg')
100%
center
;
background
:
url('../../assets/img/juan/
tuan4
.jpg')
100%
center
;
background-size
:
cover
;
}
.tst-two
{
...
...
@@ -25,7 +25,7 @@
background-size
:
cover
;
}
.tst-huaxue
{
background
:
url('../../assets/img/juan/huaxue.jpg')
100%
center
;
background
:
url('../../assets/img/juan/huaxue
2
.jpg')
100%
center
;
background-size
:
cover
;
}
...
...
@@ -356,6 +356,8 @@
<p
class=
"f30"
style=
"text-align:center;margin-top:100px"
>
本季
<span
style=
"color:#EE4454"
>
. 精选特惠
</span></p>
<p
class=
"f20"
style=
"color:#999999;text-align:center"
>
Selected Recommendation
</p>
<div
class=
"jxth destiDiv basefix"
>
<div
@
click=
"goUrl('Juanski')"
class=
"destiItem tst-huaxue"
>
</div>
<div
@
click=
"goUrl('FoodImg4')"
class=
"destiItem tst-one"
>
</div>
<div
@
click=
"goUrl('Fire')"
class=
"destiItem tst-two"
>
...
...
@@ -366,8 +368,8 @@
</div>
-->
<div
@
click=
"goUrl('Img5')"
class=
"destiItem tst-five"
>
</div>
<div
@
click=
"goUrl('Juanski')"
class=
"destiItem tst-huaxue"
>
</div>
<
!--
<
div
@
click=
"goUrl('Juanski')"
class=
"destiItem tst-huaxue"
>
</div>
-->
<!--
<div
class=
"destiItem"
>
<img
src=
"../../assets/img/home/tour1.png"
alt=
""
>
</div>
...
...
src/views/loginNationalDay.vue
View file @
c77770c8
...
...
@@ -441,7 +441,7 @@ export default {
let
Height
=
window
.
innerHeight
this
.
zoom
=
(
Math
.
round
((
Height
/
1080
)
*
100
)
/
100
)
+
0.1
let
autoLogin
=
localStorage
.
autoLogin
?
JSON
.
parse
(
localStorage
.
autoLogin
)
:
null
console
.
log
(
"this.zoom"
,
this
.
zoom
)
//
console.log("this.zoom",this.zoom)
this
.
loginMsg
.
account
=
autoLogin
?
autoLogin
.
acc
:
''
this
.
loginMsg
.
password
=
autoLogin
?
autoLogin
.
pwd
:
''
this
.
checked
=
autoLogin
?
true
:
false
...
...
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