Commit f2a394e9 authored by linxin's avatar linxin

Merge branch 'liuxin' into develop

parents dcfcc465 80bebf08
Pipeline #3982 canceled with stages
......@@ -130,6 +130,7 @@ export default {
},
getTabNum (i) {
this.tabNum = i
this.$refs.scroll.update(false)
this.$refs.scroll.scrollToTop()
},
changePage (e) {
......
......@@ -87,7 +87,7 @@ export default {
}
</script>
<style lang="less" rel="stylesheet">
<style lang="less">
#reimburse {
.h-header-btn {
img {
......@@ -162,5 +162,44 @@ export default {
color: rgba(56, 63, 69, 0.6);
}
}
.content {
position: absolute;
top: 0;
}
.scrollContent {
padding-top: 2.92rem;
padding-bottom: 20px;
}
.tab-style {
width: 100%;
position: absolute;
}
}
.platform-ios {
#startList {
.scrollContent {
padding-top: 3.32rem;
}
}
}
@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
.platform-ios {
#startList {
.scrollContent {
padding-top: 3.72rem;
}
}
}
}
// iPhoneXR适配
@media (device-width: 414px) and (device-height: 896px) {
.platform-ios {
#startList {
.scrollContent {
padding-top: 3.72rem;
}
}
}
}
</style>
......@@ -71,9 +71,9 @@ export default {
vm.hlsPopup.hideLoading()
if (res.result === 'S') {
vm.reimburseList = res.lists
if (res.lists.length > 0 && res.lists.length < 10) {
// if (res.lists.length > 0 && res.lists.length < 10) {
vm.$refs.scroll.update(true)
}
// }
}
})
},
......@@ -132,12 +132,12 @@ export default {
border: 2px solid #bcc6ff;
}
}
.content{
margin-top: 10px;
}
.scrollContent{
padding-bottom: 70px;
}
// .content{
// margin-top: 10px;
// }
// .scrollContent{
// padding-bottom: 70px;
// }
.reimburse-wrap{
margin: 10px;
}
......@@ -162,6 +162,18 @@ export default {
font-size: 14px;
color: rgba(56,63,69,0.60);
}
}
.content {
position: absolute;
top: 0;
}
.scrollContent {
padding-top: 1.92rem;
padding-bottom: 20px;
}
.tab-style {
width: 100%;
position: absolute;
}
}
</style>
......@@ -103,6 +103,7 @@ export default {
},
getTabNum (i) {
this.tabNum = i
this.$refs.scroll.update(false)
this.$refs.scroll.scrollToTop()
},
toSign () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment