From 1492a8d3c0f4cd6328bed58db9cdcc15ddd8a73c Mon Sep 17 00:00:00 2001
From: LLL <15374889135@163.com>
Date: Wed, 4 Jun 2025 19:01:22 +0800
Subject: [PATCH] =?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            |  7 +++++++
 pages/coach/class/info.vue | 40 +++++++++++++++++++-------------------
 pages/coach/class/list.vue | 21 ++++++++++----------
 3 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/api/apiRoute.js b/api/apiRoute.js
index 31c1436..c702085 100644
--- a/api/apiRoute.js
+++ b/api/apiRoute.js
@@ -176,6 +176,13 @@ export default {
             return res;
         })
     },
+	//获取班级详情
+	jlClassInfo(data = {}) {
+	    let url = '/class/jlClassInfo'
+	    return http.get(url, data).then(res => {
+	        return res;
+	    })
+	},
 	//获取课程列表
 	courseList(data = {}) {
         let url = '/course/courseList'
diff --git a/pages/coach/class/info.vue b/pages/coach/class/info.vue
index b98df59..27a0e9d 100644
--- a/pages/coach/class/info.vue
+++ b/pages/coach/class/info.vue
@@ -8,31 +8,31 @@
 
     <view class="main_section">
       <view class="section_1">
-<!--        <view class="left">-->
-<!--          <image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>-->
-<!--          <view class="name">包皮子</view>-->
-<!--        </view>-->
+       <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.name}}
+            班级：{{classInfo.class_name}}
           </view>
 
           <view class="item">
-            地点：{{classInfo.address}}
+            校区：{{classInfo.campus_name}}
           </view>
 
-<!--          <view class="item">-->
-<!--            课程：篮球少儿课-->
+<!--          <view class="item">
+<!--            课程：篮球少儿课
 <!--          </view>-->
 
           <view class="item">
-            人数：{{classInfo.max_students}}人
+            人数：{{classInfo.classPersonnelRel.length}}人
           </view>
-
+<!-- 
           <view class="item">
 
             时间：{{classInfo.start_date}}  - {{classInfo.end_date}}
-          </view>
+          </view> -->
         </view>
       </view>
 
@@ -76,29 +76,29 @@
         <view class="ul">
           <view
               class="li"
-              v-for="(v,k) in classMemberList"
+              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.header)"></image>
+                <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.name }}</view>
-                <view class="date">课程截止时间：{{ $util.formatToDateTime(v.expire_time, 'Y-m-d') }}</view>
+                <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.have_study_time }}</view>
+                <view>{{ v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours }}</view>
                 <view>已上课时</view>
               </view>
               <view class="item">
-                <view>{{ v.end_study_time }}</view>
+                <view>{{ (v.studentCoursesInfo.total_hours + v.studentCoursesInfo.gift_hours) - (v.studentCoursesInfo.use_gift_hours + v.studentCoursesInfo.use_gift_hours) }}</view>
                 <view>剩余课时</view>
               </view>
             </view>
@@ -180,7 +180,7 @@
 <script>
 import memberApi from '@/api/member.js';
 import AQTabber from "@/components/AQ/AQTabber.vue"
-
+import apiRoute from '@/api/apiRoute.js';
 
 export default {
   components: {
@@ -227,13 +227,13 @@ export default {
       // member/course_list//课程列表
       // member/class_info//班级详情+成员详情
       this.getClassInfo()//获取班级详情
-      await this.getCourseList()//获取课程列表
+      //await this.getCourseList()//获取课程列表
 
     },
 
     //教练端-获取班级详情
     async getClassInfo(){
-      let res = await memberApi.jlClassInfo({class_id:this.class_id})//班级详情
+      let res = await apiRoute.jlClassInfo({class_id:this.class_id})//班级详情
       if(res.code != 1){
         uni.showToast({
           title: res.msg,
diff --git a/pages/coach/class/list.vue b/pages/coach/class/list.vue
index 7b12d2b..3da09fb 100644
--- a/pages/coach/class/list.vue
+++ b/pages/coach/class/list.vue
@@ -17,7 +17,7 @@
             scroll-y="true"
             :lower-threshold="lowerThreshold"
             @scrolltolower="loadMoreData"
-            style="height: 80vh;"
+            style="height: 65vh;"
         >
           <view
               class="li"
@@ -26,21 +26,21 @@
               @click="openViewClassInfo(v)"
           >
             <view class="left">
-              <!--              <image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>-->
+                <image class="pic" :src="v.head_coach_head_img"></image>
             </view>
             <view class="right">
               <view class="box_1">
                 <view class="name">
-                  {{v.name}}
+                  {{v.class_name}}
                 </view>
                 <view class="btn_box">
                   <view v-if="v.end_count">{{v.end_count}}人即将到期</view>
                 </view>
               </view>
               <view class="box_2">
-                <view class="user_list" v-for="(v2,k2) in v.students_list" :key="k2">
+                <view class="user_list" v-for="(v2,k2) in v.classPersonnelRel" :key="k2">
                   <image
-                      :src="$util.img(v2.header)"></image>
+                      :src="$util.img(v2.student.customerResources.member.headimg)"></image>
                 </view>
                 <view class="num">{{v.students_count}}</view>
               </view>
@@ -83,7 +83,7 @@ export default {
   },
   onLoad(options) {},
   onShow(){
-    //this.init()//初始化
+    this.init()//初始化
   },
   methods: {
     //初始化
@@ -148,14 +148,14 @@ export default {
     },
 
     async search(e){
-      //await this.resetFilteredData()
+      await this.resetFilteredData()
       this.filteredData.name = e
-      //await this.getList()
+      await this.getList()
     },
 
     //打开班级详情页
     openViewClassInfo(item){
-      let class_id = item.class_id
+      let class_id = item.id
       uni.navigateTo({
         url: `/pages/coach/class/info?class_id=${class_id}`
       })
@@ -191,7 +191,7 @@ export default {
 }
 
 .main_section{
-  min-height: 100vh;
+  // min-height: 100vh;
   background: #292929 100%;
   padding: 0 24rpx;
   padding-top: 40rpx;
@@ -236,6 +236,7 @@ export default {
         padding: 50rpx 36rpx 46rpx;
         border-radius: 16rpx;
         display: flex;
+		align-items: center;
         gap: 32rpx;
         .left{
           .pic{