From add9b3bb61fcc337b02c15e7973967d670e7d3be Mon Sep 17 00:00:00 2001
From: zhengyiming <540361168@qq.com>
Date: 星期三, 21 五月 2025 17:17:28 +0800
Subject: [PATCH] Merge branch 'dev-ui' of http://120.26.58.240:8888/r/LifePaymentFront into dev-ui
---
apps/h5/src/components/Layout/ContentScrollView.vue | 40 ++++++++++------------------------------
1 files changed, 10 insertions(+), 30 deletions(-)
diff --git a/apps/h5/src/components/Layout/ContentScrollView.vue b/apps/h5/src/components/Layout/ContentScrollView.vue
index 1bb8a3e..3036812 100644
--- a/apps/h5/src/components/Layout/ContentScrollView.vue
+++ b/apps/h5/src/components/Layout/ContentScrollView.vue
@@ -1,17 +1,10 @@
<template>
- <scroll-view class="content-scroll-view-wrapper" :class="{ hasPaddingTop }" :scroll-y="true">
- <ContentView
- :class="['content-scroll-view-wrapper-inner', props.allHeight ? 'all-height' : '']"
- :paddingH="paddingH"
- >
- <slot />
- </ContentView>
- </scroll-view>
+ <div :class="['content-scroll-view', { hasPaddingTop }]">
+ <slot />
+ </div>
</template>
<script setup lang="ts">
-import ContentView from './ContentView.vue';
-
defineOptions({
name: 'ContentScrollView',
});
@@ -29,26 +22,13 @@
});
</script>
-<style lang="scss">
-@import '@/styles/common.scss';
+<style lang="scss" scoped>
+@use '@/style/common.scss' as *;
-.content-scroll-view-wrapper {
- @include listScrollViewWithNoPadding;
- background-color: $body-background-color;
-
- &.hasPaddingTop {
- padding-top: 20px;
- }
-
- .content-scroll-view-wrapper-inner {
- @include ScrollViewInner;
-
- &.all-height {
- height: 100%;
- padding-bottom: 0;
- display: flex;
- flex-direction: column;
- }
- }
+.content-scroll-view {
+ overflow-y: auto;
+ padding: 10px 14px 0;
+ flex: 1;
+ min-height: 0;
}
</style>
--
Gitblit v1.9.1