diff --git a/admin/src/app/api/pay.ts b/admin/src/app/api/pay.ts index 18177c47..01039dcf 100644 --- a/admin/src/app/api/pay.ts +++ b/admin/src/app/api/pay.ts @@ -71,6 +71,7 @@ export function getRefundTransfer(params: Record) { }) } + /** * 全部支付方式 */ @@ -107,3 +108,16 @@ export function getFriendsPay( showErrorMessage: false, }) } + + +export function orderPay(params: Record) { + return request.post(`pay/order_pay`, params, { + showSuccessMessage: true, + }) +} + + +export function checkPaymentStatus(params: Record) { + return request.post(`pay/check_payment_status`, params) +} + diff --git a/admin/src/app/api/student.ts b/admin/src/app/api/student.ts index bbc567d5..9fa899dc 100644 --- a/admin/src/app/api/student.ts +++ b/admin/src/app/api/student.ts @@ -2,6 +2,8 @@ import request from '@/utils/request' + + // USER_CODE_BEGIN -- student /** * 获取学员列表 @@ -49,12 +51,17 @@ export function deleteStudent(id: number) { return request.delete(`student/student/${id}`, { showErrorMessage: true, showSuccessMessage: true }) } -export function getWithCampusList(params: Record){ +export function getWithCustomerResourcesList(params: Record){ + return request.get('student/customer_resources_all', {params}) +}export function getWithCampusList(params: Record){ return request.get('student/campus_all', {params}) }export function getWithClassGradeList(params: Record){ return request.get('student/class_grade_all', {params}) -}export function getWithMemberList(params: Record){ - return request.get('student/member_all', {params}) } // USER_CODE_END -- student + + +export function getMemberLabelAll() { + return request.get(`student/label_all`) +} \ No newline at end of file diff --git a/admin/src/app/api/student_label.ts b/admin/src/app/api/student_label.ts new file mode 100644 index 00000000..dd5d287d --- /dev/null +++ b/admin/src/app/api/student_label.ts @@ -0,0 +1,52 @@ +import request from '@/utils/request' + +// USER_CODE_BEGIN -- student_label +/** + * 获取学员标签列表 + * @param params + * @returns + */ +export function getStudentLabelList(params: Record) { + return request.get(`student_label/student_label`, {params}) +} + +/** + * 获取学员标签详情 + * @param label_id 学员标签label_id + * @returns + */ +export function getStudentLabelInfo(label_id: number) { + return request.get(`student_label/student_label/${label_id}`); +} + +/** + * 添加学员标签 + * @param params + * @returns + */ +export function addStudentLabel(params: Record) { + return request.post('student_label/student_label', params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 编辑学员标签 + * @param label_id + * @param params + * @returns + */ +export function editStudentLabel(params: Record) { + return request.put(`student_label/student_label/${params.label_id}`, params, { showErrorMessage: true, showSuccessMessage: true }) +} + +/** + * 删除学员标签 + * @param label_id + * @returns + */ +export function deleteStudentLabel(label_id: number) { + return request.delete(`student_label/student_label/${label_id}`, { showErrorMessage: true, showSuccessMessage: true }) +} + + + +// USER_CODE_END -- student_label diff --git a/admin/src/app/lang/zh-cn/student.student.json b/admin/src/app/lang/zh-cn/student.student.json index f59a612e..c1b9079f 100644 --- a/admin/src/app/lang/zh-cn/student.student.json +++ b/admin/src/app/lang/zh-cn/student.student.json @@ -1,10 +1,10 @@ { + "userId":"资源", + "userIdPlaceholder":"请输入资源", "campusId":"校区", "campusIdPlaceholder":"全部", "classId":"班级", "classIdPlaceholder":"请输入班级", - "userId":"用户", - "userIdPlaceholder":"请输入用户", "name":"学员姓名", "namePlaceholder":"请输入学员姓名", "gender":"性别", diff --git a/admin/src/app/lang/zh-cn/student_label.student_label.json b/admin/src/app/lang/zh-cn/student_label.student_label.json new file mode 100644 index 00000000..4ea6ddb4 --- /dev/null +++ b/admin/src/app/lang/zh-cn/student_label.student_label.json @@ -0,0 +1,13 @@ +{ + "labelName":"标签名称", + "labelNamePlaceholder":"请输入标签名称", + "memo":"备注", + "memoPlaceholder":"请输入备注", + "sort":"排序", + "sortPlaceholder":"请输入排序", + "addStudentLabel":"添加学员标签", + "updateStudentLabel":"编辑学员标签", + "studentLabelDeleteTips":"确定要删除该数据吗？", + "startDate":"请选择开始时间", + "endDate":"请选择结束时间" +} \ No newline at end of file diff --git a/admin/src/app/views/customer_resources/components/customer-resources-edit.vue b/admin/src/app/views/customer_resources/components/customer-resources-edit.vue index 6bccbc65..aff1ccf9 100644 --- a/admin/src/app/views/customer_resources/components/customer-resources-edit.vue +++ b/admin/src/app/views/customer_resources/components/customer-resources-edit.vue @@ -547,37 +547,7 @@ const formRules = computed(() => { message: t('cognitiveIdeaPlaceholder'), trigger: 'blur', }, - ], - optional_class_time: [ - { - required: true, - message: t('optionalClassTimePlaceholder'), - trigger: 'blur', - }, - ], - distance: [ - { required: true, message: t('distancePlaceholder'), trigger: 'blur' }, - ], - decision_maker: [ - { - required: true, - message: t('decisionMakerPlaceholder'), - trigger: 'blur', - }, - ], - initial_intent: [ - { - required: true, - message: t('initialIntentPlaceholder'), - trigger: 'blur', - }, - ], - campus: [ - { required: true, message: t('campusPlaceholder'), trigger: 'blur' }, - ], - status: [ - { required: true, message: t('statusPlaceholder'), trigger: 'blur' }, - ], + ] } }) diff --git a/admin/src/app/views/customer_resources/customer_resources.vue b/admin/src/app/views/customer_resources/customer_resources.vue index d0c68932..e7d7490b 100644 --- a/admin/src/app/views/customer_resources/customer_resources.vue +++ b/admin/src/app/views/customer_resources/customer_resources.vue @@ -138,11 +138,13 @@ -