Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
million
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
viitto
million
Commits
f1e10046
Commit
f1e10046
authored
Jun 30, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
75cc4c51
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
354 additions
and
367 deletions
+354
-367
index.vue
src/components/props/index.vue
+306
-324
style3.vue
src/components/trip/style3.vue
+47
-40
tripList.vue
src/components/trip/tripList.vue
+1
-3
No files found.
src/components/props/index.vue
View file @
f1e10046
<
template
>
<
template
>
<div
<div
v-if=
"visibleSync"
:style=
"[customStyle]"
:class=
"
{ 'u-drawer-visible': showDrawer }" class="u-drawer">
v-if=
"visibleSync"
:style=
"[customStyle]"
:class=
"
{ 'u-drawer-visible': showDrawer }"
class="u-drawer"
>
<u-mask
:maskClickAble=
"maskCloseAble"
:show=
"showDrawer && mask"
@
click=
"maskClick"
></u-mask>
<u-mask
:maskClickAble=
"maskCloseAble"
:show=
"showDrawer && mask"
@
click=
"maskClick"
></u-mask>
<div
<div
class=
"u-drawer-content"
@
click=
"modeCenterClose(mode)"
:class=
"[
class=
"u-drawer-content"
@
click=
"modeCenterClose(mode)"
:class=
"[
safeAreaInsetBottom ? 'safe-area-inset-bottom' : '',
safeAreaInsetBottom ? 'safe-area-inset-bottom' : '',
'u-drawer-' + mode,
'u-drawer-' + mode,
showDrawer ? 'u-drawer-content-visible' : '',
showDrawer ? 'u-drawer-content-visible' : '',
zoom && mode == 'center' ? 'u-animation-zoom' : ''
zoom && mode == 'center' ? 'u-animation-zoom' : ''
]"
]"
@
touchmove
.
stop
.
prevent
@
click
.
stop
:style=
"[style]"
>
@
touchmove
.
stop
.
prevent
<div
class=
"u-mode-center-box"
@
click
.
stop
@
touchmove
.
stop
.
prevent
v-if=
"mode == 'center'"
:style=
"[centerStyle]"
>
@
click
.
stop
:style=
"[style]"
>
<div
class=
"u-mode-center-box"
@
click
.
stop
@
touchmove
.
stop
.
prevent
v-if=
"mode == 'center'"
:style=
"[centerStyle]"
>
<slot
/>
<slot
/>
</div>
</div>
<div
v-else
>
<div
v-else
>
...
@@ -36,8 +18,8 @@
...
@@ -36,8 +18,8 @@
</
template
>
</
template
>
<
script
>
<
script
>
import
uMask
from
'../mask/index'
import
uMask
from
'../mask/index'
/**
/**
* popup 弹窗
* popup 弹窗
* @description 弹出层容器,用于展示弹窗、信息提示等内容,支持上、下、左、右和中部弹出。组件只提供容器,内部内容由用户自定义
* @description 弹出层容器,用于展示弹窗、信息提示等内容,支持上、下、左、右和中部弹出。组件只提供容器,内部内容由用户自定义
* @tutorial https://www.uviewui.com/components/popup.html
* @tutorial https://www.uviewui.com/components/popup.html
...
@@ -54,9 +36,9 @@ import uMask from '../mask/index'
...
@@ -54,9 +36,9 @@ import uMask from '../mask/index'
* @event {Function} close 弹出层收起
* @event {Function} close 弹出层收起
* @example <u-popup v-model="show"><div>出淤泥而不染,濯清涟而不妖</div></u-popup>
* @example <u-popup v-model="show"><div>出淤泥而不染,濯清涟而不妖</div></u-popup>
*/
*/
export
default
{
export
default
{
name
:
"u-popup"
,
name
:
"u-popup"
,
components
:
{
components
:
{
uMask
uMask
},
},
props
:
{
props
:
{
...
@@ -105,7 +87,7 @@ export default {
...
@@ -105,7 +87,7 @@ export default {
// 用户自定义样式
// 用户自定义样式
customStyle
:
{
customStyle
:
{
type
:
Object
,
type
:
Object
,
default
()
{
default
()
{
return
{};
return
{};
}
}
},
},
...
@@ -144,9 +126,9 @@ export default {
...
@@ -144,9 +126,9 @@ export default {
let
translate
=
"100%"
;
let
translate
=
"100%"
;
// 判断是否是否百分比或者auto值,是的话,直接使用该值,否则默认为rpx单位的数值
// 判断是否是否百分比或者auto值,是的话,直接使用该值,否则默认为rpx单位的数值
let
length
=
let
length
=
/%$/
.
test
(
this
.
length
)
||
this
.
length
==
"auto"
/%$/
.
test
(
this
.
length
)
||
this
.
length
==
"auto"
?
?
this
.
length
this
.
length
:
:
uni
.
upx2px
(
this
.
length
)
+
"px"
;
uni
.
upx2px
(
this
.
length
)
+
"px"
;
// 如果是左边或者上边弹出时,需要给translate设置为负值,用于隐藏
// 如果是左边或者上边弹出时,需要给translate设置为负值,用于隐藏
if
(
this
.
mode
==
"left"
||
this
.
mode
==
"top"
)
if
(
this
.
mode
==
"left"
||
this
.
mode
==
"top"
)
translate
=
length
==
"auto"
?
"-100%"
:
"-"
+
length
;
translate
=
length
==
"auto"
?
"-100%"
:
"-"
+
length
;
...
@@ -190,9 +172,9 @@ export default {
...
@@ -190,9 +172,9 @@ export default {
centerStyle
()
{
centerStyle
()
{
let
style
=
{};
let
style
=
{};
let
length
=
let
length
=
/%$/
.
test
(
this
.
length
)
||
this
.
length
==
"auto"
/%$/
.
test
(
this
.
length
)
||
this
.
length
==
"auto"
?
?
this
.
length
this
.
length
:
:
uni
.
upx2px
(
this
.
length
)
+
"px"
;
uni
.
upx2px
(
this
.
length
)
+
"px"
;
style
.
width
=
length
;
style
.
width
=
length
;
style
.
zIndex
=
this
.
zIndex
?
this
.
zIndex
:
this
.
$u
.
zIndex
.
popup
;
style
.
zIndex
=
this
.
zIndex
?
this
.
zIndex
:
this
.
$u
.
zIndex
.
popup
;
if
(
this
.
borderRadius
)
{
if
(
this
.
borderRadius
)
{
...
@@ -239,7 +221,6 @@ export default {
...
@@ -239,7 +221,6 @@ export default {
// 此处的原理是,关闭时先通过动画隐藏弹窗和遮罩,再移除整个组件
// 此处的原理是,关闭时先通过动画隐藏弹窗和遮罩,再移除整个组件
// 打开时,先渲染组件,延时一定时间再让遮罩和弹窗的动画起作用
// 打开时,先渲染组件,延时一定时间再让遮罩和弹窗的动画起作用
change
(
param1
,
param2
,
status
)
{
change
(
param1
,
param2
,
status
)
{
console
.
log
(
'close....'
)
// 如果this.popup为false,以为着为picker,actionsheet等组件调用了popup组件
// 如果this.popup为false,以为着为picker,actionsheet等组件调用了popup组件
if
(
this
.
popup
==
true
)
this
.
$emit
(
"input"
,
status
);
if
(
this
.
popup
==
true
)
this
.
$emit
(
"input"
,
status
);
this
[
param1
]
=
status
;
this
[
param1
]
=
status
;
...
@@ -255,11 +236,11 @@ export default {
...
@@ -255,11 +236,11 @@ export default {
);
);
}
}
}
}
};
};
</
script
>
</
script
>
<
style
scoped
lang=
"scss"
>
<
style
scoped
lang=
"scss"
>
.u-drawer
{
.u-drawer
{
/* #ifndef APP-NVUE */
/* #ifndef APP-NVUE */
display
:
block
;
display
:
block
;
/* #endif */
/* #endif */
...
@@ -270,46 +251,46 @@ export default {
...
@@ -270,46 +251,46 @@ export default {
bottom
:
0
;
bottom
:
0
;
overflow
:
hidden
;
overflow
:
hidden
;
z-index
:
5999
;
z-index
:
5999
;
}
}
.u-drawer-content
{
.u-drawer-content
{
/* #ifndef APP-NVUE */
/* #ifndef APP-NVUE */
display
:
block
;
display
:
block
;
/* #endif */
/* #endif */
position
:
absolute
;
position
:
absolute
;
z-index
:
1003
;
z-index
:
1003
;
transition
:
all
0
.25s
linear
;
transition
:
all
0
.25s
linear
;
}
}
.u-drawer-left
{
.u-drawer-left
{
top
:
0
;
top
:
0
;
bottom
:
0
;
bottom
:
0
;
left
:
0
;
left
:
0
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.u-drawer-right
{
.u-drawer-right
{
right
:
0
;
right
:
0
;
top
:
0
;
top
:
0
;
bottom
:
0
;
bottom
:
0
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.u-drawer-top
{
.u-drawer-top
{
top
:
0
;
top
:
0
;
left
:
0
;
left
:
0
;
right
:
0
;
right
:
0
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.u-drawer-bottom
{
.u-drawer-bottom
{
bottom
:
0
;
bottom
:
0
;
left
:
0
;
left
:
0
;
right
:
0
;
right
:
0
;
background-color
:
#ffffff
;
background-color
:
#ffffff
;
}
}
.u-drawer-center
{
.u-drawer-center
{
/* #ifndef APP-NVUE */
/* #ifndef APP-NVUE */
display
:
flex
;
display
:
flex
;
flex-direction
:
column
;
flex-direction
:
column
;
...
@@ -322,31 +303,31 @@ export default {
...
@@ -322,31 +303,31 @@ export default {
align-items
:
center
;
align-items
:
center
;
opacity
:
0
;
opacity
:
0
;
z-index
:
99999
;
z-index
:
99999
;
}
}
.u-mode-center-box
{
.u-mode-center-box
{
min-width
:
100rpx
;
min-width
:
100rpx
;
min-height
:
100rpx
;
min-height
:
100rpx
;
/* #ifndef APP-NVUE */
/* #ifndef APP-NVUE */
display
:
block
;
display
:
block
;
/* #endif */
/* #endif */
position
:
relative
;
position
:
relative
;
}
}
.u-drawer-content-visible.u-drawer-center
{
.u-drawer-content-visible.u-drawer-center
{
transform
:
scale
(
1
);
transform
:
scale
(
1
);
opacity
:
1
;
opacity
:
1
;
}
}
.u-animation-zoom
{
.u-animation-zoom
{
transform
:
scale
(
1
.15
);
transform
:
scale
(
1
.15
);
}
}
.u-drawer-content-visible
{
.u-drawer-content-visible
{
transform
:
translate3D
(
0px
,
0px
,
0px
)
!
important
;
transform
:
translate3D
(
0px
,
0px
,
0px
)
!
important
;
}
}
.u-drawer-mask
{
.u-drawer-mask
{
/* #ifndef APP-NVUE */
/* #ifndef APP-NVUE */
display
:
block
;
display
:
block
;
/* #endif */
/* #endif */
...
@@ -358,12 +339,13 @@ export default {
...
@@ -358,12 +339,13 @@ export default {
right
:
0
;
right
:
0
;
background-color
:
rgba
(
0
,
0
,
0
,
0
.4
);
background-color
:
rgba
(
0
,
0
,
0
,
0
.4
);
transition
:
opacity
0
.25s
;
transition
:
opacity
0
.25s
;
}
}
.u-drawer-mask-visible
{
.u-drawer-mask-visible
{
/* #ifndef APP-NVUE */
/* #ifndef APP-NVUE */
display
:
block
;
display
:
block
;
/* #endif */
/* #endif */
opacity
:
1
;
opacity
:
1
;
}
}
</
style
>
</
style
>
src/components/trip/style3.vue
View file @
f1e10046
...
@@ -2341,6 +2341,7 @@
...
@@ -2341,6 +2341,7 @@
left
:
calc
(
0%
)
left
:
calc
(
0%
)
}
}
}
}
.section-tour
{
.section-tour
{
margin-bottom
:
30px
!important
;
margin-bottom
:
30px
!important
;
padding
:
30px
30px
0
;
padding
:
30px
30px
0
;
...
@@ -2445,7 +2446,7 @@
...
@@ -2445,7 +2446,7 @@
.detail-content
{
.detail-content
{
padding
:
40px
0
;
padding
:
40px
0
;
font-size
:
16px
;
font-size
:
16px
;
line-height
:
28px
;
line-height
:
28px
;
}
}
...
@@ -2594,7 +2595,7 @@
...
@@ -2594,7 +2595,7 @@
background-color
:
#6aa8c2
;
background-color
:
#6aa8c2
;
color
:
#fff
;
color
:
#fff
;
box-shadow
:
0
0
3px
0
#4c4c4c73
;
box-shadow
:
0
0
3px
0
#4c4c4c73
;
cursor
:
pointer
;
cursor
:
pointer
;
}
}
.detail-banner-pic
.items
{
.detail-banner-pic
.items
{
...
@@ -2604,6 +2605,7 @@
...
@@ -2604,6 +2605,7 @@
height
:
330px
;
height
:
330px
;
background-color
:
#fff
;
background-color
:
#fff
;
}
}
.detail-banner-pic
.items
.item
{
.detail-banner-pic
.items
.item
{
overflow
:
hidden
;
overflow
:
hidden
;
padding
:
25px
;
padding
:
25px
;
...
@@ -2611,43 +2613,50 @@
...
@@ -2611,43 +2613,50 @@
-moz-transition
:
left
.3s
;
-moz-transition
:
left
.3s
;
-o-transition
:
left
.3s
;
-o-transition
:
left
.3s
;
transition
:
left
.3s
;
transition
:
left
.3s
;
}
}
.detail-banner-pic
.items
.item
figure
{
.detail-banner-pic
.items
.item
figure
{
margin
:
0
;
margin
:
0
;
width
:
100%
;
width
:
100%
;
height
:
75%
;
height
:
75%
;
border-radius
:
3px
;
border-radius
:
3px
;
box-shadow
:
1px
1px
3px
1px
rgba
(
99
,
99
,
99
,
.33
)
inset
;
box-shadow
:
1px
1px
3px
1px
rgba
(
99
,
99
,
99
,
.33
)
inset
;
position
:
relative
;
position
:
relative
;
}
}
.detail-banner-pic
.items
.item
b
{
.detail-banner-pic
.items
.item
b
{
color
:
#6f6f6f
;
color
:
#6f6f6f
;
max-height
:
60px
;
max-height
:
60px
;
overflow
:
hidden
;
overflow
:
hidden
;
margin-top
:
10px
;
margin-top
:
10px
;
display
:
inline-block
;
display
:
inline-block
;
font-weight
:
bold
;
font-weight
:
bold
;
}
}
.daily2
.daily-detail
.detail-banner-pic
.items
>*
{
.daily2
.daily-detail
.detail-banner-pic
.items
>*
{
position
:
absolute
;
position
:
absolute
;
left
:
0
;
left
:
0
;
top
:
0
;
top
:
0
;
display
:
inline-block
;
display
:
inline-block
;
height
:
330px
;
height
:
330px
;
}
}
.Style3_main
.isHiden3
{
height
:
700px
;
.Style3_main
.isHiden3
{
height
:
700px
;
overflow
:
hidden
;
overflow
:
hidden
;
}
}
.provide-food
i
{
font-size
:
20px
;
.provide-food
i
{
margin-right
:
6px
;
font-size
:
20px
;
}
margin-right
:
6px
;
.style3_detail
{
}
display
:
inline-block
;
margin-right
:
20px
;
.style3_detail
{
font-size
:
18px
;
display
:
inline-block
;
}
margin-right
:
20px
;
font-size
:
18px
;
}
</
style
>
</
style
>
<
template
>
<
template
>
<div
class=
"Style3_main"
>
<div
class=
"Style3_main"
>
...
@@ -2676,7 +2685,8 @@
...
@@ -2676,7 +2685,8 @@
</div>
</div>
<div
:data-index=
"item.myIndex"
:data-total=
"item.details.length"
class=
"detail-banner-pic"
v-if=
"index!=0"
>
<div
:data-index=
"item.myIndex"
:data-total=
"item.details.length"
class=
"detail-banner-pic"
v-if=
"index!=0"
>
<i
class=
"iconfont iconpreviewleft arrow left"
@
click=
"getLeftIndex(item)"
></i>
<i
class=
"iconfont iconpreviewleft arrow left"
@
click=
"getLeftIndex(item)"
></i>
<i
class=
"iconfont iconpreviewright arrow right"
@
click=
"getRightIndex(item)"
style=
"right:0;left:auto;"
></i>
<i
class=
"iconfont iconpreviewright arrow right"
@
click=
"getRightIndex(item)"
style=
"right:0;left:auto;"
></i>
<div
class=
"items"
>
<div
class=
"items"
>
<div
class=
"item"
v-for=
"(subItem,subIndex) in item.details"
:key=
"subIndex"
>
<div
class=
"item"
v-for=
"(subItem,subIndex) in item.details"
:key=
"subIndex"
>
<figure>
<figure>
...
@@ -2733,20 +2743,19 @@
...
@@ -2733,20 +2743,19 @@
return
{
return
{
trips
:
[],
trips
:
[],
slide
:
0
,
slide
:
0
,
isShow
:
false
isShow
:
false
};
};
},
},
created
()
{},
created
()
{},
mounted
()
{
mounted
()
{
console
.
log
(
this
.
tripList
,
'triplistt'
);
this
.
init
();
this
.
init
();
if
(
localStorage
.
baseifo
)
{
if
(
localStorage
.
baseifo
)
{
this
.
TripConfig
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'baseifo'
));
this
.
TripConfig
=
JSON
.
parse
(
window
.
localStorage
.
getItem
(
'baseifo'
));
}
}
if
(
this
.
TripConfig
.
TripConfig
.
TripDayIsOpen
==
1
)
{
if
(
this
.
TripConfig
.
TripConfig
.
TripDayIsOpen
==
1
)
{
this
.
isShow
=
false
;
this
.
isShow
=
false
;
}
else
{
}
else
{
this
.
isShow
=
true
;
this
.
isShow
=
true
;
}
}
},
},
...
@@ -2955,11 +2964,9 @@
...
@@ -2955,11 +2964,9 @@
x
.
islast
=
(
j
+
1
)
==
this
.
tripList
.
length
x
.
islast
=
(
j
+
1
)
==
this
.
tripList
.
length
this
.
$set
(
this
.
tripList
,
j
,
x
)
this
.
$set
(
this
.
tripList
,
j
,
x
)
x
.
dateTime
=
this
.
setDate
(
j
);
x
.
dateTime
=
this
.
setDate
(
j
);
x
.
myIndex
=
1
;
x
.
myIndex
=
1
;
})
})
this
.
trips
=
this
.
tripList
this
.
trips
=
this
.
tripList
console
.
log
(
this
.
trips
,
'tripsss'
);
},
},
setDate
:
function
(
j
)
{
setDate
:
function
(
j
)
{
if
(
j
===
0
)
{
if
(
j
===
0
)
{
...
@@ -2996,18 +3003,18 @@
...
@@ -2996,18 +3003,18 @@
}
}
},
},
//获取左边index
//获取左边index
getLeftIndex
(
item
){
getLeftIndex
(
item
)
{
item
.
myIndex
--
item
.
myIndex
--
if
(
item
.
myIndex
<
1
)
{
if
(
item
.
myIndex
<
1
)
{
item
.
myIndex
=
item
.
details
.
length
;
item
.
myIndex
=
item
.
details
.
length
;
}
}
this
.
$forceUpdate
();
this
.
$forceUpdate
();
},
},
//获取右边
//获取右边
getRightIndex
(
item
){
getRightIndex
(
item
)
{
item
.
myIndex
++
;
item
.
myIndex
++
;
if
(
item
.
myIndex
>
item
.
details
.
length
)
{
if
(
item
.
myIndex
>
item
.
details
.
length
)
{
item
.
myIndex
=
1
;
item
.
myIndex
=
1
;
}
}
this
.
$forceUpdate
();
this
.
$forceUpdate
();
}
}
...
...
src/components/trip/tripList.vue
View file @
f1e10046
...
@@ -194,9 +194,7 @@
...
@@ -194,9 +194,7 @@
return
""
;
return
""
;
}
}
},
},
mounted
()
{
mounted
()
{}
console
.
log
(
this
.
plugData
,
'plugDataaaa'
);
}
};
};
</
script
>
</
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