feat(student): 优化学生课程安排详情页面

- 新增学生课程安排详情接口和相关功能
- 重构课程安排详情页面，展示更详细的信息
- 添加请假和取消请假功能
- 优化页面跳转逻辑，增加状态传递

api/apiRoute.js

@@ -507,6 +507,25 @@ export default {
         })
     },
 
+    //学生端-学生课程安排-详情
+    xy_personCourseScheduleInfo(data = {}) {
+        let url = '/xy/personCourseSchedule/info'
+        return http.get(url, data).then(res => {
+            return res;
+        })
+    },
+
+    //学生端-学生课程安排-详情
+    xy_personCourseScheduleEditStatus(data = {}) {
+        let url = '/xy/personCourseSchedule/editStatus'
+        return http.post(url, data).then(res => {
+            return res;
+        })
+    },
+
+
+
+
 
 
 

common/axios.js

@@ -37,7 +37,7 @@ export default {
 			title:'加载中...'
 		})
 		return new Promise((cback, reject) => {
-			console.log(Api_url + url)
+			console.log('请求地址',Api_url + url)
 			uni.request({
 				url: Api_url + url,
 				data: param,
@@ -55,8 +55,8 @@ export default {
 					if (res_code == 200) {
 						if (res_codes == 401) {
 							uni.navigateTo({
-								url: '/pages/student/login/login'
+								url: `/pages/student/login/login?res_codes=${res_codes}`
-							})			
+							})
 						}else{
 							cback(res.data);
 						}
@@ -70,7 +70,7 @@ export default {
 				} else {
 					if (res_codes == 401) {
 						uni.navigateTo({
-							url: '/pages/student/login/login'
+							url: `/pages/student/login/login?res_codes=${res_codes}`
 						})			
 					} else {
 						console.log('400/500', url, error, res)

pages/student/index/index.vue

@@ -58,7 +58,7 @@
               <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 style="white-space: nowrap; overflow: hidden; text-overflow: ellipsis;">{{personCourseScheduleInfo.courseScheduleHasOne.venue.venue_name}} {{personCourseScheduleInfo.courseScheduleHasOne.course.course_name}}</view>
               </view>
             </view>
 						<view class="upcomin-classes-div-con-right" @click="openViewTimetableInfo(personCourseScheduleInfo)">
@@ -135,7 +135,6 @@
 		},
 		data() {
 			return {
-        inited: false, // 添加标记位控制 init 只执行一次
 
         //上传接口地址
         uploadApiUrl: ``,
@@ -185,15 +184,9 @@
         },//课程安排详情
 			}
 		},
-		onLoad() {
+		onLoad() {},
-      this.openViewHome()//检测首页是否正确跳转-不正确则进行重定向
-		},
     onShow(){
-      // 防止 onShow 触发后重复 init
+      this.init()
-      if (!this.inited) {
-        this.init()
-        this.inited = true
-      }
     },
 		methods: {
 		  //学生页面初始化
@@ -237,6 +230,7 @@
           limit: 1,//每页返回数据条数
           total: 1,//数据总条数
           resources_id:this.member_info.id,//学生资源表id
+          status:'0',//状态0待上课1已上课2请假
         }
         let res  = await apiRoute.xy_personCourseSchedule(params)
         if(res.code != 1){
@@ -246,7 +240,7 @@
           })
         }
 
-        console.log('kc',res.data)
+        console.log('课程安排',res.data)
 
         let arr = res.data.data
         if(arr.length){
@@ -532,9 +526,9 @@
 
       //跳转页面-打开课时详情
       openViewTimetableInfo(item) {
-        let id = item.id
+        let person_course_schedule_id = item.id
         uni.navigateTo({
-          url: `/pages/student/timetable/info?id=${id}`
+          url: `/pages/student/timetable/info?person_course_schedule_id=${person_course_schedule_id}`
         })
       },
 

pages/student/login/login.vue

@@ -103,7 +103,9 @@ export default {
     // uni.hideHomeButton()
     // console.log(uni.getStorageSync('um_id'))
     // 防止 onShow 触发后重复 init
-    if (!this.inited) {
+
+    // let res_codes = options.res_codes || ''
+    if (!this.inited && !res_codes) {
       this.openViewHome()
       this.inited = true
     }

pages/student/timetable/info.vue

@@ -3,55 +3,55 @@
   <view class="main_box">
     <view class="main_section">
       <view class="section_1">
-        <view class="title_box">{{infoData.courses_name}}</view>
+        <view class="title_box">{{infoData.courseScheduleHasOne.course.course_name}}</view>
         <view class="ul">
           <view class="li">
             <view class="title">课程名称</view>
-            <view class="content">{{infoData.courses_name}}</view>
+            <view class="content">{{infoData.courseScheduleHasOne.course.course_name}}</view>
           </view>
 
-          <view class="li">
+<!--          <view class="li">-->
-            <view class="title">班级</view>
+<!--            <view class="title">班级</view>-->
-            <view class="content">{{infoData.classes_name}}</view>
+<!--            <view class="content">{{infoData.classes_name}}</view>-->
-          </view>
+<!--          </view>-->
 
           <view class="li">
             <view class="title">上课时间</view>
-            <view class="content">{{infoData.date_time}} {{infoData.time_slot.replace(',', '-')}}</view>
+            <view class="content">{{infoData.courseScheduleHasOne.course_date}} {{infoData.courseScheduleHasOne.time_slot}}</view>
           </view>
 
           <view class="li">
             <view class="title">上课地址</view>
-            <view class="content">{{infoData.address}}</view>
+            <view class="content">{{infoData.courseScheduleHasOne.campus_name}} {{infoData.courseScheduleHasOne.venue.venue_name}}</view>
           </view>
 
 
 
           <view class="li">
             <view class="title">教练</view>
-            <view class="content">{{infoData.staff_name}}</view>
+            <view class="content">{{infoData.courseScheduleHasOne.coach.name}}</view>
           </view>
 
           <view class="li">
             <view class="title">教练号码</view>
-            <view class="content">{{infoData.staff_phone}}</view>
+            <view class="content">{{infoData.courseScheduleHasOne.coach.phone}}</view>
           </view>
 
           <view class="li">
             <view class="title">扣除课时</view>
-            <view class="content">{{infoData.hour}}个课时</view>
+            <view class="content">{{infoData.courseScheduleHasOne.course.single_session_count}}个课时</view>
           </view>
 
-          <!--1未上课 2已上课-->
+          <!--状态0待上课1已上课2请假-->
-          <view class="state_box" v-if="infoData.status == 2">
+          <view class="state_box" v-if="infoData.status == 1">
             <view>已上</view>
           </view>
 
-          <view class="state_box_btn" v-if="infoData.status != 2">
+          <view class="state_box_btn" v-if="infoData.status != 1">
-      <!--sign_status字段| 0未签到 1已签到 2请假-->
+      <!--状态0待上课1已上课2请假-->
-            <view v-if="!['1','2'].includes(String(infoData.sign_status))" @click="askForLeave(1)">请假</view>
+            <view v-if="['2'].includes(String(infoData.status))"  @click="askForLeave(2)">取消请假</view>
 
-            <view v-else @click="askForLeave(2)">取消请假</view>
+            <view v-else @click="askForLeave(1)">请假</view>
           </view>
 
         </view>
@@ -61,11 +61,11 @@
     <!--  请假模态框-->
     <fui-modal class="leave_section" :buttons="[{text: '取消',plain: true}, {text: '保存'}]" width="600" :show="leaveShow" @cancel="closeLeaveModal" @click="closeLeaveModal">
       <text class="fui-title" style="font-size: 30rpx;padding: 15rpx">请假申请</text>
-      <view class="form_box" style="width: 100%;padding: 20rpx">
+<!--      <view class="form_box" style="width: 100%;padding: 20rpx">-->
-        <view class="input_box" style="border: 1px solid #888888;font-size: 28rpx;">
+<!--        <view class="input_box" style="border: 1px solid #888888;font-size: 28rpx;">-->
-          <fui-input style="font-size: 28rpx;height: 60rpx;line-height: 60rpx;padding-left: 15rpx" :borderBottom="false"  placeholder="请输入请假原因" v-model="leaveFormData.reason"></fui-input>
+<!--          <fui-input style="font-size: 28rpx;height: 60rpx;line-height: 60rpx;padding-left: 15rpx" :borderBottom="false"  placeholder="请输入请假原因" v-model="leaveFormData.reason"></fui-input>-->
-        </view>
+<!--        </view>-->
-      </view>
+<!--      </view>-->
     </fui-modal>
 
 <!--取消请假-->
@@ -74,6 +74,7 @@
 </template>
 
 <script>
+import apiRoute from '@/api/apiRoute.js';
 import memberApi from '@/api/member.js';
 import AQTabber from "@/components/AQ/AQTabber.vue"
 
@@ -84,18 +85,19 @@ export default {
   },
   data() {
     return {
-      infoData:{},//详情数据
+      memberInfo:{id:''},//当前登录用户的学生详情
+      infoData:{id:''},//详情数据
       //筛选条件
       filteredData: {
-        id: '',//课程id
+        person_course_schedule_id: '',//人员与课程安排关系表id
       },
 
       leaveShow:false,//请假模态框显示状态
 
       //请假表单
       leaveFormData:{
-        schedules_id: '',//详情 id
+        person_course_schedule_id: '',//人员与课程安排关系表id
-        courses_id: '',//课程id
+        status: '',//状态0待上课1已上课2请假
         reason: '',//请假原因
         file_url: '',//附件
       },
@@ -105,9 +107,10 @@ export default {
     }
   },
   onLoad(options) {
-    this.filteredData.id = options.id//课程id
+
-    this.leaveFormData.courses_id = options.id//课程id
+    this.filteredData.person_course_schedule_id = options.person_course_schedule_id//人员与课程安排关系表id
-    this.leaveFormData.schedules_id = options.id//请假详情id
+
+    this.leaveFormData.person_course_schedule_id = options.person_course_schedule_id//人员与课程安排关系表id
   },
   onShow(){
     this.init()
@@ -115,13 +118,27 @@ export default {
   methods: {
     //初始化
     async init(){
+      await this.getMemberInit()
       await this.getInfo()
     },
 
+    //获取学生登录人的学生资源详情
+    async getMemberInit(){
+      let res = await apiRoute.xy_memberInfo({})
+      if(res.code != 1){
+        uni.showToast({
+          title: res.msg,
+          icon: 'none'
+        })
+        return
+      }
+      this.memberInfo = res.data
+    },
+
     //获取课程详情
     async getInfo(){
-      let res = await memberApi.courseInfo({
+      let res = await apiRoute.xy_personCourseScheduleInfo({
-        id: this.filteredData.id,
+        person_course_schedule_id: this.filteredData.person_course_schedule_id,
       })
       if(res.code != 1){
         uni.showToast({
@@ -162,13 +179,13 @@ export default {
         this.leaveFormData.reason = ''
       }else{
         //点击了确定
-        if (!this.leaveFormData.reason){
+        // if (!this.leaveFormData.reason){
-          uni.showToast({
+        //   uni.showToast({
-            title: '请输入请假原因',
+        //     title: '请输入请假原因',
-            icon: 'none'
+        //     icon: 'none'
-          })
+        //   })
-          return
+        //   return
-        }
+        // }
         this.submitLeave()//发送请假请求
       }
       this.leaveShow = false
@@ -176,7 +193,8 @@ export default {
     //发送请假申请
     async submitLeave(){
       let data = {...this.leaveFormData}
-      let res = await memberApi.askForLeave(data)
+      data.status = 2
+      let res = await apiRoute.xy_personCourseScheduleEditStatus(data)
       if(res.code != 1){
         uni.showToast({
           title: res.msg,
@@ -203,7 +221,8 @@ export default {
       //取消请假
       this.leaveFormData.reason = ''//请假原因
       let data = {...this.leaveFormData}
-      let res = await memberApi.delAskForLeave(data)
+      data.status = 0
+      let res = await apiRoute.xy_personCourseScheduleEditStatus(data)
       this.cancelLeaveShow = false
       if(res.code != 1){
         uni.showToast({