Merge branch 'refs/heads/cfclub-jiapu' into cfclub

cfc-web/src/styles/admin-tokens.css

@@ -84,6 +84,37 @@
   min-height: calc(100vh - 60px);
 }
 
+/* page-container：所有<el-card>包裹的列表页使用此 class */
+.page-container {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  padding: 20px;
+}
+.page-container > .el-card {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+}
+.page-container > .el-card .el-card__body {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  min-height: 0;
+  padding: 20px;
+}
+.page-container > .el-card .el-card__body > .el-form:first-child {
+  flex-shrink: 0;
+}
+.page-container > .el-card .el-card__body > .el-pagination {
+  flex-shrink: 0;
+  margin-top: auto;
+  padding-top: 20px;
+  text-align: right;
+}
+
 /* ========================
    页面头部标题栏
    ======================== */

cfc-web/src/views/Children.vue

@@ -151,7 +151,7 @@ export default {
   name: 'Children',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -310,7 +310,4 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
 </style>

cfc-web/src/views/Families.vue

@@ -153,7 +153,7 @@ export default {
   name: 'Families',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -310,7 +310,4 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
 </style>

cfc-web/src/views/GuideFamilyTask.vue

@@ -201,7 +201,7 @@ export default {
   name: 'GuideFamilyTask',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -402,7 +402,7 @@ taskLoading: false,
 </script>
 
 <style scoped>
-.page-container { padding: 20px; }
+
 
 .overview-cards { margin-bottom: 20px; }
 .overview-card {

cfc-web/src/views/GuidePackages.vue

@@ -195,7 +195,7 @@ export default {
   name: 'GuidePackages',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -424,7 +424,7 @@ export default {
 </script>
 
 <style scoped>
-.page-container { padding: 20px; }
+
 .code-text { font-family: monospace; color: #409EFF; }
 .avatar-uploader .el-upload {
   border: 1px dashed #d9d9d9;

cfc-web/src/views/OperationLogs.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="operation-logs">
+  <div class="operation-logs admin-page">
     <!-- 筛选条件 -->
     <el-card class="filter-card">
       <el-form :inline="true" :model="filterForm" class="filter-form">
@@ -108,7 +108,7 @@ export default {
   name: 'OperationLogs',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {

cfc-web/src/views/Points.vue

@@ -93,7 +93,7 @@ export default {
   name: 'Points',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -189,7 +189,4 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
 </style>

cfc-web/src/views/Rewards.vue

@@ -191,7 +191,7 @@ export default {
   name: 'Rewards',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -423,7 +423,4 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
 </style>

cfc-web/src/views/TaskTemplates.vue

@@ -263,7 +263,7 @@ export default {
   name: 'TaskTemplates',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -511,7 +511,4 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
 </style>

cfc-web/src/views/Tasks.vue

@@ -152,7 +152,7 @@ export default {
   name: 'Tasks',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -302,10 +302,6 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
-
 .stat-card {
   text-align: center;
 }

cfc-web/src/views/TeacherConsult.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="teacher-consult-container">
+  <div class="teacher-consult-container page-container">
     <el-card>
       <div slot="header">
         <span>家长咨询管理</span>
@@ -113,7 +113,7 @@ export default {
   },
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     },
     replyDialogTitle() {
       if (!this.currentMessage) return '回复咨询'

cfc-web/src/views/Users.vue

@@ -185,7 +185,7 @@ export default {
   name: 'Users',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {
@@ -378,7 +378,4 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
 </style>

cfc-web/src/views/Wishes.vue

@@ -323,7 +323,7 @@ export default {
   },
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     },
     draftWishes() {
       return this.pendingWishes.filter(w => w.status === 'draft')
@@ -536,10 +536,6 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
-
 .stat-card {
   text-align: center;
   cursor: pointer;

cfc-web/src/views/admin/ArticleManage.vue

@@ -255,7 +255,7 @@ export default {
   name: 'ArticleManage',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {

cfc-web/src/views/admin/EnergySandbox.vue

@@ -112,7 +112,7 @@ export default {
   },
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 280
     },
     filteredMembers() {
       const members = this.sandboxData.members || []
@@ -151,10 +151,6 @@ export default {
 </script>
 
 <style scoped>
-.page-container {
-  padding: 20px;
-}
-
 .page-desc {
   color: #909399;
   font-size: 13px;

cfc-web/src/views/admin/Foods.vue

@@ -137,7 +137,7 @@ export default {
   name: 'Foods',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {

cfc-web/src/views/admin/OrderManage.vue

@@ -165,7 +165,7 @@ export default {
   name: 'OrderManage',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 340
     }
   },
   data() {

cfc-web/src/views/health/HealthReportAudit.vue

@@ -126,7 +126,7 @@ export default {
   },
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 280
     },
     parsedPayload() {
       if (!this.detail || !this.detail.payloadJson) return null

cfc-web/src/views/nutritionist/HealthCheckins.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="health-checkins">
+  <div class="health-checkins page-container">
     <el-card>
       <div slot="header"><span>健康打卡</span></div>
       <el-table :data="checkins" v-loading="loading" border stripe :max-height="tableHeight">
@@ -18,7 +18,7 @@ export default {
   name: 'HealthCheckins',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 280
     }
   },
   data() { return { loading: false, checkins: [] } },

cfc-web/src/views/nutritionist/HealthIndicators.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="health-indicators">
+  <div class="health-indicators page-container">
     <el-card>
       <div slot="header"><span>健康指标</span></div>
       <el-table :data="indicators" v-loading="loading" border stripe :max-height="tableHeight" :cell-style="cellStyle">
@@ -42,7 +42,7 @@ export default {
   name: 'HealthIndicators',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 280
     }
   },
   data() { return { loading: false, indicators: [] } },

cfc-web/src/views/nutritionist/HealthReports.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="health-reports">
+  <div class="health-reports page-container">
     <el-card>
       <div slot="header">
         <span>健康报告</span>
@@ -51,7 +51,7 @@ export default {
   name: 'HealthReports',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 280
     }
   },
   data() {

cfc-web/src/views/nutritionist/NutritionMappings.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="nutrition-mappings">
+  <div class="nutrition-mappings page-container">
     <el-card>
       <div slot="header">
         <span>营养素映射管理</span>
@@ -66,7 +66,7 @@ export default {
   name: 'NutritionMappings',
   computed: {
     tableHeight() {
-      return window.innerHeight - 300
+      return window.innerHeight - 280
     }
   },
   data() {