shish 2 months ago
parent
commit
f3833d642b
2 changed files with 29 additions and 7 deletions
  1. 20 2
      ghsApp/src/admin/home/member.vue
  2. 9 5
      ghsApp/src/admin/home/order.vue

+ 20 - 2
ghsApp/src/admin/home/member.vue

@@ -98,6 +98,7 @@
     <view v-if="showFilterPanel" class="filter-overlay" @click="closeFilterPanel">
     <view v-if="showFilterPanel" class="filter-overlay" @click="closeFilterPanel">
       <view class="filter-panel" @click.stop>
       <view class="filter-panel" @click.stop>
         <view class="filter-header">筛选客户</view>
         <view class="filter-header">筛选客户</view>
+        <scroll-view class="filter-body" scroll-y>
         <view class="filter-section">
         <view class="filter-section">
           <view class="filter-title">片区</view>
           <view class="filter-title">片区</view>
           <view class="filter-options">
           <view class="filter-options">
@@ -170,7 +171,7 @@
           </view>
           </view>
         </view>
         </view>
         <view class="filter-section">
         <view class="filter-section">
-          <view class="filter-title">删除状态</view>
+          <view class="filter-title">状态</view>
           <view class="filter-options">
           <view class="filter-options">
             <view
             <view
               v-for="(item, index) in delStatusOptions"
               v-for="(item, index) in delStatusOptions"
@@ -183,6 +184,7 @@
             </view>
             </view>
           </view>
           </view>
         </view>
         </view>
+        </scroll-view>
         <view class="filter-actions">
         <view class="filter-actions">
           <button class="filter-action-btn clear-btn" @click="clearFilters">重置</button>
           <button class="filter-action-btn clear-btn" @click="clearFilters">重置</button>
           <button class="filter-action-btn confirm-btn" @click="confirmFilters">确定</button>
           <button class="filter-action-btn confirm-btn" @click="confirmFilters">确定</button>
@@ -768,13 +770,17 @@ export default {
   background-color: rgba(0, 0, 0, 0.5);
   background-color: rgba(0, 0, 0, 0.5);
 }
 }
 .filter-panel {
 .filter-panel {
+  display: flex;
+  flex-direction: column;
   width: 100%;
   width: 100%;
+  height: 90vh;
   max-height: 90vh;
   max-height: 90vh;
-  overflow-y: auto;
+  overflow: hidden;
   border-radius: 0 0 24upx 24upx;
   border-radius: 0 0 24upx 24upx;
   background: #fff;
   background: #fff;
 }
 }
 .filter-header {
 .filter-header {
+  flex-shrink: 0;
   padding: 24upx 0;
   padding: 24upx 0;
   text-align: center;
   text-align: center;
   color: #333;
   color: #333;
@@ -782,6 +788,13 @@ export default {
   font-weight: 700;
   font-weight: 700;
   border-bottom: 1upx solid #f0f0f0;
   border-bottom: 1upx solid #f0f0f0;
 }
 }
+.filter-body {
+  flex: 1;
+  min-height: 0;
+  height: 0;
+  width: 100%;
+  box-sizing: border-box;
+}
 .filter-section {
 .filter-section {
   padding: 30upx 40upx;
   padding: 30upx 40upx;
   border-bottom: 1upx solid #f0f0f0;
   border-bottom: 1upx solid #f0f0f0;
@@ -815,8 +828,13 @@ export default {
   font-weight: 700;
   font-weight: 700;
 }
 }
 .filter-actions {
 .filter-actions {
+  flex-shrink: 0;
   display: flex;
   display: flex;
   padding: 30upx 40upx 40upx;
   padding: 30upx 40upx 40upx;
+  padding-bottom: calc(40upx + constant(safe-area-inset-bottom));
+  padding-bottom: calc(40upx + env(safe-area-inset-bottom));
+  border-top: 1upx solid #f0f0f0;
+  background: #fff;
 }
 }
 .filter-action-btn {
 .filter-action-btn {
   flex: 1;
   flex: 1;

+ 9 - 5
ghsApp/src/admin/home/order.vue

@@ -787,17 +787,14 @@ page {
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   width: 100%;
   width: 100%;
+  height: 90vh;
   max-height: 90vh;
   max-height: 90vh;
   overflow: hidden;
   overflow: hidden;
   border-radius: 0 0 24upx 24upx;
   border-radius: 0 0 24upx 24upx;
   background: #fff;
   background: #fff;
 }
 }
-.filter-body {
-  flex: 1;
-  max-height: calc(90vh - 200upx);
-  overflow: hidden;
-}
 .filter-header {
 .filter-header {
+  flex-shrink: 0;
   padding: 24upx 0;
   padding: 24upx 0;
   text-align: center;
   text-align: center;
   color: #333;
   color: #333;
@@ -805,6 +802,13 @@ page {
   font-weight: 700;
   font-weight: 700;
   border-bottom: 1upx solid #f0f0f0;
   border-bottom: 1upx solid #f0f0f0;
 }
 }
+.filter-body {
+  flex: 1;
+  min-height: 0;
+  height: 0;
+  width: 100%;
+  box-sizing: border-box;
+}
 .filter-section {
 .filter-section {
   padding: 30upx 40upx;
   padding: 30upx 40upx;
   border-bottom: 1upx solid #f0f0f0;
   border-bottom: 1upx solid #f0f0f0;