Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vue-ssr
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
lixy
vue-ssr
Commits
e8641d31
Commit
e8641d31
authored
Aug 30, 2019
by
lixy
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
轮播样式调整
parent
56ae584e
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
89 deletions
+52
-89
main.css
assets/main.css
+3
-2
vehicleBanner.vue
components/vehicleBanner.vue
+2
-1
campsite.vue
pages/campsite.vue
+7
-9
tour.vue
pages/tour.vue
+17
-22
vehicle.vue
pages/vehicle.vue
+18
-13
_id.vue
pages/vehicleList/_id.vue
+4
-41
axios.js
plugins/axios.js
+1
-1
No files found.
assets/main.css
View file @
e8641d31
...
@@ -19,6 +19,7 @@ body {
...
@@ -19,6 +19,7 @@ body {
}
}
.r-content
h1
{
.r-content
h1
{
font-size
:
20px
;
font-size
:
20px
;
color
:
#333
;
}
}
.r-content
p
{
.r-content
p
{
padding
:
5px
0
;
padding
:
5px
0
;
...
@@ -121,7 +122,7 @@ h2{
...
@@ -121,7 +122,7 @@ h2{
align-items
:
center
;
align-items
:
center
;
}
}
.wrap
{
.wrap
{
width
:
1
20
0px
;
width
:
1
12
0px
;
margin
:
0
auto
30px
auto
;
margin
:
0
auto
30px
auto
;
background
:
#f1f1f1
;
background
:
#f1f1f1
;
/*padding: 20px;*/
/*padding: 20px;*/
...
@@ -161,7 +162,7 @@ h2{
...
@@ -161,7 +162,7 @@ h2{
padding
:
10px
;
padding
:
10px
;
}
}
.vehicle-desc
{
.vehicle-desc
{
height
:
100
px
;
height
:
93
px
;
color
:
#666
;
color
:
#666
;
font-size
:
14px
;
font-size
:
14px
;
}
}
...
...
components/vehicleBanner.vue
View file @
e8641d31
...
@@ -178,6 +178,7 @@
...
@@ -178,6 +178,7 @@
}
}
.banner
{
.banner
{
width
:
100%
;
width
:
100%
;
max-height
:
500px
;
height
:
240px
;
overflow
:
hidden
;
}
}
</
style
>
</
style
>
pages/campsite.vue
View file @
e8641d31
...
@@ -2,8 +2,7 @@
...
@@ -2,8 +2,7 @@
<div>
<div>
<menu-modal></menu-modal>
<menu-modal></menu-modal>
<div
class=
"main-container"
>
<div
class=
"main-container"
>
<banner
<vehicle-banner
v-if=
"showBanner"
:list =
"bannerList"
:list =
"bannerList"
:looptime=
"looptime"
:looptime=
"looptime"
:width=
"width"
:width=
"width"
...
@@ -16,9 +15,9 @@
...
@@ -16,9 +15,9 @@
@
change=
"changeBanner"
@
change=
"changeBanner"
@
click=
"bannerClick"
@
click=
"bannerClick"
class=
"mb-50"
>
class=
"mb-50"
>
</banner>
</
vehicle-
banner>
<div
class=
"wrap"
>
<div
class=
"wrap"
>
<div
class=
"clearfix"
style=
"background-color: #fff;padding:5px 10px"
>
<div
class=
"clearfix
total-div
"
style=
"background-color: #fff;padding:5px 10px"
>
共
{{
totalCount
}}
个房车营地
共
{{
totalCount
}}
个房车营地
<select
<select
@
change=
"chooseSelect($event)"
@
change=
"chooseSelect($event)"
...
@@ -31,7 +30,7 @@
...
@@ -31,7 +30,7 @@
</div>
</div>
<h3
v-if=
"dataNull"
style=
"margin:10px 0;margin-bottom:60px;background-color: #fff;padding:20px"
>
暂无信息
</h3>
<h3
v-if=
"dataNull"
style=
"margin:10px 0;margin-bottom:60px;background-color: #fff;padding:20px"
>
暂无信息
</h3>
<ul
class=
"campsiteDetail clearfix"
v-if=
"!dataNull"
>
<ul
class=
"campsiteDetail clearfix"
v-if=
"!dataNull"
>
<li
v-for=
"(item,idx) in dataDetail"
:key=
"idx"
style=
"
margin:15px 10px;
background-color: #fff;padding:20px"
class=
"vehicle-item"
>
<li
v-for=
"(item,idx) in dataDetail"
:key=
"idx"
style=
"background-color: #fff;padding:20px"
class=
"vehicle-item"
>
<img
:src=
"item.logo"
alt
style=
"width:100%;height:223px"
/>
<img
:src=
"item.logo"
alt
style=
"width:100%;height:223px"
/>
<h2
style=
"font-size: 16px;margin:10px 0"
>
{{
item
.
name
}}
</h2>
<h2
style=
"font-size: 16px;margin:10px 0"
>
{{
item
.
name
}}
</h2>
<nuxt-link
:to=
"item.link"
>
<nuxt-link
:to=
"item.link"
>
...
@@ -52,13 +51,13 @@
...
@@ -52,13 +51,13 @@
import
axios
from
'../plugins/axios'
;
import
axios
from
'../plugins/axios'
;
import
menuModal
from
"../components/menu"
;
import
menuModal
from
"../components/menu"
;
import
footerModal
from
"../components/footer"
;
import
footerModal
from
"../components/footer"
;
import
banner
from
"../components/b
anner"
import
vehicleBanner
from
"../components/vehicleB
anner"
export
default
{
export
default
{
transition
:
"bounce"
,
transition
:
"bounce"
,
components
:
{
components
:
{
menuModal
,
menuModal
,
footerModal
,
footerModal
,
b
anner
vehicleB
anner
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -187,14 +186,13 @@ export default {
...
@@ -187,14 +186,13 @@ export default {
padding
:
0
;
padding
:
0
;
margin
:
0
;
margin
:
0
;
list-style
:
none
;
list-style
:
none
;
margin-top
:
10px
;
}
}
.campsiteDetail
li
{
.campsiteDetail
li
{
padding
:
0
;
padding
:
0
;
margin
:
0
;
margin
:
0
;
list-style
:
none
;
list-style
:
none
;
width
:
3
0%
;
width
:
3
60px
;
float
:
left
;
float
:
left
;
}
}
...
...
pages/tour.vue
View file @
e8641d31
...
@@ -3,24 +3,23 @@
...
@@ -3,24 +3,23 @@
<menu-modal></menu-modal>
<menu-modal></menu-modal>
<div
class=
"main-container"
>
<div
class=
"main-container"
>
<div>
<div>
<banner
<vehicle-banner
v-if=
"showBanner"
:list =
"bannerList"
:list =
"bannerList"
:looptime=
"looptime"
:looptime=
"looptime"
:width=
"width"
:width=
"width"
:height=
"height"
:height=
"height"
:background=
"background"
:background=
"background"
:color=
"color"
:color=
"color"
:fontSize=
"fontSize"
:fontSize=
"fontSize"
@
prev=
"prev"
@
prev=
"prev"
@
next=
"next"
@
next=
"next"
@
change=
"changeBanner"
@
change=
"changeBanner"
@
click=
"bannerClick"
@
click=
"bannerClick"
class=
"mb-50"
>
class=
"mb-50"
>
</vehicle-banner>
</banner>
</div>
</div>
<div
class=
"wrap"
>
<div
class=
"wrap"
>
<div
class=
"clearfix"
style=
"background-color: #fff;padding:5px 10px"
>
<div
class=
"clearfix
total-div
"
style=
"background-color: #fff;padding:5px 10px"
>
共
{{
totalCount
}}
个旅行路线
共
{{
totalCount
}}
个旅行路线
<select
<select
@
change=
"chooseSelect($event)"
@
change=
"chooseSelect($event)"
...
@@ -55,13 +54,13 @@
...
@@ -55,13 +54,13 @@
import
axios
from
'../plugins/axios'
import
axios
from
'../plugins/axios'
import
menuModal
from
"../components/menu"
import
menuModal
from
"../components/menu"
import
footerModal
from
"../components/footer"
import
footerModal
from
"../components/footer"
import
banner
from
"../components/b
anner"
import
vehicleBanner
from
"../components/vehicleB
anner"
export
default
{
export
default
{
transition
:
'bounce'
,
transition
:
'bounce'
,
components
:
{
components
:
{
menuModal
,
menuModal
,
footerModal
,
footerModal
,
b
anner
vehicleB
anner
},
},
created
()
{
created
()
{
this
.
getType
();
this
.
getType
();
...
@@ -151,10 +150,6 @@
...
@@ -151,10 +150,6 @@
.clearfix
{
.clearfix
{
*
zoom
:
1
;
/*ie6清除浮动的方式 *号只有IE6-IE7执行,其他浏览器不执行*/
*
zoom
:
1
;
/*ie6清除浮动的方式 *号只有IE6-IE7执行,其他浏览器不执行*/
}
}
.wrap
{
/* background-color: #fff; */
margin-top
:
50px
;
}
.campsiteDetail
{
.campsiteDetail
{
padding
:
0
;
padding
:
0
;
...
...
pages/vehicle.vue
View file @
e8641d31
...
@@ -22,12 +22,12 @@
...
@@ -22,12 +22,12 @@
</div>
</div>
<ul
class=
"campsiteDetail clearfix"
>
<ul
class=
"campsiteDetail clearfix"
>
<li
v-for=
"item in dataDetail"
:key=
"item.id"
class=
"vehicle-item"
>
<li
v-for=
"item in dataDetail"
:key=
"item.id"
class=
"vehicle-item"
>
<img
:src=
"item.coverPic"
alt=
"房车租赁"
style=
"width:30%;height:100%;
"
/>
<img
class=
"v-img-cover"
:src=
"item.coverPic"
alt=
"房车租赁
"
/>
<div
style=
"margin-left: 20px;width:
50%
;"
>
<div
style=
"margin-left: 20px;width:
800px
;"
>
<h2
style=
"font-size: 18px;margin:10px 0"
>
{{
item
.
name
}}
</h2>
<h2
style=
"font-size: 18px;margin:10px 0"
>
{{
item
.
name
}}
</h2>
<div
class=
"vehicle-desc"
>
{{
item
.
intro
}}
</div>
<div
class=
"vehicle-desc"
>
{{
item
.
intro
}}
</div>
<div
class=
"flex-aic"
>
<div
class=
"flex-aic"
>
<span
class=
"flex-aic config"
v-for=
"
iitem
in item.uccnCataList"
:key=
"iitem.id"
>
<span
class=
"flex-aic config"
v-for=
"
(iitem,iindex)
in item.uccnCataList"
:key=
"iitem.id"
>
<img
v-if=
"iindex==0"
src=
"../assets/images/license.png"
/>
<img
v-if=
"iindex==0"
src=
"../assets/images/license.png"
/>
<img
v-if=
"iindex==1"
src=
"../assets/images/license.png"
/>
<img
v-if=
"iindex==1"
src=
"../assets/images/license.png"
/>
<img
v-if=
"iindex==2"
src=
"../assets/images/driver-type.png"
/>
<img
v-if=
"iindex==2"
src=
"../assets/images/driver-type.png"
/>
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
</div>
</div>
</div>
</div>
<nuxt-link
:to=
"item.link"
class=
"flex-aic"
>
<nuxt-link
:to=
"item.link"
class=
"flex-aic"
>
<button
class=
"buttonDetails"
>
租车详情
</button>
<button
class=
"buttonDetails"
>
租车详情
<
img
style=
"position: absolute;"
src=
"../assets/images/r-9.png"
/><
/button>
</nuxt-link>
</nuxt-link>
</li>
</li>
</ul>
</ul>
...
@@ -184,6 +184,10 @@
...
@@ -184,6 +184,10 @@
/* background-color: #fff; */
/* background-color: #fff; */
text-align
:
center
;
text-align
:
center
;
}
}
.v-img-cover
{
width
:
190px
;
height
:
122px
;
}
.banner
h2
{
.banner
h2
{
font-size
:
20px
;
font-size
:
20px
;
...
@@ -214,14 +218,15 @@
...
@@ -214,14 +218,15 @@
}
}
.buttonDetails
{
.buttonDetails
{
width
:
156px
;
/* 宽度 */
width
:
116px
;
height
:
35px
;
/* 高度 */
height
:
34px
;
border-width
:
0px
;
/* 边框宽度 */
border-width
:
0px
;
background
:
#1bbb9f
;
/* 背景颜色 */
background
:
#1bbb9f
;
cursor
:
pointer
;
/* 鼠标移入按钮范围时出现手势 */
cursor
:
pointer
;
outline
:
none
;
/* 不显示轮廓线 */
outline
:
none
;
font-family
:
Microsoft
YaHei
;
/* 设置字体 */
font-family
:
Microsoft
YaHei
;
color
:
white
;
/* 字体颜色 */
color
:
white
;
margin-left
:
10px
;
font-size
:
14px
;
padding-right
:
15px
;
}
}
</
style
>
</
style
>
pages/vehicleList/_id.vue
View file @
e8641d31
...
@@ -9,12 +9,12 @@
...
@@ -9,12 +9,12 @@
<span>
{{
detail
.
name
}}
</span>
<span>
{{
detail
.
name
}}
</span>
</div>
</div>
<div
style=
"display: flex;padding: 20px;background: #fff"
>
<div
style=
"display: flex;padding: 20px;background: #fff"
>
<div
style=
"width:5
0%
"
>
<div
style=
"width:5
40px;"
class=
"tc
"
>
<div
class=
"gallery-top-box"
style=
"width:100%"
>
<div
class=
"gallery-top-box"
style=
"width:100%"
>
<div
class=
"swiper-container gallery-top"
style=
"width: 100%"
ref=
"mySwiper"
>
<div
class=
"swiper-container gallery-top"
style=
"width: 100%"
ref=
"mySwiper"
>
<div
class=
"swiper-wrapper"
>
<div
class=
"swiper-wrapper"
>
<div
class=
"swiper-slide"
v-for=
"item in detail.pictureList"
:key=
"item"
>
<div
class=
"swiper-slide"
v-for=
"item in detail.pictureList"
:key=
"item"
>
<img
:src=
"item"
style=
"width:100%"
>
<img
:src=
"item"
>
</div>
</div>
</div>
</div>
</div>
</div>
...
@@ -121,47 +121,10 @@
...
@@ -121,47 +121,10 @@
let
pic
=
data
.
data
.
picture
.
split
(
","
);
let
pic
=
data
.
data
.
picture
.
split
(
","
);
user
.
pictureList
=
pic
;
user
.
pictureList
=
pic
;
user
.
pictureNum
=
pic
.
length
;
user
.
pictureNum
=
pic
.
length
;
user
.
buyPrice
=
parseFloat
((
user
.
buyPrice
/
10000
).
toFixed
(
2
))
if
(
!
user
)
{
if
(
!
user
)
{
return
error
({
message
:
'User not found'
,
statusCode
:
404
})
return
error
({
message
:
'User not found'
,
statusCode
:
404
})
}
}
user
.
uccnCataList
=
[
{
"id"
:
222
,
"parentId"
:
14
,
"name"
:
"5乘5卧"
,
"rank"
:
0
,
"level"
:
2
,
"state"
:
0
,
"crtTime"
:
1563939065861
,
"updTime"
:
1564036600207
,
"isMore"
:
0
,
"startUsing"
:
0
},
{
"id"
:
10
,
"parentId"
:
7
,
"name"
:
"自动C型"
,
"rank"
:
2
,
"level"
:
2
,
"state"
:
0
,
"crtTime"
:
1558516580
,
"updTime"
:
1563243972473
,
"isMore"
:
0
,
"startUsing"
:
0
},
{
"id"
:
12
,
"parentId"
:
11
,
"name"
:
"C1"
,
"rank"
:
1
,
"level"
:
2
,
"state"
:
0
,
"crtTime"
:
1558516665
,
"updTime"
:
1561624250887
,
"isMore"
:
0
,
"startUsing"
:
0
}
];
let
tempBannerData
=
await
axios
.
get
(
'/api/uccn/random/list/app/unauth/get?type=1'
);
let
tempBannerData
=
await
axios
.
get
(
'/api/uccn/random/list/app/unauth/get?type=1'
);
let
hot
=
tempBannerData
.
data
.
data
;
let
hot
=
tempBannerData
.
data
.
data
;
hot
.
map
(
function
(
item
){
hot
.
map
(
function
(
item
){
...
@@ -326,7 +289,7 @@
...
@@ -326,7 +289,7 @@
height
:
auto
;
height
:
auto
;
}
}
.gallery-top
img
{
.gallery-top
img
{
width
:
100%
;
width
:
474px
;
}
}
.swiper-wrapper-thu
{
.swiper-wrapper-thu
{
/*max-width: 293px;*/
/*max-width: 293px;*/
...
...
plugins/axios.js
View file @
e8641d31
import
axios
from
'axios'
import
axios
from
'axios'
export
default
axios
.
create
({
export
default
axios
.
create
({
baseURL
:
"https://xxtest.upyuns.com"
baseURL
:
"https://xxtest.upyuns.com"
//"https://xxtest.upyuns.com","https://dev.dfangche.com"
})
})
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