From 4baebbbd206599b036c304429fd29de00d98524a Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 5 Jun 2025 10:59:09 +0800
Subject: [PATCH 1/8] =?UTF-8?q?feat(api):=20=E6=B7=BB=E5=8A=A0=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E8=AF=A6=E6=83=85=E4=BF=AE=E6=94=B9=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=B9=B6=E4=BC=98=E5=8C=96=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 apiRoute.js 中新增 xy_memberEdit 方法，用于修改学生详情
- 修改 personal_data.vue 中的表单提交逻辑：
  - 更改电话号码字段名为 phone_number
  - 优化头像上传逻辑 - 重构 submit 方法，使用新增的 xy_memberEdit 接口进行数据提交
  - 优化提交成功后的提示信息
---
 api/apiRoute.js                    |  7 +++++
 pages/student/my/personal_data.vue | 49 +++++++++++++-----------------
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 5f0f4a2..06904fa 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -417,6 +417,13 @@ export default {
             return res;
         })
     },
+    //学生详情-修改
+    xy_memberEdit(data = {}) {
+        let url = '/customerResourcesAuth/edit'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
 
 
 
diff --git a/pages/student/my/personal_data.vue b/pages/student/my/personal_data.vue
index cfe9868..a525d0c 100644
--- a/pages/student/my/personal_data.vue
+++ b/pages/student/my/personal_data.vue
@@ -92,7 +92,7 @@
 						手机 <text class="required">*</text>
 					</view>
 					<view class="input">
-						<input v-model="formData.phone" placeholder="请输入手机" />
+						<input v-model="formData.phone_number" placeholder="请输入手机" />
 					</view>
 				</view>
 			</view>
@@ -294,7 +294,6 @@
         if (extraData.input_name == 'headimg') {
           console.log('收到的图片地址:', resData.url);
           this.editHeadimg = resData.url;
-          alert(this.formData.headimg)
         }
       },
 
@@ -307,32 +306,26 @@
       },
 
 			//提交信息
-			submit() {
-				console.log(this.editHeadimg, '111')
-				// if(this.editHeadimg == ''){
-				// 	this.editHeadimg = this.formData.headimg
-				// }
-				member.member_edit({
-					header: this.editHeadimg,
-					name: this.formData.name,
-					address: this.formData.address,
-					gender: this.sex_name,
-					birthday: this.formData.birthday,
-					email: this.formData.email,
-					phone: this.formData.phone,
-				}).then(res => {
-					if (res.code == 1) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						})
-					}
-				})
+			async submit() {
+        if (this.editHeadimg) {
+          this.formData.headimg = this.editHeadimg
+        }
+        let params = {
+          ...this.formData
+        }
+
+				let res = await apiRoute.xy_memberEdit(params)
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        uni.showToast({
+          title: res.msg,
+          icon: 'success'
+        })
 			},
 
 

From c6ccc0c8e528b37a7b472a906d6142ab7aa04952 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 5 Jun 2025 14:51:23 +0800
Subject: [PATCH 2/8] =?UTF-8?q?feat(feedback):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增 xy_userFeedbackAdd 接口用于提交反馈信息
- 修改上传组件 AQUplodeImgMulti 的使用方式
- 更新反馈页面的表单结构和提交逻辑
- 优化反馈内容和图片的处理方式
---
 api/apiRoute.js                    |  9 ++++
 components/AQ/AQUplodeImgMulti.vue | 12 ++++--
 pages/common/feedback.vue          | 67 ++++++++++++++++++++++--------
 3 files changed, 67 insertions(+), 21 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 06904fa..7c91198 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -425,6 +425,15 @@ export default {
         })
     },
 
+    //学生-意见反馈-添加
+    xy_userFeedbackAdd(data = {}) {
+        let url = '/userFeedback/add'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
+
+
 
 
 
diff --git a/components/AQ/AQUplodeImgMulti.vue b/components/AQ/AQUplodeImgMulti.vue
index eeef305..da3793e 100644
--- a/components/AQ/AQUplodeImgMulti.vue
+++ b/components/AQ/AQUplodeImgMulti.vue
@@ -27,6 +27,11 @@ import {Api_url} from "../../common/config";
     },
 		props: {
 		  //父组件参数
+      //上传文件接口的url
+      uploadApiUrl:{
+        type: String,
+        default: `${Api_url}/file/image`
+      },
       //表单名称
       inputName: {
 				type: String,
@@ -48,7 +53,8 @@ import {Api_url} from "../../common/config";
         return {
           inputName: this.inputName,
           inputValue: this.inputValue,
-          maxFileNum: this.maxFileNum
+          maxFileNum: this.maxFileNum,
+          uploadApiUrl: this.uploadApiUrl
         };
       }
     },
@@ -99,7 +105,7 @@ import {Api_url} from "../../common/config";
         },
 
         //上传接口地址
-        uploadApiUrl: `${Api_url}/file/image`,
+        // uploadApiUrl: `${Api_url}/file/image`,
 
         // 上传图片的样式
         imageStyles: {
@@ -168,7 +174,7 @@ import {Api_url} from "../../common/config";
               console.log('xxx',_arr)
               this.fileList.push(_arr)
 console.log('上传成功2',_arr);
-              this.filePathArr.push(res.data.path)
+              this.filePathArr.push(res.data.url)
               //上传成功
               this.emitUploadSuccess(this.filePathArr)
             }else{
diff --git a/pages/common/feedback.vue b/pages/common/feedback.vue
index 7b07849..c66557d 100644
--- a/pages/common/feedback.vue
+++ b/pages/common/feedback.vue
@@ -5,28 +5,28 @@
 		<view class="main_section">
 			<view class="section">
 				<view class="text_input">
-					<fui-textarea placeholder="请输入反馈内容" v-model="formData.content"></fui-textarea>
+					<fui-textarea placeholder="请输入反馈内容" v-model="formData.feedback_text"></fui-textarea>
 				</view>
 			</view>
 
 			<view class="section">
 				<view class="upload_box">
 					<view>上传图片</view>
-					<AQUplodeImgMulti :inputName="`images_arr`" :inputValue="formData.images_arr || []"
+					<AQUplodeImgMulti :inputName="`attachment_url_arr`" :inputValue="formData.attachment_url_arr || []" :uploadApiUrl="uploadApiUrl" :maxFileNum="1"
 						@AQUploadSuccess="AQUploadSuccess" />
 				</view>
 			</view>
 
 
-			<view class="section">
-				<view class="input_box">
-					<fui-input label="邮箱方式" borderTop placeholder="请输入邮箱" v-model="formData.mailbox"></fui-input>
-				</view>
-			</view>
+<!--			<view class="section">-->
+<!--				<view class="input_box">-->
+<!--					<fui-input label="邮箱方式" borderTop placeholder="请输入邮箱" v-model="formData.mailbox"></fui-input>-->
+<!--				</view>-->
+<!--			</view>-->
 
-			<view class="describe">
-				反馈的相关问题会第一时间通过邮箱解答。
-			</view>
+<!--			<view class="describe">-->
+<!--				反馈的相关问题会第一时间通过邮箱解答。-->
+<!--			</view>-->
 
 			<view class="btn" @click="submitForm()">提交</view>
 		</view>
@@ -34,9 +34,13 @@
 </template>
 
 <script>
+	import apiRoute from '@/api/apiRoute.js';
 	import memberApi from '@/api/member.js';
 	import AQUplodeImgMulti from '@/components/AQ/AQUplodeImgMulti';
 	import AQTabber from "@/components/AQ/AQTabber"
+  import {
+    Api_url
+  } from "@/common/config.js";
 
 
 	export default {
@@ -46,16 +50,40 @@
 		},
 		data() {
 			return {
+        uploadApiUrl:`${Api_url}/memberUploadImage`,//上传文件接口的url
 				formData: {
-					images_arr: [],
-					images:'',
-          content:'',
-          mailbox:'',
+          attachment_url_arr: [],
+          attachment_url:undefined,//图片地址,多个使用,号拼接
+          feedback_text:'',//反馈内容
+          user_id:'',//用户ID|school_customer_resources表id
 				},
 			}
 		},
 		onLoad() {},
+    onShow(){
+		  this.init()
+    },
 		methods: {
+		  async init(){
+		    //获取学生详情
+        await this.getMemberInfo()
+      },
+
+      //获取学员信息
+      async getMemberInfo() {
+        let res = await apiRoute.xy_memberInfo({})
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+          return
+        }
+        this.formData.user_id = res.data.id
+        console.log('xxxx',res.data)
+      },
+
+
 			//######AQ上传文件组件相关######
 			// 上传文件回调
 			AQUploadSuccess(res) {
@@ -67,13 +95,16 @@
 				}
 				this.formData[res.inputName] = _inputValue
 				// console.log('接收AQ上传回调xxx1',res)
-				// console.log('接收AQ上传回调xxx2',this.formData.member_store_certification_arr)
+				// console.log('接收AQ上传回调xxx2',this.formData[res.inputName])
 			},
 
       async submitForm() {
         let data = {...this.formData}
-        data.images = data.images_arr.join(',')
-        if(!data.content){
+        if(data.attachment_url_arr.length){
+          data.attachment_url = data.attachment_url_arr.join(',')
+        }
+
+        if(!data.feedback_text){
           //反馈内容为必填项
           uni.showToast({
             title:'反馈内容为必填项',
@@ -81,7 +112,7 @@
           })
           return
         }
-        let res = await memberApi.setFeedback(data)
+        let res = await apiRoute.xy_userFeedbackAdd(data)
         if(res.code != 1){
           uni.showToast({
             title:res.msg,

From b4a5b975ef8e37f49afc4493e9959b8f238d4c3f Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 5 Jun 2025 15:37:41 +0800
Subject: [PATCH 3/8] =?UTF-8?q?feat(im):=20=E5=AE=9E=E7=8E=B0=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E7=AB=AF=E8=81=8A=E5=A4=A9=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增学生端获取好友关系绑定详情、聊天消息列表、发送聊天消息和好友关系列表的接口
- 修改聊天信息页面，支持学生端和员工端的不同接口调用
- 更新消息页面，增加学生端用户信息获取和联系人列表获取的逻辑
---
 api/apiRoute.js               | 30 ++++++++++++++++++++++++++++
 pages/common/im_chat_info.vue | 37 +++++++++++++++++++++++++++++++----
 pages/common/my_message.vue   | 29 +++++++++++++++++++++++++--
 3 files changed, 90 insertions(+), 6 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 7c91198..4d2becd 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -433,6 +433,36 @@ export default {
         })
     },
 
+    //学生端-获取好友关系绑定详情
+    xy_chatGetChatFriendsInfo(data = {}) {
+        let url = '/xy/chat/getChatFriendsInfo'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+    //学生端-获取聊天消息列表
+    xy_chatGetChatMessagesList(data = {}) {
+        let url = '/xy/chat/getChatMessagesList'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+    //学生端-发送聊天消息
+    xy_chatSendChatMessages(data = {}) {
+        let url = '/xy/chat/sendChatMessages'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
+    //学生端-好友关系列表
+    xy_chatGetChatFriendsList(data = {}) {
+        let url = '/xy/chat/getChatFriendsList'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
+
 
 
 
diff --git a/pages/common/im_chat_info.vue b/pages/common/im_chat_info.vue
index a1de633..3d20bf8 100644
--- a/pages/common/im_chat_info.vue
+++ b/pages/common/im_chat_info.vue
@@ -200,7 +200,17 @@ export default {
         personnel_id: this.chatFriendsInfoParams.personnel_id,//员工资源ID
         customer_resources_id: this.chatFriendsInfoParams.customer_resources_id,//学生资源ID
       }
-      let res = await apiRoute.xs_chatGetChatFriendsInfo(params)
+
+      let res
+      if( this.from_type == 'personnel'){
+        //员工
+        res = await apiRoute.xs_chatGetChatFriendsInfo(params)
+      }else{
+        //学生
+        res = await apiRoute.xy_chatGetChatFriendsInfo(params)
+      }
+
+
       if (res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -253,7 +263,17 @@ export default {
         this.tableList = []
       }
 
-      let res = await apiRoute.xs_chatGetChatMessagesList(data)//获取消息列表
+
+      let res
+      if( this.from_type == 'personnel'){
+        //员工
+        res = await apiRoute.xs_chatGetChatMessagesList(data)//获取消息列表
+      }else{
+        //学生
+        res = await apiRoute.xy_chatGetChatMessagesList(data)//获取消息列表
+      }
+
+
       this.loading = false
       this.isReachedBottom = false;
       if (res.code != 1){
@@ -327,7 +347,16 @@ export default {
         })
         return
       }
-      let res = await apiRoute.xs_chatSendChatMessages(data)
+
+      let res
+      if( this.from_type == 'personnel'){
+        //员工
+        res = await apiRoute.xs_chatSendChatMessages(data)
+      }else{
+        //学生
+        res = await apiRoute.xy_chatSendChatMessages(data)
+      }
+
       if (res.code != 1) {
         uni.showToast({
           title: res.msg,
@@ -370,7 +399,7 @@ export default {
       this.moreShow = false
     },
 
-    //但文件上传回调
+    //文件上传回调
     uplodeImageRes(resData,extraData){
       console.log('上传成功回调',resData,extraData)
       //判断是不是上传相册图片
diff --git a/pages/common/my_message.vue b/pages/common/my_message.vue
index 7d14eb8..5ab28e7 100644
--- a/pages/common/my_message.vue
+++ b/pages/common/my_message.vue
@@ -103,11 +103,12 @@ export default {
       }else{
         //获取学生用户详情
         this.from_type = 'customer'//学生
+        await this.getMemberInit()
       }
       this.getContactList()
     },
 
-    //获取用户详情
+    //获取员工用户详情
     async getPersonnelUserInfo(){
       let data = {}
       let res = await apiRoute.getPersonnelInfo(data);
@@ -130,6 +131,20 @@ export default {
       this.filteredData.personnel_id = res.data.id
     },
 
+    //获取学员用户信息
+    async getMemberInit() {
+      let res = await apiRoute.xy_memberInfo({})
+      if(res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+      this.member_info = res.data
+      this.filteredData.customer_resources_id = res.data.id//学生资源的id
+    },
+
     //获取联系人列表
     async getContactList(){
       let params = {...this.filteredData}
@@ -147,7 +162,17 @@ export default {
         this.contactList = []
       }
 
-      let res = await apiRoute.xs_chatGetChatFriendsList(params)
+      let res
+      //1=教练,2=销售,3=学员
+      if (['1', '2'].includes(String(this.userType))) {
+        //员工
+        res = await apiRoute.xs_chatGetChatFriendsList(params)
+      }else{
+        //学生
+        res = await apiRoute.xy_chatGetChatFriendsList(params)
+      }
+
+
 
       this.loading = false
       this.isReachedBottom = false;

From f1f923f0f7a10360004926afab7b5dcb3f65b63b Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 5 Jun 2025 15:39:59 +0800
Subject: [PATCH 4/8] =?UTF-8?q?refactor(config):=20=E6=9B=B4=E6=96=B0=20AP?=
 =?UTF-8?q?I=20=E5=9C=B0=E5=9D=80=E5=B9=B6=E8=B0=83=E6=95=B4=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-启用线上测试地址，注释掉本地测试地址
- 在 im_chat_info.vue 中更新图片上传路径
---
 pages/common/im_chat_info.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pages/common/im_chat_info.vue b/pages/common/im_chat_info.vue
index 3d20bf8..52b77a9 100644
--- a/pages/common/im_chat_info.vue
+++ b/pages/common/im_chat_info.vue
@@ -102,7 +102,7 @@ export default {
   },
   data() {
     return {
-      uploadUrl:  `${Api_url}/uploadImage`,
+      uploadUrl:  `${Api_url}/uploadImage`,//图片文件上传路径|默认为员工端上传文件
 
 
       scrollTop:'',//滚动条位置,用于加载第一页后滚动到底部
@@ -182,6 +182,8 @@ export default {
         this.formData.from_type = 'customer'//学生
         this.formData.from_id = this.to_id//发送者的id(学生)
         this.formData.to_id = this.from_id//接收者的id(员工)
+
+        this.uploadUrl =   `${Api_url}/memberUploadImage`//图片文件上传路径|学生端端上传文件
       }
       //获取好友关系详情
       await this.getChatFriendsInfo()

From 8f4f042da4f8e830cf2143205973f620c9bccf26 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 5 Jun 2025 17:01:37 +0800
Subject: [PATCH 5/8] =?UTF-8?q?feat(student):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AB=AF=E4=BD=93=E6=B5=8B=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增体测报告列表和详情接口
- 实现学生首页体测数据展示- 添加体测数据列表和详情页面
---
 api/apiRoute.js                              |  16 ++
 pages/coach/student/physical_examination.vue |   2 +-
 pages/student/index/index.vue                |  40 ++++-
 pages/student/index/physical_examination.vue | 164 +++++++++----------
 4 files changed, 135 insertions(+), 87 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 4d2becd..6cf3ebe 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -462,6 +462,22 @@ export default {
         })
     },
 
+    //学生端-体测报告-列表
+    xy_physicalTest(data = {}) {
+        let url = '/xy/physicalTest'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
+    //学生端-体测报告-详情
+    xy_physicalTestInfo(data = {}) {
+        let url = '/xy/physicalTest/info'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
 
 
 
diff --git a/pages/coach/student/physical_examination.vue b/pages/coach/student/physical_examination.vue
index a9b7ef7..ff22531 100644
--- a/pages/coach/student/physical_examination.vue
+++ b/pages/coach/student/physical_examination.vue
@@ -1,4 +1,4 @@
-<!--体测数据-->
+<!--体测数据-详情页-->
 <template>
 	<view class="overall">
 		<view class="date">{{$util.formatToDateTime(surveyInfo.create_time,'Y-m-d')}}</view>
diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 5539070..5d85119 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -29,18 +29,18 @@
 				<view class="card-con-txt1">
 					<view class="card-con-txt1-left">
 						<image :src="$util.img('/uniapp_src/static/images/index/score.png')" class="overlay-image"></image>
-						<view class="card-con-txt1-left-txt top">{{memberIndexData.tx.score}}</view>
+						<view class="card-con-txt1-left-txt top">{{physicalTestInfo.calculateChildHealthScore}}</view>
 						<view class="card-con-txt1-left-txt top1">综合评分</view>
 					</view>
 					<view class="card-con-txt1-right">
-						<view style="color: #AAAAAA;padding: 5rpx;">数据测评时间：{{$util.formatToDateTime(memberIndexData.tx.create_time,'Y-m-d')}}</view>
+						<view style="color: #AAAAAA;padding: 5rpx;">数据测评时间：{{$util.formatToDateTime(physicalTestInfo.created_at,'Y-m-d')}}</view>
 						<view style="display: flex;justify-content: space-around;margin-top: 20rpx;">
 							<view>
-								<view style="font-size: 48rpx;color: #29d3b4;">{{memberIndexData.tx.height * 100}}</view>
+								<view style="font-size: 48rpx;color: #29d3b4;">{{physicalTestInfo.height}}</view>
 								<view style="color: #AAAAAA;font-size: 30rpx;">身高（CM）</view>
 							</view>
 							<view>
-								<view style="font-size: 48rpx;color: #29d3b4;">{{memberIndexData.tx.weight}}</view>
+								<view style="font-size: 48rpx;color: #29d3b4;">{{physicalTestInfo.weight}}</view>
 								<view style="color: #AAAAAA;font-size: 30rpx;">体重（KG）</view>
 							</view>
 						</view>
@@ -170,6 +170,13 @@
         },
         thisPath:'',//当前页面的路径(默认'')
         openPath:'',//正确的跳转路径(默认'')
+
+        physicalTestInfo:{
+          created_at:'',//测评时间
+          calculateChildHealthScore:'0',//综合评分
+          height:'0',//身高
+          weight:'0',//体重
+        },//体测报告详情
 			}
 		},
 		onLoad() {
@@ -186,11 +193,36 @@
 		  //学生页面初始化
       async init(){
         await this.member_init()
+        await this.getPhysicalTestList()
         this.getMemberIndex()
         this.getList()
         this.getJobAssignmentsInfo()
       },
 
+      //获取体测列表
+      async getPhysicalTestList(){
+        let params = {
+          page: 1,//当前页码
+          limit: 1,//每页返回数据条数
+          total: 1,//数据总条数
+          resource_id:this.member_info.id,//学生资源表id
+        }
+        let res  = await apiRoute.xy_physicalTest(params)
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+        }
+
+        console.log('tc',res.data)
+
+        let arr = res.data.data
+        if(arr.length){
+          this.physicalTestInfo = arr[0]
+        }
+      },
+
 
 
       async openViewHome_COPY(){
diff --git a/pages/student/index/physical_examination.vue b/pages/student/index/physical_examination.vue
index 4cd43ef..13f9ad2 100644
--- a/pages/student/index/physical_examination.vue
+++ b/pages/student/index/physical_examination.vue
@@ -1,4 +1,4 @@
-<!--体测数据-详情-->
+<!--体测数据-列表详情-->
 <template>
 	<view class="overall">
 
@@ -46,95 +46,95 @@
 </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();
-        }
+import apiRoute from '@/api/apiRoute.js';
+
+export default {
+  data() {
+    return {
+      loading: false,//加载状态
+      lowerThreshold: 100,//距离底部多远触发
+      isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
+
+      //筛选条件
+      filteredData: {
+        page: 1,//当前页码
+        limit: 10,//每页返回数据条数
+        total: 10,//数据总条数
+        students_id: '',//学员id
       },
-      //重置为第一页
-      async resetFilteredData() {
-        this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
 
-        this.filteredData.page = 1//当前页码
-        this.filteredData.limit = 10//每页返回数据条数
-        this.filteredData.total = 10//数据总条数
-      },
+      tableList: [],//表格数据
+    }
+  },
+  onLoad(options) {
+    this.filteredData.students_id = options.students_id//学员id
+  },
+  onShow() {
+    this.init()
+  },
+  methods: {
+    //初始化
+    async init() {
+      this.getList()
+    },
 
-      //获取-学员-体测列表
-      async getList(){
-        this.loading = true
+    //加载更多(下一页)
+    loadMoreData() {
+      //判断是否加载
+      if (!this.isReachedBottom) {
+        this.isReachedBottom = true;//设置为不可请求状态
+        this.getList();
+      }
+    },
+    //重置为第一页
+    async resetFilteredData() {
+      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
 
-        let data = {...this.filteredData}
+      this.filteredData.page = 1//当前页码
+      this.filteredData.limit = 10//每页返回数据条数
+      this.filteredData.total = 10//数据总条数
+    },
 
-        //判断是否还有数据
-        if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
-          this.loading = false
-          uni.showToast({
-            title: '暂无更多',
-            icon: 'none'
-          })
-          return
-        }
+    //获取-学员-体测列表
+    async getList() {
+      this.loading = true
 
-        if(data.page == 1){
-          this.tableList = []
-        }
+      let data = {...this.filteredData}
 
-        //学员-体测列表
-        let res = await memberApi.surveyList(data)
+      //判断是否还有数据
+      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
         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++
-      },
-		}
-	}
+        uni.showToast({
+          title: '暂无更多',
+          icon: 'none'
+        })
+        return
+      }
+
+      if (data.page == 1) {
+        this.tableList = []
+      }
+
+      //学员-体测列表
+      let res = await apiRoute.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> 
 
 <style lang="less" scoped>

From 285f14fd0ca6458a6b5f107b8361f7a1dc82d4c8 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Thu, 5 Jun 2025 17:31:22 +0800
Subject: [PATCH 6/8] =?UTF-8?q?refactor(student):=20=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=93=E6=B5=8B=E5=88=97=E8=A1=A8=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改物理考试列表的参数传递方式
- 更新物理考试列表的 API 调用
- 优化物理考试列表的数据显示
- 添加详细的体测数据展示
- 调整页面样式布局
---
 pages/student/index/index.vue                |   8 +-
 pages/student/index/physical_examination.vue | 105 ++++++++++++++++---
 2 files changed, 96 insertions(+), 17 deletions(-)

diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 5d85119..6e85635 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(memberIndexData)">更多</view>
+				<view class="more" @click="physical_examination()">更多</view>
 			</view>
 
 			<view class="upcomin-classes">
@@ -333,10 +333,10 @@
 				})
 			},
       //跳转体测列表
-			physical_examination(e){
-        let students_id = e.students_id
+			physical_examination(){
+        let resource_id = this.member_info.id
 				uni.navigateTo({
-					url: `/pages/student/index/physical_examination?students_id=${students_id}`
+					url: `/pages/student/index/physical_examination?resource_id=${resource_id}`
 				})
 			},
       //跳转作业列表页
diff --git a/pages/student/index/physical_examination.vue b/pages/student/index/physical_examination.vue
index 13f9ad2..7646c8e 100644
--- a/pages/student/index/physical_examination.vue
+++ b/pages/student/index/physical_examination.vue
@@ -11,33 +11,85 @@
     >
 
       <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="date">{{$util.formatToDateTime(v.created_at, 'Y-m-d')}}</view>
         <view class="content">
           <view class="circle-container">
             <view class="card-con-txt1-left">
               <image :src="$util.img('/uniapp_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">{{v.calculateChildHealthScore}}</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 style="font-size: 55rpx;color: #29d3b4;">{{(v.height)}}</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="$util.img('/uniapp_src/static/images/index/lv.png')" class="drop-image"></image>
+<!--          <view class="coach-message">-->
+<!--            <view>-->
+<!--              <image :src="$util.img('/uniapp_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 class="list_box" >
+            <view class="ul">
+              <view class="li">
+                <view class="li_title">坐位体前屈</view>
+                <view class="li_content">测试结果：{{v.seated_forward_bend}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">仰卧卷腹</view>
+                <view class="li_content">测试结果：{{v.sit_ups}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">九十度仰卧撑</view>
+                <view class="li_content">测试结果：{{v.push_ups}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">火烈鸟平衡测试</view>
+                <view class="li_content">测试结果：{{v.flamingo_balance}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">三十秒双脚连续跳</view>
+                <view class="li_content">测试结果：{{v.thirty_sec_jump}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">立定跳远</view>
+                <view class="li_content">测试结果：{{v.standing_long_jump}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">4乘10m灵敏折返跑</view>
+                <view class="li_content">测试结果：{{v.agility_run}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">走平衡木</view>
+                <view class="li_content">测试结果：{{v.balance_beam}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">网球掷远</view>
+                <view class="li_content">测试结果：{{v.tennis_throw}}</view>
+              </view>
+
+              <view class="li">
+                <view class="li_title">十米往返跑</view>
+                <view class="li_content">测试结果：{{v.ten_meter_shuttle_run}}</view>
+              </view>
             </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>
 
@@ -60,14 +112,14 @@ export default {
         page: 1,//当前页码
         limit: 10,//每页返回数据条数
         total: 10,//数据总条数
-        students_id: '',//学员id
+        resource_id: '',//学员资源id
       },
 
       tableList: [],//表格数据
     }
   },
   onLoad(options) {
-    this.filteredData.students_id = options.students_id//学员id
+    this.filteredData.resource_id = options.resource_id//学员资源id
   },
   onShow() {
     this.init()
@@ -116,7 +168,7 @@ export default {
       }
 
       //学员-体测列表
-      let res = await apiRoute.surveyList(data)
+      let res = await apiRoute.xy_physicalTest(data)
       this.loading = false
       this.isReachedBottom = false;
       if (res.code != 1) {
@@ -127,10 +179,10 @@ export default {
         return
       }
 
-      this.tableList = this.tableList.concat(res.data.list.data); // 使用 concat 方法 将新数据追加到数组中
+      this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
 
       // console.log('列表',this.tableList)
-      this.filteredData.total = res.data.list.total
+      this.filteredData.total = res.data.total
       this.filteredData.page++
     },
   }
@@ -150,6 +202,33 @@ export default {
     flex-direction: column;
     .item{
       margin-bottom: 40rpx;
+      .content{
+        .list_box{
+          font-size: 30rpx;
+          text-align: center;
+          margin-top: 120rpx;
+          .ul{
+            padding: 0 20rpx;
+            display: flex;
+            flex-wrap: wrap; /* 允许换行 */
+            justify-content: space-between;
+            align-items: center;
+            gap: 20rpx;
+            .li{
+              width: 48%; /* 每个列表项占宽度的48%，留出一些间距 */
+              display: flex;
+              flex-direction: column;
+              gap: 5rpx;
+              .li_title{
+                text-align: left;
+              }
+              .li_content{
+                text-align: left;
+              }
+            }
+          }
+        }
+      }
     }
   }
 

From 168a7bf6cc76005d1ae6cac75bb1b1e4a314f4a0 Mon Sep 17 00:00:00 2001
From: LLL <15374889135@163.com>
Date: Thu, 5 Jun 2025 18:24:12 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/apiRoute.js                              |   35 +-
 pages/coach/class/info.vue                   | 1208 +++++++++---------
 pages/coach/course/info_list.vue             |   20 +-
 pages/coach/student/info.vue                 |   45 +-
 pages/coach/student/physical_examination.vue |   54 +-
 5 files changed, 723 insertions(+), 639 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 5f0f4a2..5d08e2e 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -143,13 +143,27 @@ export default {
     //↓↓↓↓↓↓↓↓↓↓↓↓-----教练接口相关-----↓↓↓↓↓↓↓↓↓↓↓↓
 
 
-
-
-
-
-
-
-
+	//体测报告-详情
+	physicalTestInfo(data = {}) {
+        let url = '/class/physicalTest/info'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+	//体测报告-列表
+	physicalTest(data = {}) {
+        let url = '/class/physicalTest'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+	//获取学员详情
+	jlStudentsInfo(data = {}) {
+        let url = '/class/jlStudentsInfo'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
 	//获取添加学员列表
 	addStudentList(data = {}) {
         let url = '/course/addStudentList'
@@ -190,6 +204,13 @@ export default {
             return res;
         })
     },
+	//获取班级课程列表
+	classCourseList(data = {}) {
+	    let url = '/course/classCourseList'
+	    return http.get(url, data).then(res => {
+	        return res;
+	    })
+	},
 	//获取课程详情
 	courseInfo(data = {}) {
 	    let url = '/course/courseInfo'
diff --git a/pages/coach/class/info.vue b/pages/coach/class/info.vue
index 27a0e9d..d130daf 100644
--- a/pages/coach/class/info.vue
+++ b/pages/coach/class/info.vue
@@ -1,602 +1,638 @@
 <!--班级-详情-->
 <template>
-  <view class="main_box">
-    <!--自定义导航栏-->
-<!--    <view class="navbar_section">-->
-<!--      <view class="title">班级详情</view>-->
-<!--    </view>-->
-
-    <view class="main_section">
-      <view class="section_1">
-       <view class="left">
-         <image class="pic" :src="classInfo.head_coach_head_img"></image>
-         <view class="name">{{classInfo.head_coach_name}}</view>
-       </view>
-        <view class="right">
-          <view class="item">
-            班级：{{classInfo.class_name}}
-          </view>
-
-          <view class="item">
-            校区：{{classInfo.campus_name}}
-          </view>
-
-<!--          <view class="item">
+	<view class="main_box">
+		<!--自定义导航栏-->
+		<!--    <view class="navbar_section">-->
+		<!--      <view class="title">班级详情</view>-->
+		<!--    </view>-->
+
+		<view class="main_section">
+			<view class="section_1">
+				<view class="left">
+					<image class="pic" :src="classInfo.head_coach_head_img"></image>
+					<view class="name">{{classInfo.head_coach_name}}</view>
+				</view>
+				<view class="right">
+					<view class="item">
+						班级：{{classInfo.class_name}}
+					</view>
+
+					<view class="item">
+						校区：{{classInfo.campus_name}}
+					</view>
+
+					<!--          <view class="item">
 <!--            课程：篮球少儿课
 <!--          </view>-->
 
-          <view class="item">
-            人数：{{classInfo.classPersonnelRel.length}}人
-          </view>
-<!-- 
+					<view class="item">
+						人数：{{classInfo.classPersonnelRel.length}}人
+					</view>
+					<!-- 
           <view class="item">
 
             时间：{{classInfo.start_date}}  - {{classInfo.end_date}}
           </view> -->
-        </view>
-      </view>
-
-<!--      <view class="section_2">-->
-<!--        <view class="title_box">-->
-<!--          <view>最近课程</view>-->
-<!--        </view>-->
-<!--        <view class="tag_list">-->
-<!--          <view class="item" @click="openViewCourseInfo({id:1})">-->
-<!--            <view class="title">-->
-<!--              篮球少儿课-->
-<!--            </view>-->
-<!--            <view>-->
-<!--              2020.05.30 15:30 - 17:30-->
-<!--            </view>-->
-<!--          </view>-->
-<!--          <view class="item" @click="openViewCourseInfo({id:2})">-->
-<!--            <view class="title">-->
-<!--              篮球少儿课-->
-<!--            </view>-->
-<!--            <view>-->
-<!--              2020.05.30 15:30 - 17:30-->
-<!--            </view>-->
-<!--          </view>-->
-<!--        </view>-->
-<!--      </view>-->
-
-      <view class="section_3">
-        <view class="btn_box">
-          <view :class="['btn', tabType=='1'?'select':'']" @click="tabChange(1)">
-            班级成员
-          </view>
-          <view :class="['btn', tabType=='2'?'select':'']" @click="tabChange(2)">
-            课程计划
-          </view>
-        </view>
-      </view>
-
-      <!-- 班级成员列表-->
-      <view class="section_4" v-if="tabType=='1'">
-        <view class="ul">
-          <view
-              class="li"
-              v-for="(v,k) in classInfo.classPersonnelRel"
-              :key="k"
-              @click="openViewStudentInfo(v)"
-          >
-            <view class="left">
-              <view class="box_1">
-                <image class="pic" :src="$util.img(v.student.customerResources.member.headimg)"></image>
-                <view class="tag_box" v-if="v.expire">
-                  即将到期
-                </view>
-              </view>
-              <view class="box_2">
-                <view class="name">{{ v.student.name }}</view>
-                <view class="date">课程截止时间：{{ $util.formatToDateTime(v.end_date, 'Y-m-d') }}</view>
-              </view>
-            </view>
-            <view class="right">
-              <view class="item">
-                <view>{{ v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours }}</view>
-                <view>已上课时</view>
-              </view>
-              <view class="item">
-                <view>{{ (v.studentCoursesInfo.total_hours + v.studentCoursesInfo.gift_hours) - (v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours) }}</view>
-                <view>剩余课时</view>
-              </view>
-            </view>
-          </view>
-        </view>
-      </view>
-
-      <!--课程计划-->
-      <scroll-view
-          v-if="tabType=='2'"
-          class="section_5"
-          scroll-y="true"
-          :lower-threshold="lowerThreshold"
-          @scrolltolower="loadMoreData"
-          style="height: 65vh;"
-      >
-        <view class="ul">
-          <view
-              class="li"
-              v-for="(v,k) in courseList"
-              :key="k"
-              @click="openViewCourseInfo(v)"
-          >
-            <view class="top_box">
-              <view class="title">
-                课程：{{v.courses_name}}
-              </view>
-              <view class="title">
-                时间：{{v.date}}
-              </view>
-              <view class="title">
-                地点：{{v.address}}
-              </view>
-            </view>
-            <view class="bottom_box">
-              <view class="item">
-                <view class="left">应到学员（{{v.max_students}}）</view>
-                <view class="right">
-                  查看
-                  <fui-icon size="35" color="#fff" name="arrowright"></fui-icon>
-                </view>
-              </view>
-              <view class="item">
-                <view class="left">已签到学生（{{v.has_sign_count}}/{{v.max_students}}）</view>
-                <view class="right">
-                  查看
-                  <fui-icon size="35" color="#fff" name="arrowright"></fui-icon>
-                </view>
-              </view>
-<!--              <view class="item">-->
-<!--                <view class="left">作业完成率（80%）</view>-->
-<!--                <view class="right">-->
-<!--                  查看-->
-<!--                  <fui-icon size="35" color="#fff" name="arrowright"></fui-icon>-->
-<!--                </view>-->
-<!--              </view>-->
-            </view>
-
-            <view class="tag" v-if="!(['1','2'].includes(String(v.status)))" style="background-color:#20CAAF;">
-              未开始
-            </view>
-            <view class="tag" v-if="v.status == 1" style="background-color:#fad24e;">
-              上课中
-            </view>
-
-            <view class="tag" v-if="v.status == 2" style="background-color:#e2e2e2;">
-              已结束
-            </view>
-          </view>
-        </view>
-      </scroll-view>
-    </view>
-
-<!--    底部导航-->
-<!--    <AQTabber/>-->
-  </view>
+				</view>
+			</view>
+
+			<!--      <view class="section_2">-->
+			<!--        <view class="title_box">-->
+			<!--          <view>最近课程</view>-->
+			<!--        </view>-->
+			<!--        <view class="tag_list">-->
+			<!--          <view class="item" @click="openViewCourseInfo({id:1})">-->
+			<!--            <view class="title">-->
+			<!--              篮球少儿课-->
+			<!--            </view>-->
+			<!--            <view>-->
+			<!--              2020.05.30 15:30 - 17:30-->
+			<!--            </view>-->
+			<!--          </view>-->
+			<!--          <view class="item" @click="openViewCourseInfo({id:2})">-->
+			<!--            <view class="title">-->
+			<!--              篮球少儿课-->
+			<!--            </view>-->
+			<!--            <view>-->
+			<!--              2020.05.30 15:30 - 17:30-->
+			<!--            </view>-->
+			<!--          </view>-->
+			<!--        </view>-->
+			<!--      </view>-->
+
+			<view class="section_3">
+				<view class="btn_box">
+					<view :class="['btn', tabType=='1'?'select':'']" @click="tabChange(1)">
+						班级成员
+					</view>
+					<view :class="['btn', tabType=='2'?'select':'']" @click="tabChange(2)">
+						课程计划
+					</view>
+				</view>
+			</view>
+
+			<!-- 班级成员列表-->
+			<view class="section_4" v-if="tabType=='1'">
+				<view class="ul">
+					<view class="li" v-for="(v,k) in classInfo.classPersonnelRel" :key="k"
+						@click="openViewStudentInfo(v)">
+						<view class="left">
+							<view class="box_1">
+								<image class="pic" :src="$util.img(v.student.customerResources.member.headimg)"></image>
+								<view class="tag_box" v-if="v.expire">
+									即将到期
+								</view>
+							</view>
+							<view class="box_2">
+								<view class="name">{{ v.student.name }}</view>
+								<view class="date">课程截止时间：{{ $util.formatToDateTime(v.end_date, 'Y-m-d') }}</view>
+							</view>
+						</view>
+						<view class="right">
+							<view class="item">
+								<view>{{ v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours }}
+								</view>
+								<view>已上课时</view>
+							</view>
+							<view class="item">
+								<view>
+									{{ (v.studentCoursesInfo.total_hours + v.studentCoursesInfo.gift_hours) - (v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours) }}
+								</view>
+								<view>剩余课时</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!--课程计划-->
+			<scroll-view v-if="tabType=='2'" class="section_5" scroll-y="true" :lower-threshold="lowerThreshold"
+				@scrolltolower="loadMoreData" style="height: 65vh;">
+				<view class="ul">
+					<view class="li" v-for="(v,k) in courseList" :key="k" @click="openViewCourseInfo(v)">
+						<view class="top_box">
+							<view class="title">
+								课程：{{v.course.course_name}}
+							</view>
+							<view class="title">
+								时间：{{v.course_date}}
+							</view>
+							<view class="title">
+								地点：{{v.campus_name}}
+							</view>
+						</view>
+						<view class="bottom_box">
+						  <view class="item">
+							<view class="left">应到学员（{{v.student.length}}）</view>
+							<view class="right">
+							  查看
+							  <fui-icon size="35" color="#fff" name="arrowright"></fui-icon>
+							</view>
+						  </view>
+						  <view class="item">
+							<view class="left">已签到学生（{{v.student_courses.length}}/{{v.student.length}}）</view>
+							<view class="right">
+							  查看
+							  <fui-icon size="35" color="#fff" name="arrowright"></fui-icon>
+							</view>
+						  </view>
+						<!--              <view class="item">-->
+						<!--                <view class="left">作业完成率（80%）</view>-->
+						<!--                <view class="right">-->
+						<!--                  查看-->
+						<!--                  <fui-icon size="35" color="#fff" name="arrowright"></fui-icon>-->
+						<!--                </view>-->
+						<!--              </view>-->
+						</view>
+
+						<view class="tag" v-if="isCourseFuture(v.student_courses[0].start_date)"
+							style="background-color:#20CAAF;">
+							未开始
+						</view>
+						<view class="tag" v-if="isNowBetween(v.student_courses[0].start_date, v.student_courses[0].end_date)"
+							style="background-color:#fad24e;">
+							上课中
+						</view>
+						<view class="tag" v-if="!isCourseFuture(v.student_courses[0].end_date)" style="background-color:#e2e2e2;">
+							已结束
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<!--    底部导航-->
+		<!--    <AQTabber/>-->
+	</view>
 </template>
 
 <script>
-import memberApi from '@/api/member.js';
-import AQTabber from "@/components/AQ/AQTabber.vue"
-import apiRoute from '@/api/apiRoute.js';
-
-export default {
-  components: {
-    AQTabber,
-  },
-  data() {
-    return {
-      class_id:'',//班级id
-      classInfo:{},//班级数据
-      classMemberList:{},//班级成员
-
-      tabType:'1',//1=班级成员,2=课程计划
-
-
-      loading: false,//加载状态
-      lowerThreshold: 100,//距离底部多远触发
-      isReachedBottom: false,//防止重复加载|true=不可加载|false=可加载
-
-      //筛选条件
-      filteredData: {
-        page: 1,//当前页码
-        limit: 10,//每页返回数据条数
-        total: 10,//数据总条数
-        class_id: '',//班级id
-      },
-      courseList:[],//课程计划数据
-    }
-  },
-  onLoad(options) {
-    this.class_id = options.class_id//课程id
-  },
-  onShow() {
-    this.init()
-  },
-  //下拉刷新
-  async onPullDownRefresh() {
-    //重置为第一页
-    await this.loadData()
-    await this.getCourseList()
-  },
-  methods: {
-
-    async init(){
-      // member/course_list//课程列表
-      // member/class_info//班级详情+成员详情
-      this.getClassInfo()//获取班级详情
-      //await this.getCourseList()//获取课程列表
-
-    },
-
-    //教练端-获取班级详情
-    async getClassInfo(){
-      let res = await apiRoute.jlClassInfo({class_id:this.class_id})//班级详情
-      if(res.code != 1){
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-      console.log('获取班级列表',res.data)
-      this.classInfo = res.data
-      this.classMemberList = res.data.students_list
-    },
-
-
-    //加载更过(下一页)
-    loadMoreData() {
-      //判断是否加载
-      if (!this.isReachedBottom) {
-        this.isReachedBottom = true;//设置为不可请求状态
-        this.getCourseList();
-      }
-    },
-    //重置为第一页
-    async loadData() {
-      this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
-
-      this.filteredData.page = 1//当前页码
-      this.filteredData.limit = 10//每页返回数据条数
-      this.filteredData.total = 10//数据总条数
-    },
-    //教练端-获取课程列表
-    async getCourseList(){
-
-      let data = {...this.filteredData}
-      data.class_id = this.class_id
-
-      console.log(12123,this.courseList)
-
-      if(data.page == 1){
-        this.courseList = []
-      }
-
-      //判断是否还有数据
-      if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
-        this.loading = false
-        uni.showToast({
-          title: '暂无更多',
-          icon: 'none'
-        })
-        return
-      }
-
-      let res = await memberApi.courseList(data)
-      this.loading = false
-      this.isReachedBottom = false;
-      if (res.code != 1) {
-        uni.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        return
-      }
-
-
-      this.courseList = this.courseList.concat(res.data.list.data)// 使用 concat 方法 将新数据追加到数组中
-
-      this.filteredData.total = res.data.list.total
-      console.log('获取课程列表',this.courseList)
-      this.filteredData.page++
-
-    },
-
-
-
-    //切换tab
-    tabChange(tabType) {
-      this.tabType = tabType
-    },
-
-    //打开课程详情
-    openViewCourseInfo(item){
-      let id= item.id
-      uni.navigateTo({
-        url: `/pages/coach/course/info_list?id=${id}`
-      })
-    },
-    //打开学员详情页
-    openViewStudentInfo(item){
-      let students_id = item.id
-      uni.navigateTo({
-        url: `/pages/coach/student/info?students_id=${students_id}`
-      })
-    },
-  }
-}
+	import memberApi from '@/api/member.js';
+	import AQTabber from "@/components/AQ/AQTabber.vue"
+	import apiRoute from '@/api/apiRoute.js';
+
+	export default {
+		components: {
+			AQTabber,
+		},
+		data() {
+			return {
+				class_id: '', //班级id
+				classInfo: {}, //班级数据
+				classMemberList: {}, //班级成员
+
+				tabType: '1', //1=班级成员,2=课程计划
+
+
+				loading: false, //加载状态
+				lowerThreshold: 100, //距离底部多远触发
+				isReachedBottom: false, //防止重复加载|true=不可加载|false=可加载
+
+				//筛选条件
+				filteredData: {
+					page: 1, //当前页码
+					limit: 10, //每页返回数据条数
+					total: 10, //数据总条数
+					class_id: '', //班级id
+				},
+				courseList: [], //课程计划数据
+			}
+		},
+		onLoad(options) {
+			this.class_id = options.class_id //课程id
+		},
+		onShow() {
+			this.init()
+		},
+		//下拉刷新
+		async onPullDownRefresh() {
+			//重置为第一页
+			await this.loadData()
+			await this.getCourseList()
+		},
+		methods: {
+
+			async init() {
+				// member/course_list//课程列表
+				// member/class_info//班级详情+成员详情
+				this.getClassInfo() //获取班级详情
+				await this.getCourseList() //获取课程列表
+
+			},
+
+			isNowBetween(start_date, end_date) {
+				const now = new Date();
+				const start = new Date(start_date);
+				const end = new Date(end_date);
+
+				return now >= start && now <= end;
+			},
+
+			isCourseFuture(courseDate) {
+				const courseTime = new Date(courseDate).getTime();
+				const nowTime = new Date().getTime();
+				return courseTime > nowTime;
+			},
+
+			//教练端-获取班级详情
+			async getClassInfo() {
+				let res = await apiRoute.jlClassInfo({
+					class_id: this.class_id
+				}) //班级详情
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+				console.log('获取班级列表', res.data)
+				this.classInfo = res.data
+				this.classMemberList = res.data.students_list
+			},
+
+
+			//加载更过(下一页)
+			loadMoreData() {
+				//判断是否加载
+				if (!this.isReachedBottom) {
+					this.isReachedBottom = true; //设置为不可请求状态
+					this.getCourseList();
+				}
+			},
+			//重置为第一页
+			async loadData() {
+				this.isReachedBottom = false; // 重置状态，以便下次触发加载更多
+
+				this.filteredData.page = 1 //当前页码
+				this.filteredData.limit = 10 //每页返回数据条数
+				this.filteredData.total = 10 //数据总条数
+			},
+			//教练端-获取课程列表
+			async getCourseList() {
+
+				let data = {
+					...this.filteredData
+				}
+				data.class_id = this.class_id
+
+				console.log(12123, this.courseList)
+
+				if (data.page == 1) {
+					this.courseList = []
+				}
+
+				//判断是否还有数据
+				if ((this.filteredData.page - 1) * this.filteredData.limit >= this.filteredData.total) {
+					this.loading = false
+					uni.showToast({
+						title: '暂无更多',
+						icon: 'none'
+					})
+					return
+				}
+
+				let res = await apiRoute.classCourseList(data)
+				this.loading = false
+				this.isReachedBottom = false;
+				if (res.code != 1) {
+					uni.showToast({
+						title: res.msg,
+						icon: 'none'
+					})
+					return
+				}
+
+
+				this.courseList = this.courseList.concat(res.data.data) // 使用 concat 方法 将新数据追加到数组中
+
+				this.filteredData.total = res.data.total
+				console.log('获取课程列表', this.courseList)
+				this.filteredData.page++
+
+			},
+
+
+
+			//切换tab
+			tabChange(tabType) {
+				this.tabType = tabType
+			},
+
+			//打开课程详情
+			openViewCourseInfo(item) {
+				let id = item.id
+				uni.navigateTo({
+					url: `/pages/coach/course/info_list?id=${id}`
+				})
+			},
+			//打开学员详情页
+			openViewStudentInfo(item) {
+				let students_id = item.student.id
+				uni.navigateTo({
+					url: `/pages/coach/student/info?students_id=${students_id}`
+				})
+			},
+		}
+	}
 </script>
 
 <style lang="less" scoped>
-
-.main_box{
-  background: #292929 ;
-}
-
-//自定义导航栏
-.navbar_section{
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  background: #292929;
-  .title{
-    padding: 40rpx 0rpx;
-
-    /* 小程序端样式 */
-    // #ifdef MP-WEIXIN
-    padding: 80rpx 0rpx;
-    // #endif
-
-
-    font-size: 30rpx;
-    color: #fff;
-  }
-}
-
-.main_section{
-  min-height: 100vh;
-  background: #292929 100%;
-  padding: 0 24rpx;
-  padding-top: 40rpx;
-  padding-bottom: 150rpx;
-  font-size: 24rpx;
-  color: #FFFFFF;
-
-  .section_1 {
-    background: #333333;
-    border-radius: 16rpx;
-    padding: 34rpx 64rpx;
-    display: flex;
-    align-items: center;
-    gap: 38rpx;
-    .left{
-      display: flex;
-      flex-direction: column;
-      align-items: center;
-      gap: 12rpx;
-      .pic{
-        width: 92rpx;
-        height: 92rpx;
-        border-radius: 50%;
-      }
-    }
-    .right{
-      display: flex;
-      flex-direction: column;
-      gap: 12rpx;
-      .item {}
-    }
-  }
-
-  .section_2{
-    margin-top: 42rpx;
-    .title_box{
-      font-size: 32rpx;
-    }
-    .tag_list{
-      margin-top: 26rpx;
-      display: flex;
-      align-items: center;
-      gap: 26rpx;
-      .item{
-        padding-left: 20rpx;
-        width: 330rpx;
-        height: 162rpx;
-        border: 1px solid #00e5bb;
-        border-radius: 10rpx;
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        gap: 10rpx;
-      }
-    }
-  }
-
-  //按钮切换
-  .section_3{
-    margin-top: 54rpx;
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    .btn_box{
-      width: 698rpx;
-      border-radius: 8rpx;
-      background-color: rgba(22,132,252,1);
-      border: 1rpx solid rgba(22,132,252,1);
-
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      overflow: hidden;
-      .btn{
-        width: 100%;
-        height: 76rpx;
-        line-height: 76rpx;
-        text-align: center;
-        color: #fff;
-        font-size: 26rpx;
-      }
-      .select{
-        color: #1684fc;
-        background-color: #fff;
-      }
-    }
-
-  }
-
-  //班级成员列表
-  .section_4{
-    margin-top: 40rpx;
-    .ul{
-      display: flex;
-      flex-direction: column;
-      gap: 10rpx;
-      .li{
-        padding: 20rpx 0;
-        padding-bottom: 40rpx;
-        border-bottom: 2px solid #D7D7D7;
-        display: flex;
-        justify-content: space-between;
-        .left{
-          display: flex;
-          align-items: center;
-          gap: 30rpx;
-          .box_1{
-            padding-left: 20rpx;
-            display: flex;
-            flex-direction: column;
-            align-items: center;
-            justify-content: center;
-            position: relative;
-            .pic{
-              width: 84rpx;
-              height: 84rpx;
-              border-radius: 50%;
-            }
-            .tag_box{
-              position: absolute;
-              bottom: -30rpx;
-              width: 120rpx;
-              height: 38rpx;
-              background-color: #F59A23;
-              border-radius: 4rpx;
-              line-height: 35rpx;
-              text-align: center;
-              font-size: 20rpx;
-            }
-          }
-          .box_2{
-            display: flex;
-            flex-direction: column;
-            gap: 20rpx;
-            .name{
-              font-size: 28rpx;
-            }
-            .date{
-              font-size: 24rpx;
-            }
-          }
-        }
-        .right{
-          display: flex;
-          align-items: center;
-          gap: 14rpx;
-          .item{
-            border: 1px solid #00E5BB;
-            border-radius: 10rpx;
-            width: 102rpx;
-            display: flex;
-            flex-direction: column;
-            view{
-              text-align: center;
-              height: 50rpx;
-              line-height: 50rpx;
-            }
-            view:nth-child(1){
-              font-size: 32rpx;
-              background-color: #fff;
-              color: #00e5bb;
-            }
-            view:nth-child(2){
-              font-size: 20rpx;
-              background-color: #00e5bb;
-            }
-          }
-        }
-      }
-    }
-
-  }
-
-  //课程计划
-  .section_5{
-    margin-top: 36rpx;
-    .ul{
-      display: flex;
-      flex-direction: column;
-      gap: 30rpx;
-      .li{
-        position: relative;
-        border-radius: 10rpx;
-        background-color: rgba(63,63,67,1);
-        border: 2rpx solid rgba(0,229,187,1);
-        padding: 20rpx 14rpx;
-
-        display: flex;
-        flex-direction: column;
-        .top_box{
-          display: flex;
-          flex-direction: column;
-          gap: 10rpx;
-          .title{
-            color: rgba(255,255,255,1);
-            font-size: 24rpx;
-          }
-        }
-        .bottom_box{
-          padding-top: 10rpx;
-          margin-top: 20rpx;
-          border-top: 1px dashed #F2F2F2;
-          display: flex;
-          flex-direction: column;
-          gap: 10rpx;
-          .item{
-            display: flex;
-            align-items: center;
-            justify-content: space-between;
-
-            color: rgba(215,215,215,1);
-            font-size: 24rpx;
-          }
-        }
-        .tag{
-          position: absolute;
-          right: 0rpx;
-          top: 0rpx;
-          width: 110rpx;
-          height: 60rpx;
-          line-height: 58rpx;
-          border-radius: 0rpx 8rpx 0rpx 24rpx;
-          background-color: rgba(32,202,175,1);
-          color: rgba(255,255,255,1);
-          font-size: 24rpx;
-          text-align: center;
-          border: 0rpx solid rgba(121,121,121,1);
-        }
-      }
-    }
-  }
-
-
-
-
-
-
-
-}
-
-
+	.main_box {
+		background: #292929;
+	}
+
+	//自定义导航栏
+	.navbar_section {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #292929;
+
+		.title {
+			padding: 40rpx 0rpx;
+
+			/* 小程序端样式 */
+			// #ifdef MP-WEIXIN
+			padding: 80rpx 0rpx;
+			// #endif
+
+
+			font-size: 30rpx;
+			color: #fff;
+		}
+	}
+
+	.main_section {
+		min-height: 100vh;
+		background: #292929 100%;
+		padding: 0 24rpx;
+		padding-top: 40rpx;
+		padding-bottom: 150rpx;
+		font-size: 24rpx;
+		color: #FFFFFF;
+
+		.section_1 {
+			background: #333333;
+			border-radius: 16rpx;
+			padding: 34rpx 64rpx;
+			display: flex;
+			align-items: center;
+			gap: 38rpx;
+
+			.left {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				gap: 12rpx;
+
+				.pic {
+					width: 92rpx;
+					height: 92rpx;
+					border-radius: 50%;
+				}
+			}
+
+			.right {
+				display: flex;
+				flex-direction: column;
+				gap: 12rpx;
+
+				.item {}
+			}
+		}
+
+		.section_2 {
+			margin-top: 42rpx;
+
+			.title_box {
+				font-size: 32rpx;
+			}
+
+			.tag_list {
+				margin-top: 26rpx;
+				display: flex;
+				align-items: center;
+				gap: 26rpx;
+
+				.item {
+					padding-left: 20rpx;
+					width: 330rpx;
+					height: 162rpx;
+					border: 1px solid #00e5bb;
+					border-radius: 10rpx;
+					display: flex;
+					flex-direction: column;
+					justify-content: center;
+					gap: 10rpx;
+				}
+			}
+		}
+
+		//按钮切换
+		.section_3 {
+			margin-top: 54rpx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			.btn_box {
+				width: 698rpx;
+				border-radius: 8rpx;
+				background-color: rgba(22, 132, 252, 1);
+				border: 1rpx solid rgba(22, 132, 252, 1);
+
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				overflow: hidden;
+
+				.btn {
+					width: 100%;
+					height: 76rpx;
+					line-height: 76rpx;
+					text-align: center;
+					color: #fff;
+					font-size: 26rpx;
+				}
+
+				.select {
+					color: #1684fc;
+					background-color: #fff;
+				}
+			}
+
+		}
+
+		//班级成员列表
+		.section_4 {
+			margin-top: 40rpx;
+
+			.ul {
+				display: flex;
+				flex-direction: column;
+				gap: 10rpx;
+
+				.li {
+					padding: 20rpx 0;
+					padding-bottom: 40rpx;
+					border-bottom: 2px solid #D7D7D7;
+					display: flex;
+					justify-content: space-between;
+
+					.left {
+						display: flex;
+						align-items: center;
+						gap: 30rpx;
+
+						.box_1 {
+							padding-left: 20rpx;
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+							justify-content: center;
+							position: relative;
+
+							.pic {
+								width: 84rpx;
+								height: 84rpx;
+								border-radius: 50%;
+							}
+
+							.tag_box {
+								position: absolute;
+								bottom: -30rpx;
+								width: 120rpx;
+								height: 38rpx;
+								background-color: #F59A23;
+								border-radius: 4rpx;
+								line-height: 35rpx;
+								text-align: center;
+								font-size: 20rpx;
+							}
+						}
+
+						.box_2 {
+							display: flex;
+							flex-direction: column;
+							gap: 20rpx;
+
+							.name {
+								font-size: 28rpx;
+							}
+
+							.date {
+								font-size: 24rpx;
+							}
+						}
+					}
+
+					.right {
+						display: flex;
+						align-items: center;
+						gap: 14rpx;
+
+						.item {
+							border: 1px solid #00E5BB;
+							border-radius: 10rpx;
+							width: 102rpx;
+							display: flex;
+							flex-direction: column;
+
+							view {
+								text-align: center;
+								height: 50rpx;
+								line-height: 50rpx;
+							}
+
+							view:nth-child(1) {
+								font-size: 32rpx;
+								background-color: #fff;
+								color: #00e5bb;
+							}
+
+							view:nth-child(2) {
+								font-size: 20rpx;
+								background-color: #00e5bb;
+							}
+						}
+					}
+				}
+			}
+
+		}
+
+		//课程计划
+		.section_5 {
+			margin-top: 36rpx;
+
+			.ul {
+				display: flex;
+				flex-direction: column;
+				gap: 30rpx;
+
+				.li {
+					position: relative;
+					border-radius: 10rpx;
+					background-color: rgba(63, 63, 67, 1);
+					border: 2rpx solid rgba(0, 229, 187, 1);
+					padding: 20rpx 14rpx;
+
+					display: flex;
+					flex-direction: column;
+
+					.top_box {
+						display: flex;
+						flex-direction: column;
+						gap: 10rpx;
+
+						.title {
+							color: rgba(255, 255, 255, 1);
+							font-size: 24rpx;
+						}
+					}
+
+					.bottom_box {
+						padding-top: 10rpx;
+						margin-top: 20rpx;
+						border-top: 1px dashed #F2F2F2;
+						display: flex;
+						flex-direction: column;
+						gap: 10rpx;
+
+						.item {
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+
+							color: rgba(215, 215, 215, 1);
+							font-size: 24rpx;
+						}
+					}
+
+					.tag {
+						position: absolute;
+						right: 0rpx;
+						top: 0rpx;
+						width: 110rpx;
+						height: 60rpx;
+						line-height: 58rpx;
+						border-radius: 0rpx 8rpx 0rpx 24rpx;
+						background-color: rgba(32, 202, 175, 1);
+						color: rgba(255, 255, 255, 1);
+						font-size: 24rpx;
+						text-align: center;
+						border: 0rpx solid rgba(121, 121, 121, 1);
+					}
+				}
+			}
+		}
+
+
+
+
+
+
+
+	}
 </style>
\ No newline at end of file
diff --git a/pages/coach/course/info_list.vue b/pages/coach/course/info_list.vue
index 56a325c..43886a4 100644
--- a/pages/coach/course/info_list.vue
+++ b/pages/coach/course/info_list.vue
@@ -11,11 +11,11 @@
 				<view class="isbtn" @click="addStudent">
 					添加学员
 				</view>
-				<view v-if="courseInfo.status == 'ongoing'" class="tag" style="background-color: #FAD24E;">上课中
+				<view v-if="isNowBetween(courseInfo.student_courses[0].start_date, courseInfo.student_courses[0].end_date)" class="tag" style="background-color: #FAD24E;">上课中
 				</view>
-				<view v-if="courseInfo.status == 'completed'" class="tag" style="background-color: #e2e2e2;">已结束
+				<view v-if="!isCourseFuture(courseInfo.student_courses[0].end_date)" class="tag" style="background-color: #e2e2e2;">已结束
 				</view>
-				<view v-if="courseInfo.status == 'pending'" class="tag" style="background-color: #1cd188;">未开始
+				<view v-if="isCourseFuture(courseInfo.student_courses[0].start_date)" class="tag" style="background-color: #1cd188;">未开始
 				</view>
 			</view>
 
@@ -189,6 +189,20 @@
 			async init() {
 				this.getCourseInfo()
 			},
+			
+			isNowBetween(start_date, end_date) {
+				const now = new Date();
+				const start = new Date(start_date);
+				const end = new Date(end_date);
+			
+				return now >= start && now <= end;
+			},
+			
+			isCourseFuture(courseDate) {
+				const courseTime = new Date(courseDate).getTime();
+				const nowTime = new Date().getTime();
+				return courseTime > nowTime;
+			},
 
 			//教练端-课程详情
 			async getCourseInfo() {
diff --git a/pages/coach/student/info.vue b/pages/coach/student/info.vue
index 904152f..d8e314b 100644
--- a/pages/coach/student/info.vue
+++ b/pages/coach/student/info.vue
@@ -10,23 +10,24 @@
     <view class="user_section">
      <view class="box">
        <view class="left">
-         <image class="pic" :src="$util.img(studentsInfo.header)"></image>
-         <view class="btn_box" v-if="checkExpireTime(studentsInfo.expire_time)">
+         <image class="pic" :src="$util.img(studentsInfo.customerResources.member.headimg)"></image>
+<!--         <view class="btn_box" v-if="checkExpireTime(studentsInfo.expire_time)">
            <view class="btn">即将到期</view>
-         </view>
+         </view> -->
        </view>
        <view class="right">
          <view class="item">
            <view class="name">{{studentsInfo.name}}</view>
            <view class="age">
-             {{studentsInfo.age}}岁
+             <!-- {{formatAgeMonth(studentsInfo.age)}} -->
+			 {{studentsInfo.customerResources.age}}岁
            </view>
          </view>
 <!--         <view class="item">-->
 <!--           <view class="title">家长姓名：黄大呢</view>-->
 <!--         </view>-->
          <view class="item">
-           <view class="title">电话：{{studentsInfo.phone}}</view>
+           <view class="title">电话：{{studentsInfo.customerResources.phone_number}}</view>
          </view>
        </view>
      </view>
@@ -111,10 +112,10 @@
                 :key="k" @click="openViewPhysicalExamination(v)"
             >
               <view class="top">
-                <view class="title">综合评分:{{v.score}}</view>
+                <view class="title">综合评分:{{v.calculateChildHealthScore}}</view>
 <!--                <view class="hint">打败了99%学员</view>-->
               </view>
-              <view class="bottom">测试时间：{{v.create_time}}</view>
+              <view class="bottom">测试时间：{{$util.formatToDateTime(v.created_at, 'Y-m-d')}}</view>
             </view>
           </scroll-view>
         </view>
@@ -133,7 +134,7 @@
 <script>
 import memberApi from '@/api/member.js';
 import AQTabber from "@/components/AQ/AQTabber.vue"
-
+import apiRoute from '@/api/apiRoute.js';
 
 export default {
   components: {
@@ -157,14 +158,13 @@ export default {
         page:1,//当前页码
         limit:10,//每页返回数据条数
         total:10,//数据总条数
-        students_id: '',//学员id
+        user_id: '',//学员id
       },
       surveyList:[],//体测报告列表
     }
   },
   onLoad(options) {
     this.students_id = options.students_id//学生id
-    this.filteredData.students_id = options.students_id//学生id
   },
   onShow(){
     this.init()//初始化
@@ -174,14 +174,26 @@ export default {
     async init(){
       //获取学生详情
       await this.getStudentsInfo()
-      this.getSurveyList()
+      await this.getSurveyList()
     },
+	formatAgeMonth(input) {
+	    let str = String(input);
+	    // 分割小数点前后部分
+	    let [yearPart, monthPart] = str.split('.');
+	    // 如果没有小数部分，默认为 0
+	    if (!monthPart) {
+	        monthPart = '00';
+	    }
+	    // 如果是 00，则显示为 0
+	    monthPart = monthPart === '00' ? '0' : monthPart;
+	    return `${yearPart}岁${monthPart}月`;
+	},
     //获取学生详情
     async getStudentsInfo(){
       let data = {
         students_id:this.students_id
       }
-      let res = await memberApi.jlStudentsInfo(data)
+      let res = await apiRoute.jlStudentsInfo(data)
       if (res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -192,7 +204,8 @@ export default {
 
       this.studentsInfo = res.data//学生信息
 
-      this.assignmentsList = res.data.assignments_list//作业列表
+      this.assignmentsList = res.data.physical_test//作业列表
+	  this.filteredData.user_id = res.data.user_id
 
     },
     // 检查 expire_time 是否大于等于当前时间 5 天
@@ -253,7 +266,7 @@ export default {
       }
 
       //学员-体测列表
-      let res = await memberApi.surveyList(data)
+      let res = await apiRoute.physicalTest(data)
       this.loading = false
       this.isReachedBottom = false;
       if (res.code != 1){
@@ -264,10 +277,10 @@ export default {
         return
       }
 
-      this.surveyList = this.surveyList.concat(res.data.list.data); // 使用 concat 方法 将新数据追加到数组中
+      this.surveyList = this.surveyList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
 
       console.log('列表',this.surveyList)
-      this.filteredData.total = res.data.list.total
+      this.filteredData.total = res.data.total
       this.filteredData.page++
     },
 
diff --git a/pages/coach/student/physical_examination.vue b/pages/coach/student/physical_examination.vue
index a9b7ef7..92704f7 100644
--- a/pages/coach/student/physical_examination.vue
+++ b/pages/coach/student/physical_examination.vue
@@ -4,38 +4,38 @@
 		<view class="date">{{$util.formatToDateTime(surveyInfo.create_time,'Y-m-d')}}</view>
 
 		<view class="content">
-			<view class="circle-container">
-				<view class="card-con-txt1-left">
-					<image :src="$util.img('/uniapp_src/static/images/index/score.png')" class="overlay-image"></image>
-				</view>
-				<view class="card-con-txt1-left-txt">{{surveyInfo.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;">{{surveyInfo.height}}</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;">{{surveyInfo.weight}}</view>
-				</view>
-			</view>
-			<view class="coach-message">
-				<view>
-					<image :src="$util.img('/uniapp_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;">{{surveyInfo.content}}</view>
-			</view>
-<!--			<view style="font-size: 45rpx;text-align: center;margin-top: 30%;">详细数据信息</view>-->
+		  <view class="circle-container">
+		    <view class="card-con-txt1-left">
+		      <image :src="$util.img('/uniapp_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="$util.img('/uniapp_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>
 </template>
 
 <script>
 import memberApi from '@/api/member.js';
-
+import apiRoute from '@/api/apiRoute.js';
 	export default {
 		data() {
 			return {
@@ -61,7 +61,7 @@ import memberApi from '@/api/member.js';
         let data = {
           survey_id:this.survey_id
         }
-        let res = await memberApi.jlSurveyInfo(data)
+        let res = await apiRoute.physicalTestInfo(data)
         if(res.code != 1){
           uni.showToast({
             title: res.msg,

From c7c79981b1deb9b7dfe61e5d7c6060fa39ee1b48 Mon Sep 17 00:00:00 2001
From: liutong <836164388@qq.com>
Date: Fri, 6 Jun 2025 10:49:41 +0800
Subject: [PATCH 8/8] =?UTF-8?q?feat(student):=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=AD=A6=E7=94=9F=E8=AF=BE=E7=A8=8B=E5=AE=89=E6=8E=92=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 apiRoute.js 中新增 xy_personCourseSchedule 方法获取学生课程安排列表
- 在学生首页中添加课程安排信息展示区域
- 实现获取学生课程安排数据并展示在首页的功能
- 优化课程安排信息的显示样式，包括日期、时间、地点和课程名称
---
 api/apiRoute.js               |  8 +++
 pages/student/index/index.vue | 96 ++++++++++++++++++++++++-----------
 2 files changed, 74 insertions(+), 30 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 8ed87fb..683688a 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -499,6 +499,14 @@ export default {
         })
     },
 
+    //学生端-学生课程安排-列表
+    xy_personCourseSchedule(data = {}) {
+        let url = '/xy/personCourseSchedule'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
 
 
 
diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 6e85635..063282f 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -49,17 +49,19 @@
 				<view class="more" @click="physical_examination()">更多</view>
 			</view>
 
-			<view class="upcomin-classes">
+			<view class="upcomin-classes" v-if="personCourseScheduleInfo.id">
 				<view class="upcomin-classes-div">
 					<view class="upcomin-classes-div-con">
 						<view class="upcomin-classes-div-con-left">课程预告</view>
-						<view class="upcomin-classes-div-con-centre"
-							style="width: 2rpx;height: 60rpx;background-color: #fff;margin-left: 25rpx;"></view>
-						<view style="margin-left: 25rpx;">
-							<view>{{$util.formatToDateTime(memberIndexData.kcyg.date_time,'m-d')}} {{memberIndexData.kcyg.weekday}} {{memberIndexData.kcyg.time_slot[0]}}-{{memberIndexData.kcyg.time_slot[1]}}</view>
-							<view>{{memberIndexData.kcyg.address}} {{memberIndexData.kcyg.courses_name}}</view>
-						</view>
-						<view class="upcomin-classes-div-con-right" @click="openViewTimetableInfo(memberIndexData.kcyg)">
+
+            <view class="centre_box">
+              <view class="upcomin-classes-div-con-centre"></view>
+              <view class="centre">
+                <view>{{$util.formatToDateTime(personCourseScheduleInfo.course_date,'m-d')}} {{personCourseScheduleInfo.time_slot}}</view>
+                <view style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{personCourseScheduleInfo.venue.venue_name}} {{personCourseScheduleInfo.course.course_name}}xxxx123123</view>
+              </view>
+            </view>
+						<view class="upcomin-classes-div-con-right" @click="openViewTimetableInfo(personCourseScheduleInfo)">
 							详情
 						</view>
 					</view>
@@ -177,6 +179,10 @@
           height:'0',//身高
           weight:'0',//体重
         },//体测报告详情
+
+        personCourseScheduleInfo:{
+          id:'',
+        },//课程安排详情
 			}
 		},
 		onLoad() {
@@ -194,6 +200,7 @@
       async init(){
         await this.member_init()
         await this.getPhysicalTestList()
+        await this.getPersonCourseScheduleList()
         this.getMemberIndex()
         this.getList()
         this.getJobAssignmentsInfo()
@@ -223,6 +230,30 @@
         }
       },
 
+      //学生端-学生课程安排-列表
+      async getPersonCourseScheduleList(){
+        let params = {
+          page: 1,//当前页码
+          limit: 1,//每页返回数据条数
+          total: 1,//数据总条数
+          resources_id:this.member_info.id,//学生资源表id
+        }
+        let res  = await apiRoute.xy_personCourseSchedule(params)
+        if(res.code != 1){
+          uni.showToast({
+            title: res.msg,
+            icon: 'none'
+          })
+        }
+
+        console.log('kc',res.data)
+
+        let arr = res.data.data
+        if(arr.length){
+          this.personCourseScheduleInfo = arr[0]
+        }
+      },
+
 
 
       async openViewHome_COPY(){
@@ -696,32 +727,37 @@
 
 	.upcomin-classes-div-con {
 		display: flex;
+    justify-content: space-between;
 		align-items: center;
 		color: #fff;
+    padding: 0 40rpx;
+    .upcomin-classes-div-con-left {
+      width: 60rpx;
+      text-align: right;
+    }
+    .centre_box{
+      display: flex;
+      align-items: center;
+      .upcomin-classes-div-con-centre {
+        margin: 0 20rpx;
+        width: 2rpx;
+        height: 60rpx;
+        background-color: #fff;
+      }
+      .centre{
+        width:80%;
+      }
+    }
+    .upcomin-classes-div-con-right {
+      width: 100rpx;
+      height: 50rpx;
+      background-color: #32baa1;
+      text-align: center;
+      line-height: 50rpx;
+      border-radius: 50rpx;
+    }
 	}
 
-	.upcomin-classes-div-con-left {
-		width: 60rpx;
-		margin-left: 80rpx;
-		text-align: right;
-	}
-
-	.upcomin-classes-div-con-centre {
-		width: 2rpx;
-		height: 60rpx;
-		background-color: #fff;
-		margin-left: 25rpx;
-	}
-
-	.upcomin-classes-div-con-right {
-		width: 100rpx;
-		height: 50rpx;
-		background-color: #32baa1;
-		text-align: center;
-		line-height: 50rpx;
-		border-radius: 50rpx;
-		margin-left: 80rpx;
-	}
 
 	.after-class {
 		background-color: #292929;