Browse Source

修改 bug

master
王泽彦 8 months ago
parent
commit
96690ca9d4
  1. 20
      admin/src/app/views/course_schedule/course_schedule.vue
  2. 1
      niucloud/app/api/controller/apiController/CustomerResources.php
  3. 3
      uniapp/pages-coach/coach/schedule/adjust_course.vue
  4. 40
      uniapp/pages-coach/coach/schedule/schedule_table.vue
  5. 1521
      uniapp/pages-market/clue/add_clues.vue
  6. 3
      uniapp/pages-market/clue/class_arrangement.vue
  7. 3
      uniapp/pages-market/clue/class_arrangement_detail.vue

20
admin/src/app/views/course_schedule/course_schedule.vue

@ -263,15 +263,29 @@ const venueFilterList = ref<any[]>([])
// ID // ID
const getCampusName = (id: string | number) => { const getCampusName = (id: string | number) => {
const campus = campusList.value.find(item => item.id === id) // campusList
return campus ? campus.campus_name : id if (Array.isArray(campusList.value)) {
const campus = campusList.value.find(item => item.id === id)
return campus ? campus.campus_name : id
} else if (campusList.value && typeof campusList.value === 'object') {
//
const campusArray = Object.values(campusList.value)
const campus = campusArray.find((item: any) => item.id === id)
return campus ? campus.campus_name : id
}
return id
} }
// //
const loadCampusList = () => { const loadCampusList = () => {
getWithCampusList({}) getWithCampusList({})
.then((res) => { .then((res) => {
campusList.value = res.data || [] // API
if (res.data && typeof res.data === 'object' && !Array.isArray(res.data)) {
campusList.value = Object.values(res.data)
} else {
campusList.value = res.data || []
}
}) })
.catch(() => {}) .catch(() => {})
} }

1
niucloud/app/api/controller/apiController/CustomerResources.php

@ -115,6 +115,7 @@ class CustomerResources extends BaseApiService
"communication" => $request->param('communication', ''),//沟通备注 "communication" => $request->param('communication', ''),//沟通备注
"staff_id" => $request->param('staff_id', ''),//人员ID "staff_id" => $request->param('staff_id', ''),//人员ID
"efficacious" => $request->param('efficacious', 1), "efficacious" => $request->param('efficacious', 1),
"emotional_stickiness_score" => $request->param('emotional_stickiness_score', 1),
]; ];
if (strlen($customer_resources_data['phone_number']) > 12) { if (strlen($customer_resources_data['phone_number']) > 12) {

3
uniapp/pages-coach/coach/schedule/adjust_course.vue

@ -24,7 +24,8 @@
</view> </view>
<view class="info-row"> <view class="info-row">
<text class="info-label">授课教练</text> <text class="info-label">授课教练</text>
<text class="info-value">{{ scheduleInfo.coach_name }}</text> <text class="info-value">主教练{{ scheduleInfo.coach_name }}</text>
<text class="info-value">助教{{ scheduleInfo.coach_name }}</text>
</view> </view>
<view class="info-row"> <view class="info-row">
<text class="info-label">上课场地</text> <text class="info-label">上课场地</text>

40
uniapp/pages-coach/coach/schedule/schedule_table.vue

@ -71,6 +71,11 @@
class="frozen-content-scroll" class="frozen-content-scroll"
scroll-y scroll-y
:scroll-top="scrollTop" :scroll-top="scrollTop"
:enable-flex="true"
:scroll-anchoring="false"
:enhanced="true"
:bounces="false"
:scroll-with-animation="false"
> >
<view class="frozen-content"> <view class="frozen-content">
<!-- 时间模式 --> <!-- 时间模式 -->
@ -132,6 +137,11 @@
scroll-x scroll-x
scroll-y scroll-y
:scroll-top="scrollTop" :scroll-top="scrollTop"
:enable-flex="true"
:scroll-anchoring="false"
:enhanced="true"
:bounces="false"
:scroll-with-animation="false"
@scroll="onScroll" @scroll="onScroll"
> >
<view class="schedule-container-inner" :style="{ width: tableWidth + 'rpx', minWidth: '1260rpx' }"> <view class="schedule-container-inner" :style="{ width: tableWidth + 'rpx', minWidth: '1260rpx' }">
@ -429,6 +439,7 @@ export default {
// //
scrollTop: 0, scrollTop: 0,
scrollTimer: null, //
// //
tableWidth: 1500, // 7 (7*180+120=1380rpx) tableWidth: 1500, // 7 (7*180+120=1380rpx)
@ -537,6 +548,12 @@ export default {
}, },
beforeDestroy() { beforeDestroy() {
//
if (this.scrollTimer) {
clearTimeout(this.scrollTimer)
this.scrollTimer = null
}
// H5 // H5
// #ifndef MP-WEIXIN // #ifndef MP-WEIXIN
if (typeof window !== 'undefined') { if (typeof window !== 'undefined') {
@ -1155,12 +1172,19 @@ export default {
}); });
}, },
// - // -
onScroll(e) { onScroll(e) {
// // 使
if (e.detail.scrollTop !== undefined) { if (this.scrollTimer) {
this.scrollTop = e.detail.scrollTop clearTimeout(this.scrollTimer)
} }
this.scrollTimer = setTimeout(() => {
//
if (e.detail.scrollTop !== undefined && e.detail.scrollTop !== this.scrollTop) {
this.scrollTop = e.detail.scrollTop
}
}, 16) // 60fps
}, },
// //
@ -1492,6 +1516,10 @@ export default {
.frozen-content-scroll { .frozen-content-scroll {
flex: 1; flex: 1;
overflow: hidden; overflow: hidden;
/* 优化滚动性能 */
-webkit-overflow-scrolling: touch;
scroll-behavior: auto;
overscroll-behavior: none;
} }
.frozen-content { .frozen-content {
@ -1578,6 +1606,10 @@ export default {
.schedule-scroll { .schedule-scroll {
flex: 1; flex: 1;
overflow: scroll; overflow: scroll;
/* 优化滚动性能 */
-webkit-overflow-scrolling: touch;
scroll-behavior: auto;
overscroll-behavior: none;
} }
.schedule-grid { .schedule-grid {

1521
uniapp/pages-market/clue/add_clues.vue

File diff suppressed because it is too large

3
uniapp/pages-market/clue/class_arrangement.vue

@ -94,7 +94,8 @@
<view class="row">时间{{ course.course_date || '未设置' }} {{ course.time_slot || '' }}</view> <view class="row">时间{{ course.course_date || '未设置' }} {{ course.time_slot || '' }}</view>
<view class="row">校区{{ course.campus_name || '未设置' }}</view> <view class="row">校区{{ course.campus_name || '未设置' }}</view>
<view class="row">教室{{ course.venue ? course.venue.venue_name : '未设置' }}</view> <view class="row">教室{{ course.venue ? course.venue.venue_name : '未设置' }}</view>
<view class="row">课程{{ course.course ? course.course.course_name : '未设置' }}</view> <!-- <view class="row">课程{{ course.course ? course.course.course_name : '未设置' }}</view>-->
<view class="row">班级{{ course.class_id ? course.classmodel.class_name : '未设置' }}</view>
<view class="row">人数{{ course.available_capacity || 0 }}</view> <view class="row">人数{{ course.available_capacity || 0 }}</view>
<view class="row">安排情况{{ course.student ? course.student.length : 0 }}/{{course.max_students ? course.max_students : '不限'}}</view> <view class="row">安排情况{{ course.student ? course.student.length : 0 }}/{{course.max_students ? course.max_students : '不限'}}</view>
</view> </view>

3
uniapp/pages-market/clue/class_arrangement_detail.vue

@ -5,7 +5,8 @@
<text class="course-title">课程安排详情</text> <text class="course-title">课程安排详情</text>
<view class="course-detail"> <view class="course-detail">
<text class="course-item">日期{{ schedule_info.course_date }}</text> <text class="course-item">日期{{ schedule_info.course_date }}</text>
<text class="course-item">课程名称{{ schedule_info.course_name }}</text> <!-- <text class="course-item">课程名称{{ schedule_info.course_name }}</text>-->
<text class="course-item">班级名称{{ schedule_info.class_name }}</text>
<text class="course-item">课程时间{{ schedule_info.time_slot }}</text> <text class="course-item">课程时间{{ schedule_info.time_slot }}</text>
<text class="course-item">主教练{{ schedule_info.coach_name || '待安排' }}</text> <text class="course-item">主教练{{ schedule_info.coach_name || '待安排' }}</text>
<text class="course-item">场地信息{{ schedule_info.venue_name }}</text> <text class="course-item">场地信息{{ schedule_info.venue_name }}</text>

Loading…
Cancel
Save