Browse Source

本地保存

develop
root 5 months ago
parent
commit
1dd3dab061
  1. 9
      admin/src/app/api/order_table.ts
  2. 381
      admin/src/app/views/order_table/components/order-detail-dialog.vue
  3. 36
      admin/src/app/views/order_table/order_table.vue
  4. 0
      install.lock
  5. 5
      niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php
  6. 9
      niucloud/app/adminapi/controller/order_table/OrderTable.php
  7. 2
      niucloud/app/adminapi/controller/personnel/Personnel.php
  8. 3
      niucloud/app/adminapi/route/order_table.php
  9. 16
      niucloud/app/api/controller/apiController/OrderTable.php
  10. 45
      niucloud/app/api/controller/apiController/StudentManager.php
  11. 2
      niucloud/app/api/controller/student/StudentController.php
  12. 1
      niucloud/app/api/route/file.php
  13. 4
      niucloud/app/api/route/route.php
  14. 122
      niucloud/app/job/schedule/HandleCourseSchedule.php
  15. 14
      niucloud/app/model/order_table/OrderTable.php
  16. 15
      niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php
  17. 39
      niucloud/app/service/admin/order_table/OrderTableService.php
  18. 69
      niucloud/app/service/api/apiService/OrderTableService.php
  19. 27
      niucloud/app/service/api/apiService/StudentService.php
  20. 1
      niucloud/app/service/api/student/StudentService.php
  21. 1617
      uniapp/api/apiRoute.js
  22. 46
      uniapp/components/client-info-card/client-info-card.vue
  23. 225
      uniapp/components/fitness-record-list-popup/index.vue
  24. 27
      uniapp/components/fitness-record-popup/fitness-record-popup.less
  25. 56
      uniapp/components/fitness-record-popup/fitness-record-popup.vue
  26. 402
      uniapp/components/order-form-popup/index.vue
  27. 985
      uniapp/components/order-list-card/index.vue
  28. 505
      uniapp/components/order-list-card/payment-voucher-popup.vue
  29. 207
      uniapp/components/order-list-card/qrcode-payment-dialog.vue
  30. 340
      uniapp/components/schedule/ScheduleDetail.vue
  31. 49
      uniapp/components/student-edit-popup/student-edit-popup.less
  32. 70
      uniapp/components/student-edit-popup/student-edit-popup.vue
  33. 24
      uniapp/components/student-info-card/student-info-card.vue
  34. 87
      uniapp/components/study-plan-popup/study-plan-popup.vue
  35. 62
      uniapp/pages-coach/coach/schedule/schedule_table.vue
  36. 1
      uniapp/pages-market/clue/class_arrangement_detail.vue
  37. 705
      uniapp/pages-market/clue/clue_info.vue
  38. 201
      uniapp/pages-market/clue/edit_clues.vue

9
admin/src/app/api/order_table.ts

@ -69,4 +69,13 @@ export function getWithPersonnelList(params: Record<string, any>) {
return request.get('order_table/personnel_all', { params })
}
/**
* ()
* @param id id
* @returns
*/
export function getOrderDetail(id: number) {
return request.get(`order_table/order_detail/${id}`)
}
// USER_CODE_END -- order_table

381
admin/src/app/views/order_table/components/order-detail-dialog.vue

@ -0,0 +1,381 @@
<template>
<el-dialog
v-model="showDialog"
:title="dialogTitle"
width="700px"
:close-on-click-modal="false"
>
<el-descriptions
v-if="orderDetail"
:column="2"
border
v-loading="loading"
>
<el-descriptions-item label="订单编号">
{{ orderDetail.id }}
</el-descriptions-item>
<el-descriptions-item label="订单类型">
{{ getOrderType(orderDetail.order_type) }}
</el-descriptions-item>
<el-descriptions-item label="订单状态">
{{ getOrderStatus(orderDetail.order_status) }}
</el-descriptions-item>
<el-descriptions-item label="支付类型">
{{ getPaymentType(orderDetail.payment_type) }}
</el-descriptions-item>
<el-descriptions-item label="订单金额">
<span class="text-red-500 font-bold">¥{{ orderDetail.order_amount }}</span>
</el-descriptions-item>
<el-descriptions-item label="优惠金额" v-if="orderDetail.discount_amount">
<span class="text-green-500">¥{{ orderDetail.discount_amount }}</span>
</el-descriptions-item>
<el-descriptions-item label="课程名称">
{{ orderDetail.course_id_name || '-' }}
</el-descriptions-item>
<el-descriptions-item label="班级名称">
{{ orderDetail.class_id_name || '-' }}
</el-descriptions-item>
<el-descriptions-item label="学员姓名">
{{ orderDetail.student_name || '-' }}
</el-descriptions-item>
<el-descriptions-item label="所属校区">
{{ orderDetail.campus_name || '-' }}
</el-descriptions-item>
<el-descriptions-item label="客户姓名">
{{ orderDetail.resource_id_name || '-' }}
</el-descriptions-item>
<el-descriptions-item label="业务员">
{{ orderDetail.staff_id_name || '-' }}
</el-descriptions-item>
<el-descriptions-item label="赠品信息" v-if="orderDetail.gift_info && orderDetail.gift_info.gift_name">
{{ orderDetail.gift_info.gift_name }}
<el-tag size="small" :type="getGiftStatusType(orderDetail.gift_info.gift_status)" style="margin-left: 8px;">
{{ getGiftStatus(orderDetail.gift_info.gift_status) }}
</el-tag>
</el-descriptions-item>
<el-descriptions-item label="支付时间" v-if="orderDetail.payment_time">
{{ orderDetail.payment_time }}
</el-descriptions-item>
<el-descriptions-item label="创建时间">
{{ orderDetail.created_at }}
</el-descriptions-item>
<el-descriptions-item label="订单备注" :span="2" v-if="orderDetail.remark">
{{ orderDetail.remark }}
</el-descriptions-item>
</el-descriptions>
<!-- 确认支付时的支付凭证上传区域 -->
<div v-if="isPaymentAction && orderDetail?.order_status === 'pending'" class="payment-voucher-section">
<el-divider content-position="left">支付凭证</el-divider>
<el-form :model="paymentForm" label-width="100px" style="margin-top: 20px;">
<el-form-item label="上传凭证">
<div class="upload-wrapper">
<el-upload
:action="uploadAction"
:headers="uploadHeaders"
:show-file-list="true"
:on-success="handleUploadSuccess"
:on-error="handleUploadError"
:before-upload="beforeUpload"
list-type="picture-card"
accept="image/*"
class="voucher-upload"
>
<el-icon class="avatar-uploader-icon"><Plus /></el-icon>
</el-upload>
<div class="upload-tip">
支持 jpg/png/jpeg 格式单个文件不超过 5MB
</div>
</div>
</el-form-item>
<el-form-item label="支付备注">
<el-input
v-model="paymentForm.remark"
type="textarea"
:rows="3"
placeholder="请输入支付备注信息(可选)"
/>
</el-form-item>
</el-form>
</div>
<template #footer>
<span class="dialog-footer">
<el-button @click="showDialog = false">关闭</el-button>
<el-button
v-if="isPaymentAction && orderDetail?.order_status === 'pending'"
type="primary"
@click="handleConfirmPayment"
:disabled="paymentForm.vouchers.length === 0"
>
确认支付
</el-button>
</span>
</template>
</el-dialog>
</template>
<script lang="ts" setup>
import { ref, computed } from 'vue'
import { getOrderDetail } from '@/app/api/order_table'
import { ElMessage } from 'element-plus'
import { Plus } from '@element-plus/icons-vue'
import { getToken } from '@/utils/common'
const showDialog = ref(false)
const loading = ref(false)
const orderDetail = ref<any>(null)
const isPaymentAction = ref(false)
//
const paymentForm = ref({
vouchers: [] as string[], // URL
remark: '' //
})
//
const uploadAction = ref(import.meta.env.VITE_APP_BASE_URL + 'sys/image')
const uploadHeaders = ref({
token: getToken()
})
const dialogTitle = computed(() => {
return isPaymentAction.value ? '确认支付' : '订单详情'
})
//
const getOrderType = (type: number) => {
const typeMap: Record<number, string> = {
1: '新订单',
2: '续费订单',
3: '内部员工订单',
4: '转校',
5: '客户内转课订单'
}
return typeMap[type] || '-'
}
//
const getOrderStatus = (status: string) => {
const statusMap: Record<string, string> = {
pending: '待支付',
paid: '已支付',
signed: '待签约',
completed: '已完成',
transfer: '转学'
}
return statusMap[status] || '-'
}
//
const getPaymentType = (type: string) => {
const typeMap: Record<string, string> = {
cash: '现金支付',
scan_code: '扫码支付',
subscription: '订阅支付',
wxpay_online: '微信在线代付',
client_wxpay: '客户端微信支付',
deposit: '定金'
}
return typeMap[type] || '-'
}
//
const getGiftStatus = (status: number) => {
const statusMap: Record<number, string> = {
1: '未使用',
2: '已使用',
3: '已过期',
4: '已作废'
}
return statusMap[status] || '-'
}
//
const getGiftStatusType = (status: number) => {
const typeMap: Record<number, string> = {
1: 'success',
2: 'info',
3: 'warning',
4: 'danger'
}
return typeMap[status] || 'info'
}
//
const openDialog = async (orderId: number, forPayment: boolean = false) => {
showDialog.value = true
loading.value = true
isPaymentAction.value = forPayment
//
paymentForm.value = {
vouchers: [],
remark: ''
}
try {
const res = await getOrderDetail(orderId)
orderDetail.value = res.data
} catch (error) {
ElMessage.error('获取订单详情失败')
showDialog.value = false
} finally {
loading.value = false
}
}
//
const beforeUpload = (file: any) => {
const isImage = file.type.startsWith('image/')
const isLt5M = file.size / 1024 / 1024 < 5
if (!isImage) {
ElMessage.error('只能上传图片文件!')
return false
}
if (!isLt5M) {
ElMessage.error('图片大小不能超过 5MB!')
return false
}
return true
}
//
const handleUploadSuccess = (response: any, file: any) => {
if (response.code === 1 && response.data && response.data.url) {
paymentForm.value.vouchers.push(response.data.url)
ElMessage.success('上传成功')
} else {
ElMessage.error(response.msg || '上传失败')
}
}
//
const handleUploadError = () => {
ElMessage.error('上传失败,请重试')
}
//
const handleConfirmPayment = () => {
if (paymentForm.value.vouchers.length === 0) {
ElMessage.warning('请上传支付凭证')
return
}
//
console.log('订单ID:', orderDetail.value.id)
console.log('支付凭证:', paymentForm.value.vouchers)
console.log('支付备注:', paymentForm.value.remark)
ElMessage.success('支付确认成功,待后端接口实现')
showDialog.value = false
}
//
defineExpose({
openDialog
})
</script>
<style scoped>
.text-red-500 {
color: #ef4444;
}
.text-green-500 {
color: #10b981;
}
.font-bold {
font-weight: bold;
}
.payment-voucher-section {
margin-top: 20px;
padding: 20px;
background-color: #f9fafb;
border-radius: 8px;
}
/* 上传容器布局 */
.upload-wrapper {
width: 100%;
display: block;
overflow: visible;
}
/* 上传提示文字 */
.upload-tip {
margin-top: 10px;
padding-top: 10px;
display: block;
font-size: 12px;
color: #999;
line-height: 1.5;
clear: both;
}
/* 上传组件样式 - 强制显示为块级元素 */
.voucher-upload {
width: 100%;
display: block !important;
overflow: visible !important;
}
/* el-upload 组件内部样式穿透 */
:deep(.el-upload--picture-card) {
width: 120px !important;
height: 120px !important;
display: inline-block !important;
vertical-align: top !important;
margin: 0 8px 8px 0 !important;
}
:deep(.el-upload-list) {
display: block !important;
overflow: visible !important;
position: relative !important;
}
:deep(.el-upload-list--picture-card) {
display: block !important;
vertical-align: top !important;
width: 100% !important;
overflow: visible !important;
position: relative !important;
}
:deep(.el-upload-list__item) {
width: 120px !important;
height: 120px !important;
display: inline-block !important;
margin: 0 8px 8px 0 !important;
vertical-align: top !important;
position: relative !important;
}
.avatar-uploader-icon {
font-size: 28px;
color: #8c939d;
width: 120px;
height: 120px;
display: flex;
align-items: center;
justify-content: center;
}
</style>

36
admin/src/app/views/order_table/order_table.vue

@ -18,8 +18,8 @@
:value="item.value" />
</el-select>
</el-form-item>
<el-form-item label="订单类型" prop="order_type">
<el-select class="w-[280px]" v-model="orderTableTable.searchParam.order_type" clearable
placeholder="请选择订单类型">
@ -27,10 +27,10 @@
<el-option label="新订单" :value="1"></el-option>
<el-option label="续费订单" :value="2"></el-option>
<el-option label="内部员工订单" :value="3"></el-option>
</el-select>
</el-form-item>
<el-form-item :label="t('paymentType')" prop="payment_type">
<el-select class="w-[280px]" v-model="orderTableTable.searchParam.payment_type" clearable
@ -59,7 +59,7 @@
</template>
<el-table-column prop="resource_id_name" :label="t('resourceId')" min-width="120"
:show-overflow-tooltip="true" />
<el-table-column prop="type" label="订单类型" min-width="120" />
<el-table-column :label="t('orderStatus')" min-width="180" align="center"
@ -95,14 +95,18 @@
<el-table-column prop="payment_time" :label="t('paymentTime')" min-width="120"
:show-overflow-tooltip="true" />
<el-table-column :label="t('operation')" fixed="right" min-width="120">
<el-table-column :label="t('operation')" fixed="right" min-width="180">
<template #default="{ row }">
<el-button type="primary" link @click="startPayment(row.id)" v-if="row.order_status == 'pending' && row.payment_type == 'scan_code'">支付</el-button>
<el-button type="primary" link @click="startPayment(row.id)" v-if="row.order_status == 'pending' && row.payment_type == 'scan_code'">扫码支付</el-button>
<el-button type="primary" link @click="editEvent(row)">{{
t('edit')
}}</el-button>
<el-button type="primary" link @click="viewOrderDetail(row.id, false)">查看详情</el-button>
<el-button type="warning" link @click="viewOrderDetail(row.id, true)" v-if="row.order_status == 'pending' && row.payment_type != 'scan_code'">确认支付</el-button>
<!-- <el-button type="primary" link @click="editEvent(row)">{{-->
<!-- t('edit')-->
<!-- }}</el-button>-->
<el-button type="primary" link @click="deleteEvent(row.id)">{{
t('delete')
}}</el-button>
@ -118,6 +122,7 @@
<edit ref="editOrderTableDialog" @complete="loadOrderTableList" />
<order-detail-dialog ref="orderDetailDialog" />
</el-card>
@ -154,6 +159,7 @@
import { img } from '@/utils/common'
import { ElMessageBox, FormInstance } from 'element-plus'
import Edit from '@/app/views/order_table/components/order-table-edit.vue'
import OrderDetailDialog from '@/app/views/order_table/components/order-detail-dialog.vue'
import { useRoute } from 'vue-router'
const route = useRoute()
const pageName = route.meta.title
@ -277,6 +283,7 @@
loadOrderTableList()
const editOrderTableDialog : Record<string, any> | null = ref(null)
const orderDetailDialog : Record<string, any> | null = ref(null)
/**
* 添加订单
@ -295,6 +302,15 @@
editOrderTableDialog.value.showDialog = true
}
/**
* 查看订单详情
* @param orderId 订单ID
* @param forPayment 是否为确认支付操作
*/
const viewOrderDetail = (orderId: number, forPayment: boolean = false) => {
orderDetailDialog.value.openDialog(orderId, forPayment)
}
/**
* 删除订单
*/

0
install.lock

5
niucloud/app/adminapi/controller/campus_person_role/CampusPersonRole.php

@ -95,7 +95,10 @@ class CampusPersonRole extends BaseAdminController
}
public function getPersonnelAll(){
return success(( new CampusPersonRoleService())->getPersonnelAll());
$data = $this->request->params([
["campus_id",0]
]);
return success(( new CampusPersonRoleService())->getPersonnelAll($data['campus_id']));
}
public function getSysRoleAll(){

9
niucloud/app/adminapi/controller/order_table/OrderTable.php

@ -109,4 +109,13 @@ class OrderTable extends BaseAdminController
public function getPersonnelAll(){
return success(( new OrderTableService())->getPersonnelAll());
}
/**
* 获取订单详情(带完整关联数据)
* @param int $id
* @return \think\Response
*/
public function getOrderDetail(int $id){
return success((new OrderTableService())->getOrderDetail($id));
}
}

2
niucloud/app/adminapi/controller/personnel/Personnel.php

@ -68,6 +68,7 @@ class Personnel extends BaseAdminController
["id_card_back",""],
["status",0],
["is_sys_user",0],
["campus_id",0],
["info",[]],
["use_approval", 0], // 是否使用审批流程
["approval_config_id", 0], // 审批配置ID
@ -110,6 +111,7 @@ class Personnel extends BaseAdminController
["id_card_front",""],
["id_card_back",""],
["status",0],
["campus_id",0],
["is_sys_user",0],
["info",[]],

3
niucloud/app/adminapi/route/order_table.php

@ -39,6 +39,9 @@ Route::group('order_table', function () {
Route::get('personnel_all','order_table.OrderTable/getPersonnelAll');
// 获取订单详情(带完整关联数据)
Route::get('order_detail/:id','order_table.OrderTable/getOrderDetail');
})->middleware([
AdminCheckToken::class,
AdminCheckRole::class,

16
niucloud/app/api/controller/apiController/OrderTable.php

@ -229,4 +229,20 @@ class OrderTable extends BaseApiService
'updated_at' => $orderData['updated_at']
]);
}
public function updateOrderPaymentVoucher(Request $request)
{
$params = $request->params([
["order_id", ""], // 订单ID必填
["payment_voucher", ""], // 支付凭证
]);
$res = (new OrderTableService())->updateOrderPaymentVoucher($params);
if (!$res['code']) {
return fail($res['msg']);
}
return success($res['data']);
}
}

45
niucloud/app/api/controller/apiController/StudentManager.php

@ -147,4 +147,47 @@ class StudentManager extends BaseApiService
return fail('添加学员失败:' . $e->getMessage());
}
}
}
/**
* 获取学员基本信息(员工端)
* @param int $id 学员ID
* @return \think\Response
*/
public function info($id)
{
// 验证参数
if (empty($id) || !is_numeric($id)) {
return fail('学员ID无效');
}
try {
// 直接查询学员基本信息,不需要权限验证
$student = \think\facade\Db::table('school_student')
->where('id', $id)
->where('deleted_at', 0)
->find();
if (!$student) {
return fail('学员信息不存在');
}
// 返回学员基本信息
$studentInfo = [
'id' => $student['id'],
'name' => $student['name'],
'gender' => $student['gender'],
'gender_text' => $student['gender'] == 1 ? '男' : '女',
'birthday' => $student['birthday'],
'campus_id' => $student['campus_id'] ?? null,
'headimg' => $student['headimg'] ? get_image_url($student['headimg']) : '',
'emergency_contact' => $student['emergency_contact'],
'contact_phone' => $student['contact_phone']
];
return success($studentInfo, '获取学员信息成功');
} catch (\Exception $e) {
return fail('获取学员信息失败:' . $e->getMessage());
}
}
}

2
niucloud/app/api/controller/student/StudentController.php

@ -374,4 +374,6 @@ class StudentController extends BaseController
}
return success($res['data']);
}
}

1
niucloud/app/api/route/file.php

@ -27,6 +27,7 @@ Route::group('file', function() {
Route::post('video', 'upload.Upload/video');
//拉取图片
Route::post('image/fetch', 'upload.Upload/imageFetch');
//
})->middleware(ApiChannel::class)
// ->middleware(ApiCheckToken::class, true)

4
niucloud/app/api/route/route.php

@ -277,6 +277,7 @@ Route::group(function () {
Route::post('student/edit', 'apiController.StudentManager/edit');
//销售端-学员-列表
Route::get('student/list', 'apiController.StudentManager/list');
Route::get('student/info/:id', 'apiController.StudentManager/info');
//教练端-学员-我的学员列表
Route::get('coach/students/my', 'apiController.CoachStudent/getMyStudents');
@ -316,7 +317,8 @@ Route::group(function () {
Route::post('orderTable/add', 'apiController.OrderTable/add');
//员工端-查询订单支付状态
Route::get('checkOrderPaymentStatus', 'apiController.OrderTable/checkOrderPaymentStatus');
//更新订单支付凭证payment_voucher
Route::post('updateOrderPaymentVoucher', 'apiController.OrderTable/updateOrderPaymentVoucher');
//员工端-更新学员课程人员配置
Route::post('updateStudentCoursePersonnel', 'apiController.Course/updateStudentCoursePersonnel');

122
niucloud/app/job/schedule/HandleCourseSchedule.php

@ -50,32 +50,16 @@ class HandleCourseSchedule extends BaseJob
{
try {
Db::startTrans();
$currentDate = date('Y-m-d');
$currentTime = date('H:i:s');
$currentDateTime = date('Y-m-d H:i:s');
// 先处理time_slot,解析并更新start_time和end_time字段
$this->updateTimeFields();
$completedCount = 0;
$upcomingCount = 0;
$ongoingCount = 0;
$pendingCount = 0;
// 1. 首先重置未来日期的课程为pending状态(待开始)
// 这是核心修正:course_date > 当前日期的所有课程状态改为pending
$futureRows = CourseSchedule::where('course_date', '>', $currentDate)
->where('status', '<>', 'pending')
->update([
'status' => 'pending',
'updated_at' => time()
]);
$pendingCount += $futureRows;
Log::write("重置未来课程状态完成 - 重置为pending(待开始): {$futureRows}个");
// 2. 更新已完成课程:course_date < 当天的课程
// 1. 更新已过期课程:course_date < 当天的课程标记为 completed
$completedRows = CourseSchedule::where('course_date', '<', $currentDate)
->where('status', '<>', 'completed')
->update([
@ -83,42 +67,46 @@ class HandleCourseSchedule extends BaseJob
'updated_at' => time()
]);
$completedCount = $completedRows;
// 3. 处理今天的课程,需要根据时间段判断状态
Log::write("更新过期课程完成 - 已完成: {$completedRows}个");
// 2. 处理今天的课程,需要根据时间段判断状态
// 注意:只处理当天课程,不处理未来课程(course_date > 今天)
$todaySchedules = CourseSchedule::where('course_date', '=', $currentDate)
->whereIn('status', ['pending', 'upcoming', 'ongoing'])
->select();
foreach ($todaySchedules as $schedule) {
$startTime = $schedule['start_time'];
$endTime = $schedule['end_time'];
// 如果 start_time 或 end_time 为空,尝试从 time_slot 解析
if (empty($startTime) || empty($endTime)) {
// 如果没有解析出时间,尝试从time_slot解析
$timeData = $this->parseTimeSlot($schedule['time_slot']);
if ($timeData) {
$startTime = $timeData['start_time'];
$endTime = $timeData['end_time'];
// 更新数据库中的时间字段
CourseSchedule::where('id', $schedule['id'])->update([
'start_time' => $startTime,
'end_time' => $endTime
]);
} else {
continue; // 无法解析时间,跳过
// 无法解析时间(time_slot 为 null 或空字符串),跳过该记录
Log::write("课程ID {$schedule['id']} 无法解析时间,time_slot: {$schedule['time_slot']}");
continue;
}
}
// 判断课程状态
$newStatus = $this->determineStatus($currentTime, $startTime, $endTime);
if ($newStatus !== $schedule['status']) {
CourseSchedule::where('id', $schedule['id'])->update([
'status' => $newStatus,
'updated_at' => time()
]);
switch ($newStatus) {
case 'upcoming':
$upcomingCount++;
@ -135,48 +123,20 @@ class HandleCourseSchedule extends BaseJob
}
}
}
Log::write("课程状态更新完成 - 已完成: {$completedCount}个, 即将开始: {$upcomingCount}个, 进行中: {$ongoingCount}个, 待开始: {$pendingCount}个");
Log::write("当天课程状态更新完成 - 已完成: {$completedCount}个, 即将开始: {$upcomingCount}个, 进行中: {$ongoingCount}个, 待开始: {$pendingCount}个");
Db::commit();
return true;
} catch (\Exception $e) {
Db::rollback();
Log::write('更新课程状态失败:' . $e->getMessage());
return false;
}
}
/**
* 更新课程安排表的start_time和end_time字段
*/
private function updateTimeFields()
{
try {
// 查询所有没有start_time或end_time的记录
$schedules = CourseSchedule::where(function($query) {
$query->whereNull('start_time')
->whereOr('end_time', null)
->whereOr('start_time', '')
->whereOr('end_time', '');
})->select();
foreach ($schedules as $schedule) {
$timeData = $this->parseTimeSlot($schedule['time_slot']);
if ($timeData) {
CourseSchedule::where('id', $schedule['id'])->update([
'start_time' => $timeData['start_time'],
'end_time' => $timeData['end_time']
]);
}
}
} catch (\Exception $e) {
Log::write('更新时间字段失败:' . $e->getMessage());
}
}
/**
* 解析time_slot字符串,提取开始和结束时间
* @param string $timeSlot 格式如 "09:00-10:30"
@ -201,6 +161,12 @@ class HandleCourseSchedule extends BaseJob
/**
* 根据当前时间和课程时间段判断课程状态
* 逻辑说明:
* 1. 如果当前时间 > 结束时间 → completed(已结束)
* 2. 如果当前时间在 [开始时间, 结束时间] 之间 → ongoing(进行中)
* 3. 如果当前时间 + 6小时 >= 开始时间 → upcoming(即将开始)
* 4. 其他情况 → pending(待开始)
*
* @param string $currentTime 当前时间 H:i:s
* @param string $startTime 开始时间 H:i:s
* @param string $endTime 结束时间 H:i:s
@ -211,24 +177,24 @@ class HandleCourseSchedule extends BaseJob
$currentTimestamp = strtotime($currentTime);
$startTimestamp = strtotime($startTime);
$endTimestamp = strtotime($endTime);
// 如果当前时间在课程时间段内,状态为进行中
if ($currentTimestamp >= $startTimestamp && $currentTimestamp <= $endTimestamp) {
return 'ongoing';
}
// 如果课程已结束,状态为已完成
// 1. 如果课程已结束(当前时间 > 结束时间),状态为已完成
if ($currentTimestamp > $endTimestamp) {
return 'completed';
}
// 如果距离开始时间不足6小时,状态为即将开始
$timeDiff = $startTimestamp - $currentTimestamp;
if ($timeDiff <= 6 * 3600 && $timeDiff > 0) { // 6小时 = 6 * 60 * 60 秒
// 2. 如果当前时间在课程时间段内,状态为进行中
if ($currentTimestamp >= $startTimestamp && $currentTimestamp <= $endTimestamp) {
return 'ongoing';
}
// 3. 如果距离开始时间在6小时以内(当前时间 + 6小时 >= 开始时间),状态为即将开始
$sixHoursLater = $currentTimestamp + (6 * 3600); // 6小时 = 6 * 60 * 60 秒
if ($sixHoursLater >= $startTimestamp) {
return 'upcoming';
}
// 其他情况为待安排
// 4. 其他情况为待开始
return 'pending';
}
}

14
niucloud/app/model/order_table/OrderTable.php

@ -26,6 +26,10 @@ use app\model\personnel\Personnel;
use app\model\student_courses\StudentCourses;
use app\model\student\Student;
use app\model\campus\Campus;
/**
* 订单模型
* Class OrderTable
@ -105,4 +109,14 @@ class OrderTable extends BaseModel
return $this->hasOne(StudentCourses::class, 'id', 'course_plan_id')->joinType('left')->withField('total_hours,gift_hours,use_total_hours,use_gift_hours')->bind(['total_hours'=>'total_hours','gift_hours'=>'gift_hours','use_total_hours'=>'use_total_hours','use_gift_hours'=>'use_gift_hours']);
}
//学员表-学员信息
public function student(){
return $this->hasOne(Student::class, 'id', 'student_id')->joinType('left')->withField('name,id')->bind(['student_name'=>'name']);
}
//校区表-校区信息
public function campus(){
return $this->hasOne(Campus::class, 'id', 'campus_id')->joinType('left')->withField('campus_name,id')->bind(['campus_name'=>'campus_name']);
}
}

15
niucloud/app/service/admin/campus_person_role/CampusPersonRoleService.php

@ -163,12 +163,13 @@ class CampusPersonRoleService extends BaseAdminService
return $campusModel->select()->toArray();
}
public function getPersonnelAll(){
$person_ids = $this->model->column("person_id");
public function getPersonnelAll($campus_id){
$personnelModel = new Personnel();
return $personnelModel->where([['id','not in',$person_ids]])->select()->toArray();
return $personnelModel->when($campus_id, function ($query) use ($campus_id) {
$query->where('campus_id', $campus_id);
})->where('status',2)
->select()
->toArray();
}
public function getSysRoleAll($data){
@ -181,12 +182,12 @@ class CampusPersonRoleService extends BaseAdminService
->where('role_key', '<>', '')
->where('role_name', '<>', '超级管理员');
});
// 如果dept_id不为0,则按部门过滤;如果为0则显示所有可用角色
if (isset($data['dept_id']) && $data['dept_id'] > 0) {
$query->where('dept_id', $data['dept_id']);
}
return $query->select()->toArray();
}

39
niucloud/app/service/admin/order_table/OrderTableService.php

@ -151,5 +151,44 @@ class OrderTableService extends BaseAdminService
return $personnelModel->select()->toArray();
}
/**
* 获取订单详情(带完整关联数据)
* @param int $id
* @return array
*/
public function getOrderDetail(int $id)
{
// 查询订单基础信息及关联数据
$order = $this->model
->where([['id', '=', $id]])
->with([
'customerResources', // 客户资源
'course', // 课程
'classGrade', // 班级
'personnel', // 员工
'student', // 学员
'campus' // 校区
])
->findOrEmpty()
->toArray();
if (empty($order)) {
return [];
}
// 如果有赠品ID,单独查询赠品信息
if (!empty($order['gift_id'])) {
$giftInfo = db('shcool_resources_gift')
->where('id', $order['gift_id'])
->field('id,gift_name,gift_type,gift_status')
->find();
$order['gift_info'] = $giftInfo ?: [];
} else {
$order['gift_info'] = [];
}
return $order;
}
}

69
niucloud/app/service/api/apiService/OrderTableService.php

@ -1022,4 +1022,73 @@ class OrderTableService extends BaseApiService
// TODO: 具体的赠课逻辑实现
return true;
}
public function updateOrderPaymentVoucher($params)
{
try {
// 验证必要参数
if (empty($params['order_id'])) {
return [
'code' => 0,
'msg' => '缺少订单ID参数',
'data' => []
];
}
if (empty($params['payment_voucher'])) {
return [
'code' => 0,
'msg' => '缺少支付凭证参数',
'data' => []
];
}
// 查询订单
$order = OrderTable::where('id', $params['order_id'])->find();
if (!$order) {
return [
'code' => 0,
'msg' => '订单不存在',
'data' => []
];
}
// 更新支付凭证
$result = $order->save([
'payment_voucher' => $params['payment_voucher'],
'updated_at' => date('Y-m-d H:i:s')
]);
if ($result) {
\think\facade\Log::info('订单支付凭证更新成功', [
'order_id' => $params['order_id'],
'payment_voucher' => $params['payment_voucher']
]);
return [
'code' => 1,
'msg' => '支付凭证提交成功',
'data' => $order->toArray()
];
} else {
return [
'code' => 0,
'msg' => '支付凭证提交失败',
'data' => []
];
}
} catch (\Exception $e) {
\think\facade\Log::error('更新订单支付凭证异常', [
'params' => $params,
'error' => $e->getMessage(),
'trace' => $e->getTraceAsString()
]);
return [
'code' => 0,
'msg' => '更新订单支付凭证异常: ' . $e->getMessage(),
'data' => []
];
}
}
}

27
niucloud/app/service/api/apiService/StudentService.php

@ -64,7 +64,7 @@ class StudentService extends BaseApiService
// 插入数据库
$id = Db::table('school_student')->insertGetId($insertData);
if ($id) {
$res['code'] = 1;
$res['msg'] = '添加成功';
@ -115,7 +115,7 @@ class StudentService extends BaseApiService
if (!empty($data['name'])) {
$where[] = ['s.name', 'like', '%' . $data['name'] . '%'];
}
if (!empty($data['phone'])) {
$where[] = ['s.contact_phone', 'like', '%' . $data['phone'] . '%'];
}
@ -146,8 +146,7 @@ class StudentService extends BaseApiService
// 查询该学员的课程安排记录,按日期排序获取一访和二访信息
$visitRecords = Db::table('school_person_course_schedule')
->where([
['person_id', '=', $student['id']],
['person_type', '=', 'student']
['student_id', '=', $student['id']]
])
->order('course_date', 'asc')
->select()
@ -197,27 +196,27 @@ class StudentService extends BaseApiService
// 如果指定了parent_resource_id,则查询该资源下的学生
if (!empty($data['parent_resource_id'])) {
$resourceId = $data['parent_resource_id'];
// 验证当前用户是否有权限访问该资源
$resource = Db::table('school_customer_resources')
->where('id', $resourceId)
->where('consultant', $userId)
->where('deleted_at', 0)
->find();
if (empty($resource)) {
// 用户无权限访问该资源
return [];
}
// 查询该资源关联的学生ID
$studentIds = Db::table('school_student_courses')
->where('resource_id', $resourceId)
->column('student_id');
return array_values(array_unique($studentIds));
}
// 如果没有指定资源ID,则查询当前用户(教练)负责的所有学生
return $this->getCoachStudentIds($userId, $data);
}
@ -305,13 +304,13 @@ class StudentService extends BaseApiService
if (empty($token)) {
return 0;
}
// 去掉Bearer前缀
$token = str_replace('Bearer ', '', $token);
// 使用项目的TokenAuth类解析token,类型为personnel(员工端)
$tokenInfo = \core\util\TokenAuth::parseToken($token, 'personnel');
if (!empty($tokenInfo)) {
// 从jti中提取用户ID(格式:用户ID_类型)
$jti = $tokenInfo['jti'] ?? '';
@ -322,7 +321,7 @@ class StudentService extends BaseApiService
}
}
}
return 0;
} catch (\Exception $e) {
return 0;
@ -363,4 +362,4 @@ class StudentService extends BaseApiService
return $res;
}
}
}

1
niucloud/app/service/api/student/StudentService.php

@ -184,6 +184,7 @@ class StudentService extends BaseService
'contact_phone' => $student['contact_phone'],
'note' => $student['note'],
'headimg' => $student['headimg'] ? get_image_url($student['headimg']) : '',
'campus_id' => $student['campus_id'] ?? null, // 添加校区ID
];
// 处理体测信息

1617
uniapp/api/apiRoute.js

File diff suppressed because it is too large

46
uniapp/components/client-info-card/client-info-card.vue

@ -22,7 +22,7 @@
</view>
</view>
</view>
<!-- 客户详细信息 -->
<view class="customer-details">
<view class="detail-row">
@ -35,19 +35,19 @@
</view>
<view class="detail-row">
<text class="info-label">分配顾问</text>
<text class="info-value">{{ $util.safeGet(clientInfo, 'customerResource.consultant_name', '未知顾问') }}</text>
<text class="info-value">{{ $util.safeGet(clientInfo, 'customerResource.consultant_name', '---') }}</text>
</view>
<view class="detail-row">
<text class="info-label">性别</text>
<text class="info-value">{{ $util.safeGet(clientInfo, 'customerResource.gender_name', '未知性别') }}</text>
</view>
</view>
<!-- 操作按钮区域 -->
<view class="action-panel" v-if="actionsExpanded && actions && actions.length > 0">
<view
class="action-btn"
v-for="action in actions"
<view
class="action-btn"
v-for="action in actions"
:key="action.key"
@click="handleAction(action)"
>
@ -82,11 +82,11 @@ export default {
this.$util.makePhoneCall(phoneNumber)
this.$emit('call', phoneNumber)
},
toggleActions() {
this.actionsExpanded = !this.actionsExpanded
},
handleAction(action) {
this.$emit('action', { action, client: this.clientInfo })
},
@ -114,7 +114,7 @@ export default {
display: flex;
align-items: center;
margin-bottom: 30rpx;
.customer-avatar {
width: 80rpx;
height: 80rpx;
@ -124,24 +124,24 @@ export default {
align-items: center;
justify-content: center;
margin-right: 20rpx;
text {
color: white;
font-size: 32rpx;
font-weight: bold;
}
}
.customer-info {
flex: 1;
.customer-name {
color: white;
font-size: 32rpx;
font-weight: bold;
margin-bottom: 8rpx;
}
.customer-meta {
.customer-phone {
color: #999;
@ -149,12 +149,12 @@ export default {
}
}
}
.contact-actions {
display: flex;
align-items: center;
gap: 15rpx;
.contact-btn {
width: 60rpx;
height: 60rpx;
@ -163,15 +163,15 @@ export default {
display: flex;
align-items: center;
justify-content: center;
.contact-icon {
font-size: 28rpx;
}
}
.action-toggle {
padding: 10rpx;
.toggle-icon {
color: #29d3b4;
font-size: 24rpx;
@ -186,13 +186,13 @@ export default {
display: flex;
align-items: center;
margin-bottom: 20rpx;
.info-label {
color: #999;
font-size: 24rpx;
width: 150rpx;
}
.info-value {
color: white;
font-size: 24rpx;
@ -208,12 +208,12 @@ export default {
display: flex;
flex-wrap: wrap;
gap: 15rpx;
.action-btn {
padding: 15rpx 25rpx;
background-color: #29d3b4;
border-radius: 25rpx;
.action-text {
color: white;
font-size: 22rpx;
@ -221,4 +221,4 @@ export default {
}
}
}
</style>
</style>

225
uniapp/components/fitness-record-list-popup/index.vue

@ -0,0 +1,225 @@
<!-- 体测记录列表弹窗组件 -->
<template>
<view class="fitness-record-list-popup" v-if="visible" @click.stop="handleMaskClick">
<view class="popup-container" @click.stop>
<!-- 标题栏 -->
<view class="popup-header">
<text class="popup-title">体测记录</text>
<view class="close-btn" @click.stop="handleClose">
<text></text>
</view>
</view>
<!-- 体测记录列表 -->
<view class="fitness-records-container">
<!-- 空状态提示 -->
<view v-if="!records || records.length === 0" class="empty-state">
<view class="empty-icon">📊</view>
<view class="empty-text">暂无体测记录</view>
<view class="empty-tip">点击下方"新增"按钮添加体测记录</view>
</view>
<!-- 体测记录列表 -->
<FitnessRecordCard
v-for="record in records"
:key="record.id"
:record="record"
@edit="handleEdit"
/>
</view>
<!-- 底部操作按钮 -->
<view class="popup-footer">
<view class="footer-btn cancel-btn" @click.stop="handleClose">关闭</view>
<view class="footer-btn confirm-btn" @click.stop="handleAddNew">新增</view>
</view>
</view>
</view>
</template>
<script>
import FitnessRecordCard from '@/components/fitness-record-card/fitness-record-card.vue'
export default {
name: 'FitnessRecordListPopup',
components: {
FitnessRecordCard
},
props: {
//
visible: {
type: Boolean,
default: false
},
//
records: {
type: Array,
default: () => []
}
},
methods: {
//
handleClose() {
this.$emit('close')
},
//
handleMaskClick() {
this.handleClose()
},
//
handleAddNew() {
this.$emit('add')
},
//
handleEdit(record) {
this.$emit('edit', record)
}
}
}
</script>
<style lang="less" scoped>
.fitness-record-list-popup {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: flex-end;
justify-content: center;
z-index: 999; /* 比FitnessRecordPopup的z-index低 */
}
.popup-container {
width: 100%;
max-height: 80vh;
background: #FFFFFF;
border-radius: 32rpx 32rpx 0 0;
display: flex;
flex-direction: column;
animation: slideUp 0.3s ease-out;
}
@keyframes slideUp {
from {
transform: translateY(100%);
}
to {
transform: translateY(0);
}
}
.popup-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 32rpx 32rpx 24rpx;
border-bottom: 1rpx solid #F0F0F0;
}
.popup-title {
font-size: 36rpx;
font-weight: 600;
color: #333333;
}
.close-btn {
width: 56rpx;
height: 56rpx;
display: flex;
align-items: center;
justify-content: center;
background: #F5F5F5;
border-radius: 50%;
text {
font-size: 40rpx;
color: #999999;
line-height: 1;
}
}
.fitness-records-container {
flex: 1;
overflow-y: auto;
padding: 24rpx 32rpx;
max-height: 50vh;
}
/* 滚动条样式 */
.fitness-records-container::-webkit-scrollbar {
width: 6rpx;
}
.fitness-records-container::-webkit-scrollbar-track {
background: transparent;
}
.fitness-records-container::-webkit-scrollbar-thumb {
background: #29D3B4;
border-radius: 3rpx;
}
.fitness-records-container::-webkit-scrollbar-thumb:hover {
background: #24B89E;
}
.empty-state {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 80rpx 0;
}
.empty-icon {
font-size: 120rpx;
line-height: 1;
margin-bottom: 24rpx;
}
.empty-text {
font-size: 28rpx;
color: #999999;
margin-bottom: 16rpx;
}
.empty-tip {
font-size: 24rpx;
color: #CCCCCC;
}
.popup-footer {
display: flex;
padding: 24rpx 32rpx;
padding-bottom: calc(24rpx + env(safe-area-inset-bottom));
border-top: 1rpx solid #F0F0F0;
gap: 24rpx;
}
.footer-btn {
flex: 1;
height: 88rpx;
display: flex;
align-items: center;
justify-content: center;
border-radius: 16rpx;
font-size: 32rpx;
font-weight: 500;
}
.cancel-btn {
background: #F5F5F5;
color: #666666;
}
.confirm-btn {
background: linear-gradient(135deg, #29D3B4 0%, #24B89E 100%);
color: #FFFFFF;
}
</style>

27
uniapp/components/fitness-record-popup/fitness-record-popup.less

@ -1,4 +1,19 @@
// 体测记录弹窗样式
// 弹窗容器 - 使用view类型
.fitness-record-popup {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
display: flex;
align-items: center;
justify-content: center;
z-index: 1000; // 高于体测记录列表弹窗(999)
}
.popup-container {
width: 90vw;
max-width: 600rpx;
@ -6,6 +21,18 @@
border-radius: 20rpx;
overflow: hidden;
box-shadow: 0 10rpx 30rpx rgba(0, 0, 0, 0.2);
animation: popupFadeIn 0.3s ease-out;
}
@keyframes popupFadeIn {
from {
opacity: 0;
transform: scale(0.9);
}
to {
opacity: 1;
transform: scale(1);
}
}
.popup-header {

56
uniapp/components/fitness-record-popup/fitness-record-popup.vue

@ -1,6 +1,7 @@
<template>
<uni-popup ref="popup" type="center">
<view class="popup-container">
<!-- 体测记录编辑弹窗 - 使用view类型 -->
<view v-if="isVisible" class="fitness-record-popup" @click.stop="handleMaskClick">
<view class="popup-container" @click.stop>
<view class="popup-header">
<view class="popup-title">{{ isEditing ? '编辑体测记录' : '新增体测记录' }}</view>
<view class="popup-close" @click="close"></view>
@ -58,7 +59,7 @@
<view class="popup-btn confirm-btn" @click="confirm">确认</view>
</view>
</view>
</uni-popup>
</view>
</template>
<script>
@ -94,7 +95,6 @@ export default {
this.resetData()
this.recordData.test_date = this.getCurrentDate()
this.isVisible = true
this.$refs.popup.open()
},
//
@ -108,16 +108,19 @@ export default {
pdf_files: [...(record.pdf_files || [])]
}
this.isVisible = true
this.$refs.popup.open()
},
//
close() {
this.isVisible = false
this.$refs.popup.close()
this.resetData()
this.$emit('close')
},
//
handleMaskClick() {
this.close()
},
//
resetData() {
@ -371,27 +374,24 @@ export default {
return false
},
// PDF使
// PDF使PDF
async uploadPdfFile(file) {
const { Api_url } = require('@/common/config.js')
const token = uni.getStorageSync('token') || ''
console.log('开始上传PDF文件:', {
fileName: file.name,
fileSize: file.size,
filePath: file.path,
uploadUrl: Api_url + '/memberUploadDocument',
uploadUrl: Api_url + '/xy/physicalTest/uploadPdf',
hasToken: !!token
})
return new Promise((resolve, reject) => {
uni.uploadFile({
url: Api_url + '/memberUploadDocument', // 使
url: Api_url + '/xy/physicalTest/uploadPdf', // 使PDF
filePath: file.path,
name: 'file',
formData: {
'type': 'document' //
},
header: {
'token': token
// Content-Typeuni-app multipart/form-data
@ -415,27 +415,22 @@ export default {
if (response.code === 1) {
console.log('PDF上传成功:', response.data)
//
let fileUrl = ''
if (response.data) {
fileUrl = response.data.url || response.data.file_path || response.data
}
// PDF
resolve({
code: 1,
msg: response.msg || '上传成功',
data: {
url: fileUrl,
name: response.data.name || response.data.original_name || file.name,
ext: response.data.ext || 'pdf',
size: file.size
url: response.data.file_url, // file_url
name: response.data.file_name || file.name,
ext: 'pdf',
size: response.data.file_size || file.size
}
})
} else if (response.code === 401) {
console.error('PDF上传认证失败:', response)
uni.showToast({
title: response.msg || '登录已过期',
icon: 'none'
uni.showToast({
title: response.msg || '登录已过期',
icon: 'none'
})
setTimeout(() => {
uni.navigateTo({ url: '/pages/student/login/login' })
@ -443,14 +438,9 @@ export default {
reject(response)
} else {
console.error('PDF上传失败响应:', response)
//
let errorMsg = response.msg || 'PDF上传失败'
if (response.code === 0 && response.msg.includes('路由未定义')) {
errorMsg = '文件上传接口暂不可用,请联系技术支持'
}
reject({
code: response.code || 0,
msg: errorMsg
msg: response.msg || 'PDF上传失败'
})
}
},

402
uniapp/components/order-form-popup/index.vue

@ -14,7 +14,17 @@
<text class="student-name">{{ studentInfo.name || '未选择学生' }}</text>
</view>
</view>
<view class="form-item">
<text class="label">校区选择 <text class="required">*</text></text>
<view class="picker-wrapper" @click="showCampusPicker">
<text class="picker-text" :class="{ 'placeholder': !formData.campus_id }">
{{ selectedCampus && selectedCampus.label || '请选择校区' }}
</text>
<text class="picker-arrow"></text>
</view>
</view>
<view class="form-item">
<text class="label">课程选择 <text class="required">*</text></text>
<view class="picker-wrapper" @click="showCoursePicker">
@ -47,7 +57,7 @@
<view class="form-item">
<text class="label">订单金额 <text class="required">*</text></text>
<input
<input
class="form-input readonly"
type="digit"
v-model="formData.order_amount"
@ -56,7 +66,35 @@
disabled
/>
</view>
<view class="form-item" v-if="needPaymentVoucher">
<text class="label">支付凭证 <text class="required">*</text></text>
<view class="voucher-upload">
<view class="voucher-grid">
<!-- 已上传的图片 -->
<view
class="voucher-item"
v-for="(img, index) in voucherImages"
:key="index"
>
<image :src="img" class="voucher-image" mode="aspectFill"></image>
<view class="voucher-delete" @click="deleteVoucherImage(index)">×</view>
</view>
<!-- 上传按钮 -->
<view
class="voucher-item voucher-upload-btn"
v-if="voucherImages.length < maxVoucherImages"
@click="chooseVoucherImage"
>
<text class="upload-icon">+</text>
<text class="upload-text">上传凭证</text>
</view>
</view>
<text class="voucher-tip">最多上传{{ maxVoucherImages }}张图片</text>
</view>
</view>
<view class="form-item" v-if="giftList.length > 0">
<text class="label">选择赠品</text>
<view class="picker-wrapper" @click="showGiftPicker">
@ -77,9 +115,19 @@
</view>
</view>
<view class="form-item">
<text class="label">班级选择</text>
<view class="picker-wrapper" @click="showClassPicker">
<text class="picker-text" :class="{ 'placeholder': !formData.class_id }">
{{ selectedClass && selectedClass.label || '请选择班级(可选)' }}
</text>
<text class="picker-arrow"></text>
</view>
</view>
<view class="form-item">
<text class="label">备注</text>
<textarea
<textarea
class="form-textarea"
v-model="formData.remark"
placeholder="请输入备注信息"
@ -117,6 +165,7 @@
<script>
import apiRoute from '@/api/apiRoute.js'
import dictUtilSimple from '@/common/dictUtilSimple.js'
import { uploadFile } from '@/common/util.js'
export default {
name: 'OrderFormPopup',
@ -138,8 +187,10 @@ export default {
return {
formData: {
student_id: '',
campus_id: '', // ID,
course_id: '',
payment_type: '',
payment_voucher: '', // ,URL
order_type: '',
order_amount: '',
total_hours: '',
@ -147,7 +198,7 @@ export default {
gift_id: '', // ID
gift_type: '', // 1-, 2-
remark: '',
class_id: '1' // ID
class_id: '' // ID
},
//
@ -158,24 +209,35 @@ export default {
selectedIndex: 0,
//
campusSelectedIndex: -1,
courseSelectedIndex: -1,
paymentSelectedIndex: -1,
orderTypeSelectedIndex: -1,
giftSelectedIndex: -1,
giftTypeSelectedIndex: -1,
classSelectedIndex: -1,
//
campusList: [], //
courseList: [],
paymentTypes: [], //
orderTypes: [], //
giftList: [], //
classList: [], //
giftTypes: [ //
{ value: '1', label: '减现' },
{ value: '2', label: '赠课' }
]
],
//
voucherImages: [], // ,9
maxVoucherImages: 9 // 9
}
},
computed: {
selectedCampus() {
return this.campusList.find(item => item.value == this.formData.campus_id)
},
selectedCourse() {
return this.courseList.find(item => item.id == this.formData.course_id)
},
@ -190,6 +252,15 @@ export default {
},
selectedGiftType() {
return this.giftTypes.find(item => item.value === this.formData.gift_type)
},
selectedClass() {
return this.classList.find(item => item.value == this.formData.class_id)
},
//
needPaymentVoucher() {
// 线
const noVoucherTypes = ['scan_code', 'subscription', 'wxpay_online']
return this.formData.payment_type && !noVoucherTypes.includes(this.formData.payment_type)
}
},
watch: {
@ -198,15 +269,23 @@ export default {
if (newVal) {
console.log('开始初始化表单和加载数据')
this.initForm()
this.loadCampusList() //
this.loadCourseList()
this.loadDictionaries() //
this.loadGiftList() //
this.loadClassList() //
}
},
studentInfo: {
handler(newVal) {
if (newVal && newVal.id) {
this.formData.student_id = newVal.id
// ID
if (newVal.campus_id) {
this.formData.campus_id = newVal.campus_id
//
this.loadClassList()
}
}
},
immediate: true,
@ -218,17 +297,21 @@ export default {
// visible true
if (this.visible) {
console.log('组件挂载时 visible 为 true,开始加载数据')
this.loadCampusList()
this.loadCourseList()
this.loadDictionaries()
this.loadGiftList()
this.loadClassList()
}
},
methods: {
initForm() {
this.formData = {
student_id: this.studentInfo && this.studentInfo.id || '',
campus_id: this.studentInfo && this.studentInfo.campus_id || '', // ID,,studentInfo
course_id: '',
payment_type: '',
payment_voucher: '', // ,URL
order_type: '',
order_amount: '',
total_hours: '',
@ -236,17 +319,51 @@ export default {
gift_id: '',
gift_type: '',
remark: '',
class_id: '1' // ID
class_id: '' // ID
}
//
this.campusSelectedIndex = -1
this.courseSelectedIndex = -1
this.paymentSelectedIndex = -1
this.orderTypeSelectedIndex = -1
this.giftSelectedIndex = -1
this.giftTypeSelectedIndex = -1
this.classSelectedIndex = -1
//
this.voucherImages = []
},
/**
* 加载校区列表
*/
async loadCampusList() {
console.log('开始加载校区列表')
try {
const res = await apiRoute.common_getCampusesList({})
console.log('校区列表API响应:', res)
if (res.code === 1) {
// 1,
this.campusList = (res.data || [])
.filter(campus => campus.campus_status === 1)
.map(campus => ({
value: campus.id,
label: campus.campus_name,
...campus
}))
console.log('校区列表加载成功:', this.campusList)
} else {
console.error('获取校区列表失败:', res.msg)
this.campusList = []
}
} catch (error) {
console.error('获取校区列表异常:', error)
this.campusList = []
}
},
async loadCourseList() {
console.log('loadCourseList 方法被调用')
try {
@ -300,7 +417,9 @@ export default {
{ value: 'cash', label: '现金支付' },
{ value: 'scan_code', label: '扫码支付' },
{ value: 'subscription', label: '订阅支付' },
{ value: 'wxpay_online', label: '微信在线代付' }
{ value: 'wxpay_online', label: '微信在线代付' },
{ value: 'client_wxpay', label: '客户自行付款' },
{ value: 'deposit', label: '定金' }
]
}
@ -317,25 +436,31 @@ export default {
this.orderTypes = [
{ value: '1', label: '新订单' },
{ value: '2', label: '续费订单' },
{ value: '3', label: '内部员工订单' }
{ value: '3', label: '内部员工订单' },
{ value: '4', label: '转校' },
{ value: '5', label: '客户内转课订单' }
]
}
} catch (error) {
console.error('加载字典数据失败:', error)
// 使
this.paymentTypes = [
{ value: 'cash', label: '现金支付' },
{ value: 'scan_code', label: '扫码支付' },
{ value: 'subscription', label: '订阅支付' },
{ value: 'wxpay_online', label: '微信在线代付' }
{ value: 'wxpay_online', label: '微信在线代付' },
{ value: 'client_wxpay', label: '客户自行付款' },
{ value: 'deposit', label: '定金' }
]
this.orderTypes = [
{ value: '1', label: '新订单' },
{ value: '2', label: '续费订单' },
{ value: '3', label: '内部员工订单' }
{ value: '3', label: '内部员工订单' },
{ value: '4', label: '转校' },
{ value: '5', label: '客户内转课订单' }
]
}
},
@ -380,7 +505,62 @@ export default {
this.giftList = []
}
},
/**
* 加载班级列表
* @param {Number} campusId - 校区ID如果不传则使用formData.campus_id
*/
async loadClassList(campusId) {
const targetCampusId = campusId || this.formData.campus_id
console.log('开始加载班级列表,校区ID:', targetCampusId)
try {
if (!targetCampusId) {
console.warn('缺少校区ID,无法加载班级列表')
this.classList = []
return
}
const res = await apiRoute.getClassListForSchedule({
campus_id: targetCampusId
})
console.log('班级列表API响应:', res)
if (res.code === 1) {
// 使 id class_name
this.classList = (res.data || []).map(cls => ({
value: cls.id,
label: cls.class_name || `班级${cls.id}`,
...cls
}))
console.log('班级列表加载成功:', this.classList)
} else {
console.error('获取班级列表失败:', res.msg)
this.classList = []
}
} catch (error) {
console.error('获取班级列表异常:', error)
this.classList = []
}
},
showCampusPicker() {
this.currentPicker = 'campus'
this.pickerTitle = '选择校区'
this.pickerOptions = this.campusList
//
if (this.formData.campus_id) {
const currentIndex = this.campusList.findIndex(item => item.value == this.formData.campus_id)
this.campusSelectedIndex = currentIndex >= 0 ? currentIndex : 0
} else {
this.campusSelectedIndex = 0
}
this.pickerValue = [this.campusSelectedIndex]
this.selectedIndex = this.campusSelectedIndex
this.$refs.pickerPopup.open()
},
showCoursePicker() {
this.currentPicker = 'course'
this.pickerTitle = '选择课程'
@ -462,7 +642,7 @@ export default {
this.currentPicker = 'giftType'
this.pickerTitle = '选择核销类型'
this.pickerOptions = this.giftTypes
//
if (this.formData.gift_type) {
const currentIndex = this.giftTypes.findIndex(item => item.value === this.formData.gift_type)
@ -470,11 +650,34 @@ export default {
} else {
this.giftTypeSelectedIndex = 0
}
this.pickerValue = [this.giftTypeSelectedIndex]
this.selectedIndex = this.giftTypeSelectedIndex
this.$refs.pickerPopup.open()
},
showClassPicker() {
this.currentPicker = 'class'
this.pickerTitle = '选择班级'
// ""
this.pickerOptions = [
{ value: '', label: '不选择班级' },
...this.classList
]
//
if (this.formData.class_id) {
const currentIndex = this.pickerOptions.findIndex(item => item.value == this.formData.class_id)
this.classSelectedIndex = currentIndex >= 0 ? currentIndex : 0
} else {
this.classSelectedIndex = 0
}
this.pickerValue = [this.classSelectedIndex]
this.selectedIndex = this.classSelectedIndex
this.$refs.pickerPopup.open()
},
onPickerChange(e) {
this.selectedIndex = e.detail.value[0]
@ -483,8 +686,18 @@ export default {
confirmPicker() {
const selectedOption = this.pickerOptions[this.selectedIndex]
if (!selectedOption) return
switch (this.currentPicker) {
case 'campus':
this.campusSelectedIndex = this.selectedIndex
this.formData.campus_id = selectedOption.value
//
this.formData.class_id = ''
this.classSelectedIndex = -1
//
this.loadClassList(selectedOption.value)
console.log('校区选择后更新表单数据,已清空班级选择:', this.formData)
break
case 'course':
this.courseSelectedIndex = this.selectedIndex
this.formData.course_id = selectedOption.id
@ -503,6 +716,10 @@ export default {
case 'payment':
this.paymentSelectedIndex = this.selectedIndex
this.formData.payment_type = selectedOption.value
// ,
this.voucherImages = []
this.formData.payment_voucher = ''
console.log('支付方式选择后更新表单数据:', this.formData)
break
case 'orderType':
this.orderTypeSelectedIndex = this.selectedIndex
@ -523,6 +740,11 @@ export default {
this.formData.gift_type = selectedOption.value
console.log('赠品类型选择后更新表单数据:', this.formData)
break
case 'class':
this.classSelectedIndex = this.selectedIndex
this.formData.class_id = selectedOption.value
console.log('班级选择后更新表单数据:', this.formData)
break
}
this.closePicker()
@ -532,12 +754,85 @@ export default {
this.$refs.pickerPopup.close()
this.currentPicker = ''
},
/**
* 选择支付凭证图片
*/
chooseVoucherImage() {
const remainCount = this.maxVoucherImages - this.voucherImages.length
if (remainCount <= 0) {
uni.showToast({ title: '最多上传9张图片', icon: 'none' })
return
}
uni.chooseImage({
count: remainCount,
sizeType: ['compressed'],
sourceType: ['album', 'camera'],
success: (res) => {
console.log('选择的图片:', res.tempFilePaths)
//
res.tempFilePaths.forEach(filePath => {
this.uploadVoucherImage(filePath)
})
}
})
},
/**
* 上传单张支付凭证图片
*/
uploadVoucherImage(filePath) {
uni.showLoading({ title: '上传中...' })
uploadFile(
filePath,
(fileData) => {
//
console.log('图片上传成功:', fileData)
this.voucherImages.push(fileData.url)
// formDatapayment_voucher
this.formData.payment_voucher = this.voucherImages.join(',')
console.log('支付凭证已更新:', this.formData.payment_voucher)
uni.hideLoading()
uni.showToast({ title: '上传成功', icon: 'success' })
},
(error) => {
//
console.error('图片上传失败:', error)
uni.hideLoading()
}
)
},
/**
* 删除支付凭证图片
*/
deleteVoucherImage(index) {
uni.showModal({
title: '提示',
content: '确定删除这张图片吗?',
success: (res) => {
if (res.confirm) {
this.voucherImages.splice(index, 1)
// formDatapayment_voucher
this.formData.payment_voucher = this.voucherImages.join(',')
console.log('支付凭证已更新:', this.formData.payment_voucher)
uni.showToast({ title: '删除成功', icon: 'success' })
}
}
})
},
validateForm() {
if (!this.formData.student_id) {
uni.showToast({ title: '请选择学生', icon: 'none' })
return false
}
if (!this.formData.campus_id) {
uni.showToast({ title: '请选择校区', icon: 'none' })
return false
}
if (!this.formData.course_id) {
uni.showToast({ title: '请选择课程', icon: 'none' })
return false
@ -734,6 +1029,73 @@ export default {
height: 120rpx;
resize: none;
}
//
.voucher-upload {
.voucher-grid {
display: flex;
flex-wrap: wrap;
gap: 20rpx;
.voucher-item {
width: 200rpx;
height: 200rpx;
border-radius: 12rpx;
overflow: hidden;
position: relative;
background: #2a2a2a;
border: 1px solid #444;
.voucher-image {
width: 100%;
height: 100%;
}
.voucher-delete {
position: absolute;
top: 0;
right: 0;
width: 50rpx;
height: 50rpx;
background: rgba(255, 71, 87, 0.8);
color: #ffffff;
display: flex;
align-items: center;
justify-content: center;
font-size: 40rpx;
border-radius: 0 12rpx 0 12rpx;
font-weight: bold;
}
&.voucher-upload-btn {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
border: 2px dashed #666;
background: transparent;
.upload-icon {
font-size: 60rpx;
color: #888;
margin-bottom: 10rpx;
}
.upload-text {
font-size: 24rpx;
color: #888;
}
}
}
}
.voucher-tip {
display: block;
margin-top: 20rpx;
font-size: 24rpx;
color: #888;
}
}
}
}

985
uniapp/components/order-list-card/index.vue

File diff suppressed because it is too large

505
uniapp/components/order-list-card/payment-voucher-popup.vue

@ -0,0 +1,505 @@
<!--支付凭证上传弹窗组件-->
<template>
<view class="payment-voucher-wrapper">
<!-- 遮罩层 -->
<view class="popup-mask" @click="handleCancel"></view>
<!-- 弹窗内容 -->
<view class="payment-voucher-popup">
<view class="popup-content">
<view class="popup-header">
<text class="popup-title">上传支付凭证</text>
<view class="close-btn" @click="handleCancel">
<text class="close-icon"></text>
</view>
</view>
<view class="popup-body">
<!-- 订单信息展示 -->
<view class="order-info-section">
<view class="info-row">
<text class="info-label">订单号:</text>
<text class="info-value">{{ orderInfo.order_no }}</text>
</view>
<view class="info-row">
<text class="info-label">课程类型:</text>
<text class="info-value">{{ orderInfo.product_name }}</text>
</view>
<view class="info-row">
<text class="info-label">支付金额:</text>
<text class="info-value amount">¥{{ orderInfo.total_amount }}</text>
</view>
</view>
<!-- 图片上传区域 -->
<view class="upload-section">
<view class="section-title">支付凭证</view>
<view class="upload-tip">最多上传9张图片</view>
<view class="image-list">
<view
v-for="(image, index) in imageList"
:key="index"
class="image-item"
>
<image :src="image" class="preview-image" mode="aspectFill"></image>
<view class="delete-btn" @click="deleteImage(index)">
<text class="delete-icon">×</text>
</view>
</view>
<view
v-if="imageList.length < 9"
class="upload-btn"
@click="chooseImage"
>
<text class="upload-icon">+</text>
<text class="upload-text">上传图片</text>
</view>
</view>
</view>
</view>
<view class="popup-footer">
<view class="footer-btn cancel-btn" @click="handleCancel">
<text>取消</text>
</view>
<view
class="footer-btn confirm-btn"
:class="{ disabled: !canSubmit }"
@click="handleConfirm"
>
<text>提交</text>
</view>
</view>
</view>
</view>
</view>
</template>
<script>
import { uploadFile } from '@/common/util.js'
export default {
name: 'PaymentVoucherPopup',
props: {
//
orderInfo: {
type: Object,
default: () => ({
order_no: '',
product_name: '',
total_amount: '0.00'
})
}
},
data() {
return {
imageList: [], //
uploading: false
}
},
computed: {
//
canSubmit() {
return this.imageList.length > 0 && !this.uploading
}
},
methods: {
/**
* 选择图片
*/
chooseImage() {
const remainCount = 9 - this.imageList.length
uni.chooseImage({
count: remainCount,
sizeType: ['compressed'],
sourceType: ['album', 'camera'],
success: (res) => {
const tempFilePaths = res.tempFilePaths
//
this.uploadImages(tempFilePaths)
},
fail: (err) => {
console.error('选择图片失败:', err)
uni.showToast({ title: '选择图片失败', icon: 'none' })
}
})
},
/**
* 上传图片
*/
async uploadImages(filePaths) {
this.uploading = true
uni.showLoading({ title: '上传中...' })
try {
const uploadPromises = filePaths.map(filePath => this.uploadSingleImage(filePath))
const results = await Promise.all(uploadPromises)
// URL
results.forEach(url => {
if (url) {
this.imageList.push(url)
}
})
uni.hideLoading()
if (results.some(url => url)) {
uni.showToast({ title: '上传成功', icon: 'success' })
}
} catch (error) {
uni.hideLoading()
console.error('上传图片异常:', error)
uni.showToast({ title: '上传失败', icon: 'none' })
} finally {
this.uploading = false
}
},
/**
* 上传单张图片
*/
uploadSingleImage(filePath) {
return new Promise((resolve, reject) => {
uploadFile(
filePath,
(fileData) => {
// : fileData = { url, extname, name }
if (fileData && fileData.url) {
resolve(fileData.url)
} else {
console.error('上传成功但未返回URL')
resolve(null)
}
},
(error) => {
//
console.error('上传请求失败:', error)
resolve(null)
}
)
})
},
/**
* 删除图片
*/
deleteImage(index) {
uni.showModal({
title: '确认删除',
content: '确定要删除这张图片吗?',
success: (res) => {
if (res.confirm) {
this.imageList.splice(index, 1)
}
}
})
},
/**
* 取消
*/
handleCancel() {
this.$emit('cancel')
},
/**
* 确认提交
*/
handleConfirm() {
if (!this.canSubmit) {
uni.showToast({ title: '请先上传支付凭证', icon: 'none' })
return
}
//
const payment_voucher = this.imageList.join(',')
this.$emit('confirm', {
payment_voucher: payment_voucher,
order_id: this.orderInfo.id || this.orderInfo._raw?.id
})
},
/**
* 重置数据
*/
reset() {
this.imageList = []
this.uploading = false
}
}
}
</script>
<style lang="scss" scoped>
.payment-voucher-wrapper {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 9998;
display: flex;
align-items: flex-end;
}
.popup-mask {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: rgba(0, 0, 0, 0.5);
z-index: 1;
}
.payment-voucher-popup {
position: relative;
left: 0;
right: 0;
bottom: 0;
width: 100%;
background: #2A2A2A;
border-radius: 24rpx 24rpx 0 0;
overflow: hidden;
z-index: 2;
box-shadow: 0 -8rpx 32rpx rgba(0, 0, 0, 0.3);
animation: slideUp 0.3s ease;
}
@keyframes slideUp {
from {
transform: translateY(100%);
}
to {
transform: translateY(0);
}
}
.popup-content {
display: flex;
flex-direction: column;
max-height: 90vh;
}
.popup-header {
display: flex;
align-items: center;
justify-content: space-between;
padding: 32rpx 40rpx;
border-bottom: 1px solid #404040;
}
.popup-title {
font-size: 32rpx;
font-weight: 600;
color: #ffffff;
}
.close-btn {
width: 56rpx;
height: 56rpx;
display: flex;
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 0.1);
border-radius: 50%;
transition: all 0.3s ease;
&:active {
background: rgba(255, 255, 255, 0.15);
}
}
.close-icon {
font-size: 40rpx;
color: #ffffff;
line-height: 1;
}
.popup-body {
flex: 1;
padding: 32rpx 40rpx;
overflow-y: auto;
}
.order-info-section {
background: rgba(41, 211, 180, 0.05);
border-radius: 16rpx;
padding: 24rpx;
margin-bottom: 32rpx;
border-left: 4rpx solid #29D3B4;
}
.info-row {
display: flex;
align-items: center;
justify-content: space-between;
margin-bottom: 16rpx;
&:last-child {
margin-bottom: 0;
}
}
.info-label {
font-size: 28rpx;
color: #999999;
min-width: 140rpx;
}
.info-value {
font-size: 28rpx;
color: #ffffff;
flex: 1;
text-align: right;
&.amount {
color: #FFC107;
font-weight: 600;
font-size: 32rpx;
}
}
.upload-section {
margin-bottom: 32rpx;
}
.section-title {
font-size: 28rpx;
font-weight: 600;
color: #ffffff;
margin-bottom: 12rpx;
}
.upload-tip {
font-size: 24rpx;
color: #999999;
margin-bottom: 24rpx;
}
.image-list {
display: flex;
flex-wrap: wrap;
gap: 16rpx;
}
.image-item {
position: relative;
width: 200rpx;
height: 200rpx;
border-radius: 12rpx;
overflow: hidden;
}
.preview-image {
width: 100%;
height: 100%;
}
.delete-btn {
position: absolute;
top: 8rpx;
right: 8rpx;
width: 44rpx;
height: 44rpx;
background: rgba(0, 0, 0, 0.6);
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
&:active {
background: rgba(0, 0, 0, 0.8);
}
}
.delete-icon {
font-size: 32rpx;
color: #ffffff;
line-height: 1;
}
.upload-btn {
width: 200rpx;
height: 200rpx;
border: 2px dashed #404040;
border-radius: 12rpx;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 0.02);
transition: all 0.3s ease;
&:active {
background: rgba(255, 255, 255, 0.05);
border-color: #29D3B4;
}
}
.upload-icon {
font-size: 48rpx;
color: #666666;
line-height: 1;
margin-bottom: 8rpx;
}
.upload-text {
font-size: 24rpx;
color: #999999;
}
.popup-footer {
display: flex;
gap: 24rpx;
padding: 24rpx 40rpx;
border-top: 1px solid #404040;
background: #2A2A2A;
}
.footer-btn {
flex: 1;
height: 88rpx;
display: flex;
align-items: center;
justify-content: center;
border-radius: 16rpx;
font-size: 30rpx;
font-weight: 500;
transition: all 0.3s ease;
}
.cancel-btn {
background: rgba(255, 255, 255, 0.1);
color: #ffffff;
&:active {
background: rgba(255, 255, 255, 0.15);
}
}
.confirm-btn {
background: #29D3B4;
color: #ffffff;
&:active {
background: #1fb396;
}
&.disabled {
background: #404040;
color: #666666;
}
}
</style>

207
uniapp/components/order-list-card/qrcode-payment-dialog.vue

@ -0,0 +1,207 @@
<!--二维码支付弹窗组件-->
<template>
<view class="qrcode-payment-modal">
<!-- 弹窗头部 -->
<view class="modal-header">
<text class="modal-title">扫码支付</text>
<view class="close-btn" @click="handleClose">
<text></text>
</view>
</view>
<!-- 订单信息 -->
<view class="order-info">
<view class="info-row">
<text class="label">订单号</text>
<text class="value">{{ paymentData.order.order_no }}</text>
</view>
<view class="info-row">
<text class="label">支付金额</text>
<text class="amount">¥{{ paymentData.order.total_amount }}</text>
</view>
</view>
<!-- 二维码区域 -->
<view class="qrcode-container">
<image
v-if="paymentData.qrcodeImage"
:src="paymentData.qrcodeImage"
class="qrcode-image"
mode="aspectFit"
/>
<text v-else class="qrcode-placeholder">二维码加载中...</text>
<text class="qrcode-tip">请使用微信扫码完成支付</text>
</view>
<!-- 操作按钮 -->
<view class="modal-buttons">
<view class="btn secondary" @click="handleClose">取消支付</view>
<view class="btn primary" @click="handleConfirm">确认已支付</view>
</view>
</view>
</template>
<script>
export default {
name: 'QRCodePaymentDialog',
props: {
paymentData: {
type: Object,
required: true
}
},
methods: {
handleClose() {
this.$emit('close')
},
handleConfirm() {
this.$emit('confirm')
}
}
}
</script>
<style lang="scss" scoped>
.qrcode-payment-modal {
background: #2A2A2A;
border-radius: 24rpx;
padding: 48rpx;
width: 600rpx;
max-width: 90vw;
}
.modal-header {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 40rpx;
}
.modal-title {
font-size: 36rpx;
font-weight: 600;
color: #ffffff;
}
.close-btn {
width: 60rpx;
height: 60rpx;
display: flex;
align-items: center;
justify-content: center;
background: rgba(255, 255, 255, 0.1);
border-radius: 50%;
font-size: 32rpx;
color: #ffffff;
transition: all 0.3s ease;
&:active {
background: rgba(255, 255, 255, 0.2);
}
}
.order-info {
background: rgba(255, 255, 255, 0.05);
border-radius: 16rpx;
padding: 32rpx;
margin-bottom: 40rpx;
}
.info-row {
display: flex;
justify-content: space-between;
align-items: center;
margin-bottom: 20rpx;
&:last-child {
margin-bottom: 0;
}
}
.label {
font-size: 28rpx;
color: #999999;
}
.value {
font-size: 28rpx;
color: #ffffff;
}
.amount {
font-size: 40rpx;
font-weight: 600;
color: #FFC107;
}
.qrcode-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
padding: 40rpx;
background: #ffffff;
border-radius: 16rpx;
margin-bottom: 40rpx;
}
.qrcode-image {
width: 400rpx;
height: 400rpx;
margin-bottom: 24rpx;
}
.qrcode-placeholder {
width: 400rpx;
height: 400rpx;
display: flex;
align-items: center;
justify-content: center;
font-size: 28rpx;
color: #999999;
margin-bottom: 24rpx;
}
.qrcode-tip {
font-size: 26rpx;
color: #666666;
text-align: center;
}
.modal-buttons {
display: flex;
gap: 24rpx;
}
.btn {
flex: 1;
height: 88rpx;
display: flex;
align-items: center;
justify-content: center;
border-radius: 44rpx;
font-size: 30rpx;
font-weight: 500;
transition: all 0.3s ease;
&.secondary {
background: rgba(255, 255, 255, 0.1);
color: #ffffff;
&:active {
background: rgba(255, 255, 255, 0.15);
}
}
&.primary {
background: #29D3B4;
color: #ffffff;
&:active {
background: #1fb396;
}
}
}
</style>

340
uniapp/components/schedule/ScheduleDetail.vue

@ -1,15 +1,20 @@
<template>
<fui-modal :show="visible" width="700" @cancel="closePopup" :buttons="[{text: '关闭', type: 'default'}]" :showClose="true" @close="closePopup" @click="handleModalClick">
<!-- 自定义关闭按钮 -->
<template #header>
<!-- 组件根容器 - Vue2要求只有一个根元素 -->
<view>
<!-- 自定义弹窗遮罩 -->
<view class="modal-mask" v-if="visible" @click="closePopup">
<!-- 弹窗内容 -->
<view class="modal-container" @click.stop>
<!-- 自定义头部 -->
<view class="custom-header">
<text class="modal-title">课程安排详情</text>
<view class="close-btn" @click="closePopup">
<text class="close-icon"></text>
</view>
</view>
</template>
<view class="schedule-detail" v-if="scheduleInfo">
<!-- 弹窗主体内容 -->
<view class="schedule-detail" v-if="scheduleInfo">
<!-- 课程基本信息 -->
<view class="section basic-info">
<view class="section-title">基本信息</view>
@ -77,6 +82,10 @@
<view class="student-info">
<view class="student-name">{{ student.name }}</view>
<view class="student-age">年龄{{ student.age }}</view>
<view class="attendance-status">
<text class="status-label">签到状态</text>
<text :class="['status-text', getStatusClass(student.status)]">{{ getStatusText(student.status) }}</text>
</view>
<view class="course-status">课程状态{{ student.courseStatus }}</view>
<view class="course-arrangement">课程安排{{ student.courseType === 'fixed' ? '固定课' : '临时课' }}</view>
@ -136,6 +145,10 @@
<view class="student-info">
<view class="student-name">{{ student.name }}</view>
<view class="student-age">年龄{{ student.age }}</view>
<view class="attendance-status">
<text class="status-label">签到状态</text>
<text :class="['status-text', getStatusClass(student.status)]">{{ getStatusText(student.status) }}</text>
</view>
<view class="course-status">课程状态{{ student.courseStatus }}</view>
<view class="course-arrangement">课程安排等待位</view>
@ -178,22 +191,33 @@
</view>
</view>
</view>
</view>
<view class="loading" v-if="loading && !scheduleInfo">
<fui-loading></fui-loading>
<text class="loading-text">加载中...</text>
</view>
<!-- 加载状态 -->
<view class="loading" v-if="loading && !scheduleInfo">
<fui-loading></fui-loading>
<text class="loading-text">加载中...</text>
</view>
<view class="error-message" v-if="error && !scheduleInfo">
<text>{{ errorMessage }}</text>
<view class="retry-btn" @click="fetchScheduleDetail">
<text>重试</text>
<!-- 错误信息 -->
<view class="error-message" v-if="error && !scheduleInfo">
<text>{{ errorMessage }}</text>
<view class="retry-btn" @click="fetchScheduleDetail">
<text>重试</text>
</view>
</view>
<!-- 底部关闭按钮 -->
<view class="modal-footer">
<view class="footer-btn close-footer-btn" @click="closePopup">
<text class="btn-text">关闭</text>
</view>
</view>
</view>
</view>
<!-- 学员点名底部弹窗 -->
<fui-modal :show="showAttendanceModal" title="学员点名" @cancel="closeAttendanceModal" :buttons="[]">
<fui-modal :show="showAttendanceModal" title="学员点名" @cancel="closeAttendanceModal" :buttons="[]" :zIndex="10001">
<view class="attendance-modal" v-if="selectedStudent">
<view class="student-info">
<view class="student-avatar-large">
@ -218,7 +242,7 @@
</fui-modal>
<!-- 升级确认弹窗 -->
<fui-modal :show="showUpgradeConfirm" title="升级确认" @cancel="cancelUpgrade" :buttons="[]" :zIndex="10000">
<fui-modal :show="showUpgradeConfirm" title="升级确认" @cancel="cancelUpgrade" :buttons="[]" :zIndex="10002">
<view class="upgrade-confirm-modal" v-if="upgradeStudent">
<view class="confirm-content">
<view class="upgrade-icon"></view>
@ -242,7 +266,7 @@
</fui-modal>
<!-- 删除课程安排确认弹窗 -->
<fui-modal :show="showDeleteSchedulesModal" title="删除确认" @cancel="closeDeleteSchedulesModal" :buttons="[]" :zIndex="10001">
<fui-modal :show="showDeleteSchedulesModal" title="删除确认" @cancel="closeDeleteSchedulesModal" :buttons="[]" :zIndex="10003">
<view class="delete-confirm-modal" v-if="studentToDelete">
<view class="confirm-content">
<view class="error-icon"></view>
@ -267,7 +291,7 @@
</view>
</view>
</fui-modal>
</fui-modal>
</view>
</template>
<script>
@ -288,12 +312,20 @@
computed: {
//
formalStudents() {
if (!this.scheduleInfo || !this.scheduleInfo.students) return [];
return this.scheduleInfo.students.filter(student => student.schedule_type === 1 || student.schedule_type === null);
if (!this.scheduleInfo) return [];
const students = this.scheduleInfo.formal_students;
if (!students || !Array.isArray(students)) {
return [];
}
return students;
},
waitingStudents() {
if (!this.scheduleInfo || !this.scheduleInfo.students) return [];
return this.scheduleInfo.students.filter(student => student.schedule_type === 2);
if (!this.scheduleInfo) return [];
const students = this.scheduleInfo.waiting_students;
if (!students || !Array.isArray(students)) {
return [];
}
return students;
},
statusClass() {
const statusMap = {
@ -361,24 +393,12 @@
if (newVal && this.scheduleId) {
this.fetchScheduleDetail();
}
},
scheduleId(newVal, oldVal) {
// scheduleId
if (newVal && this.visible && newVal !== oldVal) {
this.fetchScheduleDetail();
}
}
// : scheduleIdwatchvisiblewatch
// scheduleIdvisible=truevisible
},
methods: {
//
handleModalClick(e) {
//
if (e.index === 0) {
this.closePopup();
}
},
// 使API - admin
// (使API - admin)
async fetchScheduleDetail() {
if (!this.scheduleId) {
this.error = true;
@ -402,8 +422,33 @@
// 使APIadmin
if (data.schedule_info) {
// schedule_infoformal_studentswaiting_students
const allStudents = [...(data.formal_students || []), ...(data.waiting_students || [])];
//
const processStudents = (students) => {
return (students || []).map(student => ({
...student,
status_text: this.getStatusText(student.status || 0),
//
course_progress: student.course_progress || {
total: student.totalHours || 0,
used: student.usedHours || 0,
remaining: student.remainingHours || 0,
percentage: student.totalHours > 0 ? Math.round((student.usedHours / student.totalHours) * 100) : 0
},
//
needsRenewal: student.needsRenewal || false,
isTrialStudent: student.isTrialStudent || student.person_type !== 'student',
//
courseStatus: student.courseStatus || (student.person_type === 'student' ? '正式课' : '体验课'),
courseType: student.schedule_type === 2 ? 'waiting' : 'formal',
//
age: student.age || 0,
//
trialClassCount: student.trialClassCount || 0,
//
remainingHours: student.remainingHours || student.course_progress?.remaining || 0,
expiryDate: student.expiryDate || ''
}));
};
this.scheduleInfo = {
// schedule_info
@ -425,8 +470,20 @@
time_info: data.schedule_info.time_info || null,
//
course_duration: data.schedule_info.time_info?.duration || data.schedule_info.course_duration || 60,
//
students: allStudents.map(student => ({
//
formal_students: processStudents(data.formal_students),
waiting_students: processStudents(data.waiting_students),
//
available_capacity: data.schedule_info.available_capacity || 0,
enrolled_count: (data.formal_students?.length || 0) + (data.waiting_students?.length || 0),
remaining_capacity: data.schedule_info.remaining_capacity || 0
};
console.log('课程安排详情加载成功:', this.scheduleInfo);
} else {
//
const processStudents = (students) => {
return (students || []).map(student => ({
...student,
status_text: this.getStatusText(student.status || 0),
//
@ -438,7 +495,7 @@
},
//
needsRenewal: student.needsRenewal || false,
isTrialStudent: student.isTrialStudent || student.person_type !== 'student',
isTrialStudent: student.isTrialStudent || false,
//
courseStatus: student.courseStatus || (student.person_type === 'student' ? '正式课' : '体验课'),
courseType: student.schedule_type === 2 ? 'waiting' : 'formal',
@ -447,16 +504,16 @@
//
trialClassCount: student.trialClassCount || 0,
//
remainingHours: student.remainingHours || student.course_progress?.remaining || 0,
remainingHours: student.remainingHours || 0,
expiryDate: student.expiryDate || ''
})),
//
available_capacity: data.available_capacity || 0,
enrolled_count: allStudents.length,
remaining_capacity: data.remaining_capacity || 0
}));
};
} else {
//
// students
const allStudents = data.students || [];
const formalStudents = allStudents.filter(s => s.schedule_type === 1 || s.schedule_type === null);
const waitingStudents = allStudents.filter(s => s.schedule_type === 2);
this.scheduleInfo = {
//
id: data.id,
@ -477,34 +534,12 @@
time_info: data.time_info || null,
//
course_duration: data.time_info?.duration || data.course_duration || 60,
//
students: (data.students || []).map(student => ({
...student,
status_text: this.getStatusText(student.status || 0),
//
course_progress: student.course_progress || {
total: student.totalHours || 0,
used: student.usedHours || 0,
remaining: student.remainingHours || 0,
percentage: student.totalHours > 0 ? Math.round((student.usedHours / student.totalHours) * 100) : 0
},
//
needsRenewal: student.needsRenewal || false,
isTrialStudent: student.isTrialStudent || false,
//
courseStatus: student.courseStatus || (student.person_type === 'student' ? '正式课' : '体验课'),
courseType: student.schedule_type === 2 ? 'waiting' : 'formal',
//
age: student.age || 0,
//
trialClassCount: student.trialClassCount || 0,
//
remainingHours: student.remainingHours || 0,
expiryDate: student.expiryDate || ''
})),
//
formal_students: processStudents(formalStudents),
waiting_students: processStudents(waitingStudents),
//
available_capacity: data.available_capacity || 0,
enrolled_count: data.enrolled_count || 0,
enrolled_count: allStudents.length,
remaining_capacity: data.remaining_capacity || 0
};
}
@ -554,16 +589,35 @@
//
handleStudentClick(student, index) {
console.log('点击了学员:', student)
console.log('=== 学员点击事件触发 ===');
console.log('学员信息:', student);
console.log('学员索引:', index);
console.log('学员状态:', student.status);
// 0
if (student.status !== 0) {
uni.showToast({
title: `该学员已${this.getStatusText(student.status)},无法重复操作`,
icon: 'none',
duration: 2000
});
return;
}
//
if (student.schedule_type === 2) {
console.log('等待位学员,弹出升级确认');
// -
this.handleWaitingStudentClick(student, index);
} else {
console.log('正式学员,弹出签到弹窗');
console.log('设置 selectedStudent:', student);
console.log('设置 selectedStudentIndex:', index);
// - /
this.selectedStudent = student;
this.selectedStudentIndex = index;
this.showAttendanceModal = true;
console.log('showAttendanceModal 已设置为:', this.showAttendanceModal);
}
},
@ -778,8 +832,14 @@
this.selectedStudent.statusClass = this.getStudentStatusClass(actionMap[action].status);
// scheduleInfo
if (this.scheduleInfo && this.scheduleInfo.students && this.selectedStudentIndex >= 0) {
this.$set(this.scheduleInfo.students, this.selectedStudentIndex, this.selectedStudent);
if (this.scheduleInfo) {
//
const isFormal = this.selectedStudent.schedule_type === 1 || this.selectedStudent.schedule_type === null;
const targetArray = isFormal ? this.scheduleInfo.formal_students : this.scheduleInfo.waiting_students;
if (targetArray && this.selectedStudentIndex >= 0) {
this.$set(targetArray, this.selectedStudentIndex, this.selectedStudent);
}
}
//
@ -854,6 +914,16 @@
return statusTextMap[status] || '未知状态';
},
//
getStatusClass(status) {
const statusClassMap = {
0: 'status-pending', //
1: 'status-completed', //
2: 'status-leave' //
};
return statusClassMap[status] || '';
},
//
getStatusTextFromCode(statusCode) {
const statusTextMap = {
@ -921,6 +991,38 @@
</script>
<style lang="scss" scoped>
/* 自定义弹窗样式 */
.modal-mask {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.7);
display: flex;
align-items: center;
justify-content: center;
z-index: 9999;
padding: 20rpx;
}
.modal-container {
width: 100%;
max-width: 700rpx;
max-height: 90vh;
background-color: #1a1a1a;
border-radius: 16rpx;
display: flex;
flex-direction: column;
overflow: hidden;
box-shadow: 0 10rpx 40rpx rgba(0, 0, 0, 0.5);
}
/* 移除 fui-modal 的默认 padding */
::v-deep .fui-modal__body {
padding: 0 !important;
}
/* 自定义头部样式 */
.custom-header {
display: flex;
@ -929,6 +1031,7 @@
padding: 20rpx 30rpx;
background: #2a2a2a;
border-bottom: 1px solid #3a3a3a;
flex-shrink: 0;
}
.modal-title {
@ -966,7 +1069,7 @@
.schedule-detail {
padding: 20rpx;
max-height: 80vh;
flex: 1;
overflow-y: auto;
position: relative;
}
@ -1137,6 +1240,44 @@
color: #ff3b30;
}
/* 签到状态相关样式 */
.attendance-status {
display: flex;
align-items: center;
margin: 8rpx 0;
font-size: 24rpx;
}
.status-label {
color: #666;
margin-right: 8rpx;
}
.status-text {
font-weight: 600;
padding: 4rpx 12rpx;
border-radius: 12rpx;
font-size: 22rpx;
}
.status-text.status-pending {
background: rgba(255, 149, 0, 0.1);
color: #ff9500;
border: 1rpx solid rgba(255, 149, 0, 0.2);
}
.status-text.status-completed {
background: rgba(41, 211, 180, 0.1);
color: #29d3b4;
border: 1rpx solid rgba(41, 211, 180, 0.2);
}
.status-text.status-leave {
background: rgba(255, 59, 48, 0.1);
color: #ff3b30;
border: 1rpx solid rgba(255, 59, 48, 0.2);
}
.status-absent {
color: #8e8e93;
}
@ -1658,4 +1799,43 @@
box-shadow: 0 2rpx 8rpx rgba(239, 68, 68, 0.4);
}
}
/* 弹窗底部样式 */
.modal-footer {
padding: 20rpx 30rpx;
background: #2a2a2a;
border-top: 1px solid #3a3a3a;
flex-shrink: 0;
display: flex;
justify-content: center;
}
.footer-btn {
padding: 16rpx 60rpx;
border-radius: 8rpx;
cursor: pointer;
transition: all 0.3s ease;
.btn-text {
font-size: 28rpx;
font-weight: 600;
}
&:active {
transform: scale(0.98);
}
}
.close-footer-btn {
background: #4a4a4a;
border: 1px solid #666;
.btn-text {
color: #ccc;
}
&:hover {
background: #5a5a5a;
}
}
</style>

49
uniapp/components/student-edit-popup/student-edit-popup.less

@ -81,7 +81,54 @@
.form-input {
flex: 1;
// 头像上传样式
.avatar-upload {
width: 160rpx;
height: 160rpx;
border-radius: 50%;
overflow: hidden;
border: 2rpx solid #e9ecef;
background: #f8f9fa;
display: flex;
align-items: center;
justify-content: center;
cursor: pointer;
transition: all 0.3s ease;
&:active {
background: #e9ecef;
transform: scale(0.95);
}
.avatar-preview {
width: 100%;
height: 100%;
border-radius: 50%;
}
.avatar-placeholder {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
width: 100%;
height: 100%;
.avatar-icon {
font-size: 48rpx;
color: #29d3b4;
margin-bottom: 8rpx;
font-weight: 300;
}
.avatar-text {
font-size: 22rpx;
color: #999;
}
}
}
input {
width: 100%;
height: 80rpx;

70
uniapp/components/student-edit-popup/student-edit-popup.vue

@ -13,7 +13,20 @@
<!-- 基本信息 -->
<view class="form-group">
<view class="form-group-title">基本信息</view>
<view class="form-item">
<view class="form-label">头像</view>
<view class="form-input">
<view class="avatar-upload" @click="chooseAvatar">
<image v-if="studentData.headimg" :src="studentData.headimg" class="avatar-preview" mode="aspectFill"></image>
<view v-else class="avatar-placeholder">
<text class="avatar-icon">+</text>
<text class="avatar-text">上传头像</text>
</view>
</view>
</view>
</view>
<view class="form-item">
<view class="form-label required">姓名</view>
<view class="form-input">
@ -151,6 +164,7 @@
<script>
import apiRoute from '@/api/apiRoute.js'
import { uploadFile } from '@/common/util.js'
export default {
name: 'StudentEditPopup',
@ -183,7 +197,8 @@ export default {
consultant_id: null,
coach_id: null,
trial_class_count: 2, // |2
actionsExpanded: false //
actionsExpanded: false, //
headimg: '' // URL
},
//
@ -258,7 +273,8 @@ export default {
consultant_id: student.consultant_id,
coach_id: student.coach_id,
trial_class_count: student.trial_class_count,
actionsExpanded: student.actionsExpanded || false
actionsExpanded: student.actionsExpanded || false,
headimg: student.headimg || '' // URL
}
//
this.parseExistingTags()
@ -291,7 +307,8 @@ export default {
consultant_id: null,
coach_id: null,
trial_class_count: 2,
actionsExpanded: false
actionsExpanded: false,
headimg: '' // URL
}
//
this.selectedTagIds = []
@ -378,7 +395,8 @@ export default {
member_label: this.studentData.member_label,
consultant_id: this.studentData.consultant_id,
coach_id: this.studentData.coach_id,
trial_class_count: this.studentData.trial_class_count
trial_class_count: this.studentData.trial_class_count,
headimg: this.studentData.headimg // URL
}
if (this.isEditing) {
@ -466,7 +484,7 @@ export default {
this.selectedTagIds = this.studentData.member_label.split(',')
.map(id => parseInt(id.trim()))
.filter(id => !isNaN(id))
//
this.selectedTagNames = this.selectedTagIds.map(tagId => {
const tag = this.studentTagOptions.find(t => t.label_id === tagId)
@ -476,6 +494,46 @@ export default {
this.selectedTagIds = []
this.selectedTagNames = []
}
},
//
chooseAvatar() {
uni.chooseImage({
count: 1,
sizeType: ['compressed'],
sourceType: ['album', 'camera'],
success: (res) => {
const tempFilePath = res.tempFilePaths[0]
//
uni.showLoading({
title: '上传中...',
mask: true
})
// uploadFile
uploadFile(
tempFilePath,
(fileData) => {
// ,fileDataurlextnamename
this.studentData.headimg = fileData.url
uni.hideLoading()
uni.showToast({
title: '头像上传成功',
icon: 'success'
})
},
(error) => {
//
uni.hideLoading()
console.error('头像上传失败:', error)
}
)
},
fail: (err) => {
console.error('选择图片失败:', err)
}
})
}
}
}

24
uniapp/components/student-info-card/student-info-card.vue

@ -93,18 +93,18 @@ export default {
// xx
calculateAge(birthday) {
if (!birthday) return ''
const birthDate = new Date(birthday)
const now = new Date()
let years = now.getFullYear() - birthDate.getFullYear()
let months = now.getMonth() - birthDate.getMonth()
if (months < 0) {
years--
months += 12
}
// 1
if (now.getDate() < birthDate.getDate()) {
months--
@ -113,7 +113,7 @@ export default {
months += 12
}
}
if (years > 0 && months > 0) {
return `${years}${months}`
} else if (years > 0) {
@ -242,19 +242,19 @@ export default {
margin-top: 20rpx;
padding-top: 20rpx;
border-top: 1rpx solid #333;
.info-row {
display: flex;
align-items: flex-start;
margin-bottom: 15rpx;
.info-label {
color: #999;
font-size: 22rpx;
width: 150rpx;
width: 165rpx;
flex-shrink: 0;
}
.info-value {
color: white;
font-size: 22rpx;
@ -271,12 +271,12 @@ export default {
display: flex;
flex-wrap: wrap;
gap: 15rpx;
.action-btn {
padding: 15rpx 25rpx;
background-color: #29d3b4;
border-radius: 25rpx;
.action-text {
color: white;
font-size: 22rpx;
@ -284,4 +284,4 @@ export default {
}
}
}
</style>
</style>

87
uniapp/components/study-plan-popup/study-plan-popup.vue

@ -1,6 +1,7 @@
<template>
<uni-popup ref="popup" type="center">
<view class="popup-container">
<view v-if="isVisible" class="popup-wrapper" @click="handleMaskClick">
<view class="popup-mask"></view>
<view class="popup-container" @click.stop>
<view class="popup-header">
<view class="popup-title">{{ isEditing ? '编辑学习计划' : '新增学习计划' }}</view>
<view class="popup-close" @click="close"></view>
@ -24,7 +25,7 @@
</picker>
</view>
</view>
<view class="form-item">
<view class="form-label">结束日期</view>
<view class="form-input">
@ -35,19 +36,19 @@
</picker>
</view>
</view>
<view class="form-item">
<view class="form-label">计划内容</view>
<view class="form-input">
<textarea
v-model="planData.plan_content"
<textarea
v-model="planData.plan_content"
placeholder="请输入计划详细内容"
maxlength="500"
:show-confirm-bar="false"
></textarea>
</view>
</view>
<!-- <view class="form-item">-->
<!-- <view class="form-label">状态</view>-->
<!-- <view class="form-input">-->
@ -65,7 +66,7 @@
<view class="popup-btn confirm-btn" @click="confirm">确认</view>
</view>
</view>
</uni-popup>
</view>
</template>
<script>
@ -99,7 +100,6 @@ export default {
this.isEditing = false
this.resetData()
this.isVisible = true
this.$refs.popup.open()
},
//
@ -113,22 +113,25 @@ export default {
plan_content: plan.plan_content || '',
status: plan.status || 'pending'
}
//
this.statusIndex = this.statusOptions.indexOf(this.planData.status)
this.isVisible = true
this.$refs.popup.open()
},
//
close() {
this.isVisible = false
this.$refs.popup.close()
this.resetData()
this.$emit('close')
},
//
handleMaskClick() {
this.close()
},
//
resetData() {
this.planData = {
@ -253,13 +256,59 @@ export default {
</script>
<style lang="less" scoped>
.popup-wrapper {
position: fixed;
top: 0;
left: 0;
right: 0;
bottom: 0;
z-index: 999;
display: flex;
align-items: center;
justify-content: center;
animation: fadeIn 0.3s ease;
}
.popup-mask {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background-color: rgba(0, 0, 0, 0.5);
z-index: 1;
}
.popup-container {
position: relative;
z-index: 2;
width: 90vw;
max-width: 500rpx;
background-color: #1a1a1a;
border-radius: 20rpx;
border: 1px solid #333;
overflow: hidden;
animation: slideUp 0.3s ease;
}
@keyframes fadeIn {
from {
opacity: 0;
}
to {
opacity: 1;
}
}
@keyframes slideUp {
from {
transform: translateY(100rpx);
opacity: 0;
}
to {
transform: translateY(0);
opacity: 1;
}
}
.popup-header {
@ -286,7 +335,7 @@ export default {
display: flex;
align-items: center;
justify-content: center;
&:hover {
color: #ffffff;
}
@ -321,7 +370,7 @@ export default {
border-radius: 12rpx;
border: 1px solid #404040;
overflow: hidden;
input, textarea {
width: 100%;
padding: 20rpx;
@ -330,12 +379,12 @@ export default {
font-size: 28rpx;
border: none;
outline: none;
&::placeholder {
color: #999999;
}
}
textarea {
min-height: 120rpx;
resize: none;
@ -376,7 +425,7 @@ export default {
background-color: #333333;
color: #ffffff;
border: 1px solid #404040;
&:active {
background-color: #404040;
}
@ -385,7 +434,7 @@ export default {
.confirm-btn {
background-color: #29D3B4;
color: #ffffff;
&:active {
background-color: #24B89E;
}

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

@ -1431,61 +1431,19 @@ export default {
},
// 使API
async viewScheduleDetail(scheduleId) {
try {
if (!scheduleId) {
uni.showToast({
title: '课程ID不能为空',
icon: 'none'
});
return;
}
//
this.selectedScheduleId = scheduleId;
this.showScheduleDetail = true;
// 使APIadmin
console.log('调用统一API获取课程安排详情:', scheduleId);
// APIScheduleDetailfetchScheduleDetail
// ScheduleDetailapi.getCourseArrangementDetail()admin
// 使
// API
try {
const testResponse = await api.getCourseArrangementDetail({
schedule_id: scheduleId
});
if (testResponse.code !== 1) {
console.warn('API预检查警告:', testResponse.msg);
}
} catch (preCheckError) {
console.warn('API预检查失败,将在ScheduleDetail组件中处理:', preCheckError);
}
} catch (error) {
console.error('获取课程安排详情失败:', error);
let errorMessage = '获取课程详情失败';
if (error.message) {
if (error.message.includes('timeout')) {
errorMessage = '请求超时,请重试';
} else if (error.message.includes('Network')) {
errorMessage = '网络连接失败';
}
}
viewScheduleDetail(scheduleId) {
if (!scheduleId) {
uni.showToast({
title: errorMessage,
icon: 'none',
duration: 3000
title: '课程ID不能为空',
icon: 'none'
});
// 使ScheduleDetail
this.selectedScheduleId = scheduleId;
this.showScheduleDetail = true;
return;
}
// propsScheduleDetail
// ScheduleDetailwatchapi.getCourseArrangementDetail()
this.selectedScheduleId = scheduleId;
this.showScheduleDetail = true;
},
//

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

@ -29,6 +29,7 @@
<view class="student-info">
<view class="student-name">{{ stu.name }}</view>
<view class="student-age">年龄{{ stu.age || '未知' }}</view>
<view class="course-status">课程类型{{ stu.person_type == 'customer_resource' ? '体验课' : '正式课'}}</view>
<view class="course-status">课程状态{{ stu.courseStatus }}</view>
<view class="course-status">上课情况{{ stu.course_progress.used }}/{{ stu.course_progress.total }}</view>
<view class="expiry-date" v-if="stu.student_course_info">到期时间{{ stu.student_course_info.end_date || '未设置' }}</view>

705
uniapp/pages-market/clue/clue_info.vue

@ -120,26 +120,16 @@
<CourseInfoCard v-if="currentPopup === 'course_info'" :course-list="courseInfo"
@view-detail="viewCourseDetail" />
<!-- 体测记录弹窗 -->
<view class="fitness-records-container" v-if="currentPopup === 'fitness_record'">
<!-- 空状态提示 -->
<view v-if="currentStudentFitnessRecords.length === 0" class="empty-state">
<view class="empty-icon">📊</view>
<view class="empty-text">暂无体测记录</view>
<view class="empty-tip">点击下方"新增"按钮添加体测记录</view>
</view>
<!-- 体测记录列表 -->
<FitnessRecordCard v-for="record in currentStudentFitnessRecords" :key="record.id" :record="record"
@edit="openEditFitnessRecord" />
</view>
<!-- 学习计划弹窗 -->
<StudyPlanCard v-if="currentPopup === 'study_plan'" :plan-list="studyPlanList" @edit="openEditStudyPlan" />
<!-- 订单列表弹窗 -->
<OrderListCard v-if="currentPopup === 'order_list'" :order-list="orderList" @add-order="openAddOrderDialog"
@pay-order="handlePayOrder" @view-detail="viewOrderDetail" />
<OrderListCard
v-if="currentPopup === 'order_list'"
:student-id="currentStudent && currentStudent.id"
:resource-id="clientInfo.resource_id"
@payment-success="handlePaymentSuccess"
/>
<!-- 服务列表弹窗 -->
<ServiceListCard v-if="currentPopup === 'service_list'" :service-list="serviceList" />
@ -164,57 +154,22 @@
</view>
</uni-popup>
<!-- 体测记录列表弹窗 (z-index: 999) -->
<FitnessRecordListPopup
:visible="showFitnessListPopup"
:records="currentStudentFitnessRecords"
@close="closeFitnessListPopup"
@add="openAddFitnessRecord"
@edit="openEditFitnessRecord"
/>
<!-- 体测记录编辑弹窗 (z-index: 1000, 使用view类型,高于列表弹窗) -->
<FitnessRecordPopup ref="fitnessRecordPopup" :resource-id="String(clientInfo.resource_id)"
:student-id="currentStudent && currentStudent.id" @confirm="handleFitnessRecordConfirm" />
<StudentEditPopup ref="studentEditPopup" :resource-id="clientInfo.resource_id"
@confirm="handleStudentEditConfirm" />
<StudyPlanPopup ref="studyPlanPopup" :student-id="currentStudent && currentStudent.id"
@confirm="handleStudyPlanConfirm" />
<!-- 新增订单弹窗 -->
<uni-popup ref="orderFormPopup" type="bottom">
<OrderFormPopup :visible="showOrderForm" :student-info="currentStudent"
:resource-id="clientInfo.resource_id" @cancel="closeOrderForm" @confirm="handleOrderFormConfirm" />
</uni-popup>
<!-- 二维码支付弹窗 -->
<uni-popup ref="qrCodePopup" type="center" @close="closeQRCodeModal">
<view class="qrcode-payment-modal" v-if="qrCodePaymentData">
<!-- 弹窗头部 -->
<view class="modal-header">
<text class="modal-title">扫码支付</text>
<view class="close-btn" @click="closeQRCodeModal">
<text></text>
</view>
</view>
<!-- 订单信息 -->
<view class="order-info">
<view class="info-row">
<text class="label">订单号</text>
<text class="value">{{ qrCodePaymentData.order.order_no }}</text>
</view>
<view class="info-row">
<text class="label">支付金额</text>
<text class="amount">¥{{ qrCodePaymentData.order.total_amount }}</text>
</view>
</view>
<!-- 二维码区域 -->
<view class="qrcode-container">
<image v-if="qrCodePaymentData.qrcodeImage" :src="qrCodePaymentData.qrcodeImage"
class="qrcode-image" mode="aspectFit" />
<text v-else class="qrcode-placeholder">二维码加载中...</text>
<text class="qrcode-tip">请使用微信扫码完成支付</text>
</view>
<!-- 操作按钮 -->
<view class="modal-buttons">
<view class="btn secondary" @click="closeQRCodeModal">取消支付</view>
<view class="btn primary" @click="confirmQRCodePayment">发送二维码给客户</view>
</view>
</view>
</uni-popup>
</view>
</template>
@ -233,11 +188,12 @@
import CourseInfoCard from '@/components/course-info-card/index.vue'
import OrderListCard from '@/components/order-list-card/index.vue'
import ServiceListCard from '@/components/service-list-card/index.vue'
import OrderFormPopup from '@/components/order-form-popup/index.vue'
//
import StudentEditPopup from '@/components/student-edit-popup/student-edit-popup.vue'
import FitnessRecordPopup from '@/components/fitness-record-popup/fitness-record-popup.vue'
import StudyPlanPopup from '@/components/study-plan-popup/study-plan-popup.vue'
//
import FitnessRecordListPopup from '@/components/fitness-record-list-popup/index.vue'
export default {
components: {
@ -252,10 +208,10 @@
CourseInfoCard,
OrderListCard,
ServiceListCard,
OrderFormPopup,
StudentEditPopup,
FitnessRecordPopup,
StudyPlanPopup
StudyPlanPopup,
FitnessRecordListPopup
},
data() {
return {
@ -280,15 +236,10 @@
//
currentPopup: null,
studyPlanList: [],
orderList: [],
serviceList: [],
//
showOrderForm: false,
//
showQRCodeModal: false,
qrCodePaymentData: null,
//
showFitnessListPopup: false,
//
remark_content: '',
@ -386,8 +337,8 @@
},
showAddButton() {
//
return ['fitness_record', 'study_plan'].includes(this.currentPopup)
//
return ['study_plan'].includes(this.currentPopup)
},
},
@ -587,15 +538,16 @@
this.currentPopup = 'course_info'
break
case 'fitness_record':
await this.getFitnessRecords(student.id)
this.currentPopup = 'fitness_record'
break
await this.getFitnessRecords(student.id)
// 使
this.showFitnessListPopup = true
break
case 'study_plan':
await this.getStudyPlanList(student.id)
this.currentPopup = 'study_plan'
break
case 'order_list':
await this.getOrderList(student.id)
// ,
this.currentPopup = 'order_list'
break
case 'service_list':
@ -610,16 +562,17 @@
this.currentPopup = null
//
this.studyPlanList = []
this.orderList = []
this.serviceList = []
this.courseInfo = []
this.fitnessRecords = []
// ,
},
closeFitnessListPopup() {
this.showFitnessListPopup = false
},
handleAddAction() {
if (this.currentPopup === 'fitness_record') {
this.openAddFitnessRecord()
} else if (this.currentPopup === 'study_plan') {
if (this.currentPopup === 'study_plan') {
this.openAddStudyPlan()
}
},
@ -1217,563 +1170,12 @@
}
},
//
async getOrderList(studentId = null) {
if (!this.clientInfo?.resource_id) return
try {
const targetStudentId = studentId || this.currentStudent?.id
// 使student_id
const params = {}
if (targetStudentId) {
params.student_id = targetStudentId
} else if (this.clientInfo.resource_id) {
params.resource_id = this.clientInfo.resource_id
} else {
console.warn('缺少查询参数')
this.orderList = []
return
}
const res = await apiRoute.xs_orderTableList(params)
if (res.code === 1) {
// API
this.orderList = this.processOrderData(res.data?.data || [])
} else {
console.error('获取订单列表失败:', res.msg)
this.orderList = []
}
} catch (error) {
console.error('获取订单列表异常:', error)
this.orderList = []
}
},
//
processOrderData(orders) {
if (!Array.isArray(orders)) return []
return orders.map(order => ({
id: order.id,
student_id: order.student_id,
order_no: order.payment_id || `ORD${order.id}`, // 使payment_id
product_name: order.course_id_name || '课程',
total_amount: order.order_amount || '0.00',
paid_amount: order.order_status === 'paid' ? order.order_amount : '0.00',
unpaid_amount: order.order_status === 'paid' ? '0.00' : order.order_amount,
payment_method: this.formatPaymentType(order.payment_type),
salesperson_name: order.staff_id_name || '未指定',
course_count: order.total_hours || 0, // 使
status: this.mapOrderStatus(order.order_status),
create_time: order.created_at,
//
contract_id: order.contract_id,
contract_sign_id: order.contract_sign_id,
//
_raw: order
}))
},
//
formatPaymentType(paymentType) {
const typeMap = {
'cash': '现金支付',
'scan_code': '扫码支付',
'subscription': '订阅支付',
'wxpay_online': '微信在线代付'
}
return typeMap[paymentType] || paymentType || '未知'
},
//
mapOrderStatus(orderStatus) {
const statusMap = {
'pending': 'pending',
'paid': 'paid',
'signed': 'completed',
'completed': 'completed',
'transfer': 'partial'
}
return statusMap[orderStatus] || 'pending'
},
//
async getServiceList(studentId = null) {
if (!this.clientInfo?.resource_id) return
const targetStudentId = studentId || this.currentStudent?.id
if (!targetStudentId) {
uni.showToast({
title: '请先选择学生',
icon: 'none'
})
return
}
try {
const response = await apiRoute.getStudentServiceList({
student_id: targetStudentId
})
if (response.code === 1) {
this.serviceList = response.data || []
} else {
console.error('获取服务记录失败:', response.msg)
uni.showToast({
title: response.msg || '获取服务记录失败',
icon: 'none'
})
this.serviceList = []
}
} catch (error) {
console.error('获取服务记录异常:', error)
uni.showToast({
title: '网络请求失败',
icon: 'none'
})
this.serviceList = []
}
},
//
openAddOrderDialog() {
if (!this.currentStudent) {
uni.showToast({
title: '请先选择学生',
icon: 'none'
})
return
}
//
this.closePopup()
this.showOrderForm = true
this.$refs.orderFormPopup.open()
},
//
closeOrderForm() {
this.showOrderForm = false
this.$refs.orderFormPopup.close()
},
//
async handleOrderFormConfirm() {
try {
//
this.closeOrderForm()
//
await this.getOrderList()
uni.showToast({
title: '订单创建成功',
icon: 'success'
})
} catch (error) {
console.error('处理订单确认失败:', error)
}
},
//
handlePayOrder(order) {
//
this.closePopup()
//
this.processPayment(order)
},
//
async processPayment(order) {
const paymentType = order._raw?.payment_type || order.payment_type
console.log('paymentType', paymentType)
try {
switch (paymentType) {
case 'cash':
// -
await this.confirmCashPayment(order)
break
case 'scan_code':
// -
this.showQRCodePayment(order)
break
case 'subscription':
// -
this.showSubscriptionPayment(order)
break
case 'wxpay_online':
// 线 -
this.showWechatPayment(order)
break
default:
uni.showToast({
title: '不支持的支付方式',
icon: 'none'
})
}
} catch (error) {
console.error('支付处理失败:', error)
uni.showToast({
title: '支付处理失败',
icon: 'none'
})
}
},
//
async confirmCashPayment(order) {
uni.showModal({
title: '现金支付确认',
content: `确认已收到现金支付 ¥${order.total_amount}`,
success: async (res) => {
if (res.confirm) {
try {
// API
const updateData = {
order_id: order._raw?.id || order.id,
order_status: 'paid',
payment_id: `CASH${Date.now()}` //
}
const result = await apiRoute.xs_orderTableUpdatePaymentStatus(updateData)
if (result.code === 1) {
uni.showToast({
title: '支付确认成功',
icon: 'success'
})
//
await this.getOrderList()
} else {
uni.showToast({
title: result.msg || '支付确认失败',
icon: 'none'
})
}
} catch (error) {
console.error('现金支付确认失败:', error)
uni.showToast({
title: '支付确认失败',
icon: 'none'
})
}
}
}
})
},
//
async showQRCodePayment(order) {
console.log('扫码支付:', order)
try {
uni.showLoading({
title: '生成支付二维码...'
})
//
const res = await apiRoute.getOrderPayQrcode({
order_id: order._raw?.id || order.id
})
uni.hideLoading()
if (res.code === 1 && res.data) {
//
this.openQRCodeModal({
order: order,
qrcode: res.data.code_url,
// 使base64访localhost
qrcodeImage: res.data.qrcode_base64 || res.data.qrcode_url
})
} else {
uni.showToast({
title: res.msg || '获取支付二维码失败',
icon: 'none'
})
}
} catch (error) {
uni.hideLoading()
console.error('获取支付二维码失败:', error)
uni.showToast({
title: '获取支付二维码失败',
icon: 'none'
})
}
},
//
openQRCodeModal(paymentData) {
this.qrCodePaymentData = paymentData
this.showQRCodeModal = true
this.$refs.qrCodePopup.open()
},
//
closeQRCodeModal() {
this.showQRCodeModal = false
this.qrCodePaymentData = null
this.$refs.qrCodePopup.close()
},
//
async confirmQRCodePayment() {
if (!this.qrCodePaymentData?.order) return
const order = this.qrCodePaymentData.order
uni.showModal({
title: '支付确认',
content: '请确认是否已完成扫码支付?',
success: async (res) => {
if (res.confirm) {
try {
//
await this.updateOrderStatus(order, 'paid', `QR${Date.now()}`)
this.closeQRCodeModal()
} catch (error) {
console.error('支付确认失败:', error)
uni.showToast({
title: '支付确认失败',
icon: 'none'
})
}
}
}
})
},
//
showSubscriptionPayment(order) {
uni.showActionSheet({
itemList: ['确认分期支付方案', '取消支付'],
success: async (res) => {
if (res.tapIndex === 0) {
uni.showModal({
title: '分期支付确认',
content: `确认使用分期支付方式支付 ¥${order.total_amount}`,
success: async (modalRes) => {
if (modalRes.confirm) {
//
await this.updateOrderStatus(order, 'partial',
`SUB${Date.now()}`)
}
}
})
}
}
})
},
//
showWechatPayment(order) {
uni.showModal({
title: '微信支付',
content: `将调用微信支付 ¥${order.total_amount}`,
confirmText: '确认支付',
cancelText: '取消',
success: async (res) => {
if (res.confirm) {
//
uni.showLoading({
title: '正在调用微信支付...'
})
//
setTimeout(async () => {
uni.hideLoading()
// API
uni.showModal({
title: '支付结果',
content: '微信支付完成,请确认是否已收到款项?',
success: async (confirmRes) => {
if (confirmRes.confirm) {
await this.updateOrderStatus(order, 'paid',
`WX${Date.now()}`)
}
}
})
}, 1500)
}
}
})
},
//
async updateOrderStatus(order, status, paymentId = '') {
try {
const updateData = {
order_id: order._raw?.id || order.id,
order_status: status,
payment_id: paymentId
}
const result = await apiRoute.xs_orderTableUpdatePaymentStatus(updateData)
if (result.code === 1) {
const statusText = {
'paid': '支付成功',
'partial': '分期支付确认成功',
'cancelled': '支付已取消'
}
uni.showToast({
title: statusText[status] || '状态更新成功',
icon: 'success'
})
//
await this.getOrderList()
} else {
uni.showToast({
title: result.msg || '状态更新失败',
icon: 'none'
})
}
} catch (error) {
console.error('更新订单状态失败:', error)
uni.showToast({
title: '状态更新失败',
icon: 'none'
})
}
},
//
viewOrderDetail(order) {
const orderInfo = order._raw || order
const detailText = `
订单号${order.order_no}
课程${order.product_name}
金额¥${order.total_amount}
已付¥${order.paid_amount}
未付¥${order.unpaid_amount}
支付方式${order.payment_method}
销售顾问${order.salesperson_name}
课时数${order.course_count}
状态${this.getOrderStatusText(order.status)}
创建时间${this.formatOrderTime(order.create_time)}
${orderInfo.paid_at ? '支付时间:' + this.formatOrderTime(orderInfo.paid_at) : ''}
`.trim()
//
const isOrderPaid = order.status === 'paid'
const buttons = isOrderPaid ? ['知道了', '合同签署'] : ['知道了']
console.log('订单数据', order)
uni.showModal({
title: '订单详情',
content: detailText,
showCancel: isOrderPaid,
cancelText: isOrderPaid ? '知道了' : '',
confirmText: isOrderPaid ? '合同签署' : '知道了',
success: (res) => {
if (res.confirm && isOrderPaid) {
//
this.goToContractSign(order)
}
}
})
},
//
goToContractSign(order) {
//
const studentId = order.student_id || this.currentStudent?.id
const contractId = order.contract_id || order._raw?.contract_id
const contractSignId = order.contract_sign_id || order._raw?.contract_sign_id
if (!studentId) {
uni.showToast({
title: '缺少学生信息',
icon: 'none'
})
return
}
if (!contractId) {
// ID
this.getContractByOrder(order, studentId)
return
}
//
let url =
`/pages-student/contracts/sign?contract_id=${contractId}&student_id=${studentId}&contract_name=${encodeURIComponent(order.product_name + '合同')}&user_role=staff`
// ID
if (contractSignId) {
url += `&contract_sign_id=${contractSignId}`
}
//
uni.navigateTo({
url: url
})
},
//
async getContractByOrder(order, studentId) {
try {
uni.showLoading({
title: '获取合同信息...'
})
// API
const res = await apiRoute.getContractByOrder({
order_id: order._raw?.id || order.id,
student_id: studentId
})
uni.hideLoading()
if (res.code === 1 && res.data) {
const contractInfo = res.data
//
uni.navigateTo({
url: `/pages-student/contracts/sign?contract_id=${contractInfo.contract_id}&student_id=${studentId}&contract_name=${encodeURIComponent(contractInfo.contract_name || order.product_name + '合同')}&user_role=staff`
})
} else {
uni.showToast({
title: res.msg || '未找到相关合同',
icon: 'none'
})
}
} catch (error) {
uni.hideLoading()
console.error('获取合同信息失败:', error)
uni.showToast({
title: '获取合同信息失败',
icon: 'none'
})
}
},
//
getOrderStatusText(status) {
const statusMap = {
'pending': '待支付',
'paid': '已支付',
'partial': '部分支付',
'cancelled': '已取消',
'completed': '已完成',
'refunded': '已退款'
}
return statusMap[status] || '未知状态'
},
//
formatOrderTime(timeStr) {
if (!timeStr) return '未知'
try {
const date = new Date(timeStr)
return `${date.getFullYear()}-${String(date.getMonth() + 1).padStart(2, '0')}-${String(date.getDate()).padStart(2, '0')} ${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`
} catch (e) {
return timeStr
}
/**
* 订单支付成功回调
*/
handlePaymentSuccess(order) {
console.log('订单支付成功:', order)
// ,
},
//
@ -1801,28 +1203,5 @@ ${orderInfo.paid_at ? '支付时间:' + this.formatOrderTime(orderInfo.paid_at
</script>
<style lang="less" scoped>
.fitness-records-container {
max-height: 60vh;
overflow-y: auto;
}
/* 滚动条样式 */
.fitness-records-container::-webkit-scrollbar {
width: 6rpx;
}
.fitness-records-container::-webkit-scrollbar-track {
background: transparent;
}
.fitness-records-container::-webkit-scrollbar-thumb {
background: #29D3B4;
border-radius: 3rpx;
}
.fitness-records-container::-webkit-scrollbar-thumb:hover {
background: #24B89E;
}
@import './clue_info.less';
</style>

201
uniapp/pages-market/clue/edit_clues.vue

@ -45,13 +45,13 @@
</view>
</fui-form-item>
<!-- 来源渠道 -->
<fui-form-item
<fui-form-item
v-if="formData.source == 1"
label="来源渠道"
labelSize='26'
prop="source_channel"
background='#434544'
labelColor='#fff'
label="来源渠道"
labelSize='26'
prop="source_channel"
background='#434544'
labelColor='#fff'
:bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<view class="input-title" style="margin-right:14rpx;" @click="openCicker('source_channel')">
@ -172,7 +172,7 @@
</view>
</view>
</fui-form-item> -->
<fui-form-item labelWidth="240" label="2、承诺到访时间" labelSize='26' prop="promised_visit_time" background='#434544' labelColor='#fff' :bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-input :borderBottom="false" :padding="[0]" placeholder="填写承诺到访时间" v-model="formData.promised_visit_time" backgroundColor="#434544" size="26" color="#fff" ></fui-input>
@ -223,7 +223,7 @@
</fui-radio-group>
</view>
</fui-form-item>
<!-- 沟通备注 -->
<fui-form-item label="沟通备注" labelSize='26' prop="communication" background='#434544' labelColor='#fff' :bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
@ -255,7 +255,7 @@
<fui-textarea v-model="formData.first_visit_status" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :textareaBorder="false" :isCounter="true" :maxlength="500" :minHeight="120" :isAutoHeight="true" :borderTop="false"></fui-textarea>
</view>
</fui-form-item>
<!-- 二访时间 -->
<fui-form-item label="二访时间" labelSize='26' prop="second_visit_time" background='#434544' labelColor='#fff' :bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;" @click="openDate('second_visit_time')">
@ -268,13 +268,13 @@
<fui-textarea v-model="formData.second_visit_status" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :textareaBorder="false" :isCounter="true" :maxlength="500" :minHeight="120" :isAutoHeight="true" :borderTop="false"></fui-textarea>
</view>
</fui-form-item>
<fui-form-item label="追单标注" labelSize='26' prop="chasing_orders" background='#434544' labelColor='#fff' :bottomBorder='false'>
<view class="textarea-container">
<fui-textarea v-model="formData.chasing_orders" placeholder="点击填写" backgroundColor="#434544" size="26" color="#fff" :textareaBorder="false" :isCounter="true" :maxlength="500" :minHeight="120" :isAutoHeight="true" :borderTop="false"></fui-textarea>
</view>
</fui-form-item>
<fui-form-item label="是否报名" labelSize='26' prop="is_bm" background='#434544' labelColor='#fff' :bottomBorder='false'>
<view class="input-title" style="margin-right:14rpx;">
<fui-radio-group name="radio" v-model="formData.is_bm" :disabled="true">
@ -295,7 +295,7 @@
</fui-radio-group>
</view>
</fui-form-item>
<!-- 面咨备注 -->
<fui-form-item label="面咨备注" labelSize='26' prop="consultation_remark" background='#434544' labelColor='#fff' :bottomBorder='false'>
<view class="textarea-container">
@ -313,10 +313,10 @@
<!-- 选择器日期选择等控件保留原有 -->
<fui-date-picker :show="date_picker_show" type="5" @change="change_date" @cancel="cancel_date" :value="default_date_value"></fui-date-picker>
<!-- 日期时间选择器 -->
<fui-date-picker :show="datetime_picker_show" type="5" @change="change_datetime" @cancel="cancel_datetime" :value="default_datetime_value"></fui-date-picker>
<fui-picker :linkage='picker_linkage' :options="picker_options" :layer="1" :show="picker_show" @change="changeCicker" @cancel="cancelCicker"></fui-picker>
<!-- 快速填写弹窗 -->
@ -333,8 +333,8 @@
<text>请粘贴包含客户信息的文本支持格式</text>
<text>姓名张三电话13800138000校区测试校区</text>
</view>
<textarea
class="quick-fill-textarea"
<textarea
class="quick-fill-textarea"
placeholder="请粘贴客户信息文本..."
v-model="quickFillText"
:maxlength="1000"
@ -362,11 +362,11 @@
is_submit: true, //()|true=,false=
resource_sharing_id: '', //resource_sharing_id(id)
//
showQuickFill: false, //
quickFillText: '', //
//
formData: {
//
@ -489,7 +489,7 @@
data_picker_input_name: '', //input_name
date_picker_show: false, //
default_date_value: '', //
//
datetime_picker_input_name: '', //input_name
datetime_picker_show: false, //
@ -497,7 +497,7 @@
//
//
clientUserList: [], //
showDuplicateCheck: false, //
@ -520,14 +520,14 @@
},
onLoad(options) {
console.log('onLoad - 接收到参数:', options);
//
if (!options) {
console.error('onLoad - 未接收到任何参数');
this.showParameterError();
return;
}
// resource_sharing_id
const resourceSharingId = options.resource_sharing_id || options.id || options.resourceSharingId;
if (!resourceSharingId) {
@ -536,7 +536,7 @@
this.showParameterError();
return;
}
this.resource_sharing_id = String(resourceSharingId);
console.log('onLoad - 成功设置 resource_sharing_id:', this.resource_sharing_id);
},
@ -556,39 +556,39 @@
uni.navigateBack();
}, 2000);
},
//
async init() {
try {
console.log('init - 开始初始化流程');
if (!this.resource_sharing_id) {
console.error('init - resource_sharing_id 为空,无法初始化');
this.showParameterError();
return;
}
uni.showLoading({
title: '加载中...',
mask: true
});
console.log('init - 开始加载字典数据');
//
await this.getBatchDictData();
console.log('init - 字典数据加载完成');
//
console.log('init - 开始加载校区列表');
await this.get_campus_list();
console.log('init - 校区列表加载完成');
//
console.log('init - 开始获取客户详情');
await this.getInfo();
console.log('init - 客户详情获取完成');
} catch (error) {
console.error('初始化失败:', error);
uni.showToast({
@ -599,7 +599,7 @@
uni.hideLoading();
}
},
//
async getBatchDictData() {
const dictMapping = {
@ -613,7 +613,7 @@
'distance': 'distance',
'emotional_stickiness_score': 'emotional_stickiness_score'
};
try {
const batchResult = await apiRoute.common_getBatchDict(Object.keys(dictMapping));
if (batchResult?.code === 1 && batchResult.data) {
@ -627,11 +627,11 @@
} catch (error) {
console.error('批量字典接口失败:', error);
}
// 退
const priorityKeys = ['source_channel', 'source'];
const otherKeys = ['purchasing_power', 'initial_intent', 'cognitive_idea', 'status', 'decision_maker', 'distance', 'emotional_stickiness_score'];
try {
await Promise.all(priorityKeys.map(key => this.getDict(key)));
setTimeout(() => {
@ -645,18 +645,18 @@
//
processDictData(localKey, dictData) {
if (!Array.isArray(dictData) || !dictData.length) return;
let options = dictData.map(item => ({ text: item.name || '', value: item.value || '' }));
if (localKey === 'source_channel') {
options.unshift({ text: '线下', value: '0' });
}
this.picker_config[localKey] = this.picker_config[localKey] || { text: '点击选择' };
this.picker_config[localKey].options = options;
},
async get_campus_list(){
let res = await apiRoute.common_getCampusesList({})
if (res.code != 1) {
uni.showToast({
@ -665,10 +665,10 @@
})
return
}
this.campus_list = res.data
let arr = []
this.campus_list.forEach((v,k)=>{
arr.push({
@ -676,29 +676,25 @@
value: v.id,
})
})
this.picker_config['campus'].options = arr
},
//-()
async getInfo() {
try {
console.log('getInfo - 开始获取客户详情, resource_sharing_id:', this.resource_sharing_id);
if (!this.resource_sharing_id) {
console.error('getInfo - resource_sharing_id 为空,无法获取客户详情');
return;
}
let params = {
resource_sharing_id: this.resource_sharing_id
};
console.log('getInfo - 发起请求:', params);
let res = await apiRoute.xs_resourceSharingInfo(params); //-()
console.log('getInfo - 请求响应:', res);
if (res.code != 1) {
console.error('getInfo - 请求失败:', res.msg);
uni.showToast({
@ -710,8 +706,6 @@
let customerResource = res.data.customerResource || {}; //
let sixSpeed = res.data.customerResource.sixSpeed || {}; //
console.log('getInfo - 客户资源详情:', customerResource);
console.log('getInfo - 六要素详情:', sixSpeed);
//
this._resourceDetail = res.data;
@ -754,39 +748,40 @@
call_intent: sixSpeed.call_intent || '2', //
emotional_stickiness_score: sixSpeed.emotional_stickiness_score || '', //
};
console.log('getInfo - 表单数据设置完成:', this.formData);
console.log('getInfo - 表单数据设置完成:',sixSpeed.promised_visit_time);
//
if (sixSpeed.promised_visit_time) {
// if (sixSpeed.promised_visit_time) {
// console.log('getInfo - ',sixSpeed.promised_visit_time.includes(' '));
//
if (sixSpeed.promised_visit_time.includes(' ')) {
this.formData.promised_visit_time = sixSpeed.promised_visit_time;
} else {
this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');
}
}
// if (sixSpeed.promised_visit_time.includes(' ')) {
// this.formData.promised_visit_time = sixSpeed.promised_visit_time;
// } else {
// this.formData.promised_visit_time = this.$util.formatToDateTime(sixSpeed.promised_visit_time, 'Y-m-d');
// }
// }
//
if (sixSpeed.preferred_class_time) {
this.formData.optional_class_time = sixSpeed.preferred_class_time;
}
if (sixSpeed.first_visit_time) {
this.formData.first_visit_time = this.$util.formatToDateTime(sixSpeed.first_visit_time, 'Y-m-d');
}
if (sixSpeed.second_visit_time) {
this.formData.second_visit_time = this.$util.formatToDateTime(sixSpeed.second_visit_time, 'Y-m-d');
}
console.log('getInfo - 日期格式化完成');
//
console.log('getInfo - 开始设置选择器文本回显');
await this.setPickerText();
console.log('getInfo - 选择器文本回显完成');
} catch (error) {
console.error('获取客户详情失败:', error);
uni.showToast({
@ -800,7 +795,7 @@
async setPickerText() {
try {
const { customerResource = {}, sixSpeed = {} } = await this.getResourceDetail() || {};
//
this.setPickerTextByValue('source_channel', this.formData.source_channel, customerResource.source_channel_name);
this.setPickerTextByValue('source', this.formData.source, customerResource.source_name);
@ -810,14 +805,14 @@
this.setPickerTextByValue('decision_maker', this.formData.decision_maker, customerResource.decision_maker_name);
this.setPickerTextByValue('campus', this.formData.campus, customerResource.campus_name);
this.setPickerTextByValue('customer_type', this.formData.customer_type, customerResource.customer_type_name);
//
this.setPickerTextByValue('purchasing_power', this.formData.purchasing_power, sixSpeed.purchase_power_name);
this.setPickerTextByValue('cognitive_idea', this.formData.cognitive_idea, sixSpeed.concept_awareness_name);
this.setPickerTextByValue('distance', this.formData.distance, sixSpeed.distance_name);
this.setPickerTextByValue('emotional_stickiness_score', this.formData.emotional_stickiness_score, sixSpeed.emotional_stickiness_score_name);
// call_intent
console.log('选择器文本回显完成');
} catch (error) {
console.error('设置选择器文本回显失败:', error);
@ -832,12 +827,12 @@
this.picker_config[pickerName].text = '点击选择';
return;
}
//
if (!this._valueTextMapping) {
this._valueTextMapping = {};
}
//
const cacheKey = `${pickerName}_${value}`;
if (this._valueTextMapping[cacheKey]) {
@ -845,16 +840,16 @@
this.picker_config[pickerName].text = this._valueTextMapping[cacheKey];
return;
}
// picker_config[pickerName]
if (!this.picker_config[pickerName]) {
this.picker_config[pickerName] = { options: [] };
}
//
const options = this.picker_config[pickerName].options || [];
const option = options.find(opt => String(opt.value) === String(value));
let textValue;
if (option) {
textValue = option.text;
@ -864,7 +859,7 @@
} else {
textValue = '点击选择';
}
//
this._valueTextMapping[cacheKey] = textValue;
this.picker_config[pickerName].text = textValue;
@ -875,11 +870,11 @@
if (this._resourceDetail) {
return this._resourceDetail
}
let params = {
resource_sharing_id: this.resource_sharing_id
}
let res = await apiRoute.xs_resourceSharingInfo(params)
if (res.code == 1) {
this._resourceDetail = res.data
@ -902,14 +897,14 @@
customer_type: 'customer_type',
emotional_stickiness_score: 'emotional_stickiness_score'
};
const key = keyMap[inputName];
if (!key) return;
try {
const dictionary = await this.$util.getDict(key);
if (!dictionary?.length) return;
this.processDictData(inputName, dictionary);
} catch (error) {
console.error(`获取字典 ${inputName} 失败:`, error);
@ -1000,7 +995,7 @@
this.showQuickFill = true
this.quickFillText = ''
},
//
parseQuickFillText() {
if (!this.quickFillText.trim()) {
@ -1010,7 +1005,7 @@
})
return
}
try {
//
const fieldRules = [
@ -1020,11 +1015,11 @@
{ key: 'age', patterns: ['年龄'] },
{ key: 'birthday', patterns: ['生日', '出生日期', '生日日期'] }
]
//
const parsedData = {}
const text = this.quickFillText.trim()
//
fieldRules.forEach(rule => {
rule.patterns.forEach(pattern => {
@ -1036,9 +1031,9 @@
}
})
})
console.log('解析结果:', parsedData)
//
let fillCount = 0
if (parsedData.name) {
@ -1065,7 +1060,7 @@
this.formData.birthday = parsedData.birthday
fillCount++
}
if (fillCount > 0) {
uni.showToast({
title: `成功填写${fillCount}个字段`,
@ -1078,7 +1073,7 @@
icon: 'none'
})
}
} catch (error) {
console.error('解析失败:', error)
uni.showToast({
@ -1087,14 +1082,14 @@
})
}
},
//
findAndSetCampus(campusText) {
const campusOptions = this.picker_config.campus?.options || []
const matchedCampus = campusOptions.find(option =>
const matchedCampus = campusOptions.find(option =>
option.text.includes(campusText) || campusText.includes(option.text)
)
if (matchedCampus) {
this.formData.campus = matchedCampus.value
this.picker_config.campus.text = matchedCampus.text
@ -1106,7 +1101,7 @@
//
openCicker(inputName, linkage = true) {
const options = this.picker_config[inputName]?.options || [];
if (!options.length) {
uni.showToast({ title: '暂无选项', icon: 'none' });
return;
@ -1115,7 +1110,7 @@
this.picker_input_name = inputName;
this.picker_options = options;
this.picker_linkage = linkage;
this.$nextTick(() => {
this.picker_show = true;
});
@ -1124,7 +1119,7 @@
//
changeCicker(e) {
const inputName = this.picker_input_name;
this.updateFormField(inputName, e.value, e.text);
this.handleSpecialSelectionLogic(inputName, e.value, e.text);
this.cancelCicker();
@ -1221,7 +1216,7 @@
change_date(e) {
const val = e.result || '';
const inputName = this.data_picker_input_name;
this.formData[inputName] = val;
this.cancel_date();
},
@ -1234,9 +1229,9 @@
//
change_datetime(e) {
console.log('日期时间选择器返回数据:', e);
let val = e.result || e.value || '';
//
if (val && typeof val === 'string') {
//
@ -1251,7 +1246,7 @@
}
}
}
const inputName = this.datetime_picker_input_name;
this.formData[inputName] = val;
this.cancel_datetime();
@ -1313,13 +1308,13 @@
//
async submit() {
const data = { ...this.formData };
//
if (!await this.validatorForm(data)) return;
//
if (!this.canSubmit()) return;
this.is_submit = false;
try {
const res = await apiRoute.xs_editCustomerResources(data);
@ -1340,4 +1335,4 @@
<style lang="less" scoped>
@import './edit_clues.less';
</style>
</style>

Loading…
Cancel
Save