From 8c605fb25b0a4b546afd8a36c183eeb8897dc9bb Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Mon, 7 Apr 2025 17:15:05 +0800
Subject: [PATCH] =?UTF-8?q?feat(student):=20=E5=AD=A6=E5=91=98=E4=BD=93?=
 =?UTF-8?q?=E6=B5=8B=E5=88=97=E8=A1=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增学员体测列表 API 接口
- 实现学员体测列表页面，包括数据加载和分页功能- 优化学员首页，添加体测列表跳转入口
---
 api/member.js                                |   8 +
 pages/student/index/index.vue                |   8 +-
 pages/student/index/physical_examination.vue | 159 +++++++++++++++----
 3 files changed, 143 insertions(+), 32 deletions(-)

diff --git a/api/member.js b/api/member.js
index 3703fc7..50b30a0 100644
--- a/api/member.js
+++ b/api/member.js
@@ -93,6 +93,14 @@ export default {
 		})
 	},
 
+	//学员-体测列表
+	surveyList(data) {
+		let url = '/member/survey_list'
+		return http.get(url, data).then(res => {
+			return res;
+		})
+	},
+
 	//提交作业
 	assignmentsSubmit(data) {
 		let url = '/member/assignments_submit'
diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 6886887..ec4ae94 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -46,7 +46,7 @@
 						</view>
 					</view>
 				</view>
-				<view class="more" @click="physical_examination">更多</view>
+				<view class="more" @click="physical_examination(memberIndexData)">更多</view>
 			</view>
 
 			<view class="upcomin-classes">
@@ -246,9 +246,11 @@
 					url: '/pages/student/index/work_details'
 				})
 			},
-			physical_examination(){
+      //跳转体测列表
+			physical_examination(e){
+        let students_id = e.students_id
 				uni.navigateTo({
-					url: '/pages/student/index/physical_examination'
+					url: `/pages/student/index/physical_examination?students_id=${students_id}`
 				})
 			},
       //跳转作业列表页
diff --git a/pages/student/index/physical_examination.vue b/pages/student/index/physical_examination.vue
index 6aef917..ed96bc3 100644
--- a/pages/student/index/physical_examination.vue
+++ b/pages/student/index/physical_examination.vue
@@ -1,46 +1,138 @@
+<!--体测数据-详情-->
 <template>
 	<view class="overall">
-		<view class="date">2021年03月12日</view>
-
-		<view class="content">
-			<view class="circle-container">
-				<view class="card-con-txt1-left">
-					<image src="@/static/images/index/score.png" class="overlay-image"></image>
-				</view>
-				<view class="card-con-txt1-left-txt">90</view>
-				<view class="card-con-txt1-left-txt top1">综合评分</view>
-			</view>
-			<view style="height: 170rpx;"></view>
-			<view style="display: flex;justify-content: space-around;">
-				<view style="text-align: center;">
-					<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">身高 (CM)</view>
-					<view style="font-size: 55rpx;color: #29d3b4;">123</view>
-				</view>
-				<view style="text-align: center;">
-					<view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">体重 (KG)</view>
-					<view style="font-size: 55rpx;color: #29d3b4;">45</view>
-				</view>
-			</view>
-			<view class="coach-message">
-				<view>
-					<image src="@/static/images/index/lv.png" class="drop-image"></image>
-				</view>
-				<view style="padding: 15rpx 0 0 5rpx;line-height: 1.6;font-size: 30rpx;color: #7F7F7F;">教练寄语教练寄语教练寄语教练寄语教练寄语教练寄语教练寄教练寄语教练寄语教练寄语教练寄语教练寄语教练教练寄语教练寄语教练寄语教练寄语练教练语教练寄教练寄语教练寄语教练寄语教练寄语教练寄语教练</view>
-			</view>
-			<view style="font-size: 45rpx;text-align: center;margin-top: 30%;">详细数据信息</view>
-		</view>
+
+    <scroll-view
+        class="table_list"
+        scroll-y="true"
+        :lower-threshold="lowerThreshold"
+        @scrolltolower="loadMoreData"
+        style="height: 100vh;"
+    >
+
+      <view class="item" v-for="(v,k) in tableList" :key="k">
+        <view class="date">{{$util.formatToDateTime(v.create_time, 'Y-m-d')}}</view>
+        <view class="content">
+          <view class="circle-container">
+            <view class="card-con-txt1-left">
+              <image src="@/static/images/index/score.png" class="overlay-image"></image>
+            </view>
+            <view class="card-con-txt1-left-txt">{{v.score}}</view>
+            <view class="card-con-txt1-left-txt top1">综合评分</view>
+          </view>
+          <view style="height: 170rpx;"></view>
+          <view style="display: flex;justify-content: space-around;">
+            <view style="text-align: center;">
+              <view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">身高 (CM)</view>
+              <view style="font-size: 55rpx;color: #29d3b4;">{{(v.height * 100)}}</view>
+            </view>
+            <view style="text-align: center;">
+              <view style="color: #AAAAAA;font-size: 30rpx;padding: 15rpx 0;">体重 (KG)</view>
+              <view style="font-size: 55rpx;color: #29d3b4;">{{v.weight}}</view>
+            </view>
+          </view>
+          <view class="coach-message">
+            <view>
+              <image src="@/static/images/index/lv.png" class="drop-image"></image>
+            </view>
+            <view style="padding: 15rpx 0 0 5rpx;line-height: 1.6;font-size: 30rpx;color: #7F7F7F;">{{v.content}}</view>
+          </view>
+          <view style="font-size: 45rpx;text-align: center;margin-top: 30%;">详细数据信息</view>
+        </view>
+      </view>
+
+    </scroll-view>
 	</view>
 </template>
 
 <script>
+import memberApi from '@/api/member.js';
+
 	export default {
 		data() {
 			return {
+        loading:false,//加载状态
+        lowerThreshold: 100,//距离底部多远触发
+        isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
 
+        //筛选条件
+        filteredData:{
+          page:1,//当前页码
+          limit:10,//每页返回数据条数
+          total:10,//数据总条数
+          students_id: '',//学员id
+        },
+
+        tableList:[],//表格数据
 			}
 		},
+    onLoad(options) {
+      this.filteredData.students_id = options.students_id//学员id
+    },
+    onShow(){
+      this.init()
+    },
 		methods: {
+      //初始化
+      async init(){
+        this.getList()
+      },
+
+      //加载更多(下一页)
+      loadMoreData() {
+        //判断是否加载
+        if (!this.isReachedBottom) {
+          this.isReachedBottom = true;//设置为不可请求状态
+          this.getList();
+        }
+      },
+      //重置为第一页
+      async resetFilteredData() {
+        this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
+
+        this.filteredData.page = 1//当前页码
+        this.filteredData.limit = 10//每页返回数据条数
+        this.filteredData.total = 10//数据总条数
+      },
 
+      //获取-学员-体测列表
+      async getList(){
+        this.loading = true
+
+        let data = {...this.filteredData}
+
+        //判断是否还有数据
+        if(this.filteredData.page * this.filteredData.limit > this.filteredData.total){
+          this.loading = false
+          uni.showToast({
+            title: '暂无更多',
+            icon: 'none'
+          })
+          return
+        }
+
+        if(data.page == 1){
+          this.tableList = []
+        }
+
+        //学员-体测列表
+        let res = await memberApi.surveyList(data)
+        this.loading = false
+        this.isReachedBottom = false;
+        if (res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+
+        this.tableList = this.tableList.concat(res.data.list.data); // 使用 concat 方法 将新数据追加到数组中
+
+        // console.log('列表',this.tableList)
+        this.filteredData.total = res.data.list.total
+        this.filteredData.page++
+      },
 		}
 	}
 </script> 
@@ -52,6 +144,15 @@
 		background-color: #29d3b4; 
 	}
 
+  .table_list{
+    padding-bottom: 40rpx;
+    display: flex;
+    flex-direction: column;
+    .item{
+      margin-bottom: 40rpx;
+    }
+  }
+
 	.date {
 		color: #fff;
 		width: 92%;