Browse Source
feat(订单): 添加订单取消功能并优化任务模块
- 在订单模块中新增 `orderCancel` API，用于处理订单取消请求 - 优化任务模块，包括任务列表、任务详情和任务上传功能 - 修复任务详情页面中的状态显示逻辑 - 重构任务上传页面的表单验证和文件上传功能master
11 changed files with 486 additions and 456 deletions
Unified View
Diff Options
-
+12 -0api/order/order.js
-
+38 -3api/order/task.js
-
+13 -21pages/companionPetList/companionPetInfo.vue
-
+1 -1pages/personalCenter/index.vue
-
+7 -3pages_order/components/order/CancelOrderPopup.vue
-
+2 -2pages_order/order/orderList.vue
-
+5 -11pages_order/order/orderReview.vue
-
+77 -0pages_order/task/AppletTask.java
-
+60 -93pages_order/task/taskDetail.vue
-
+46 -193pages_order/task/taskList.vue
-
+225 -129pages_order/task/taskUpload.vue
+ 12
- 0
api/order/order.js
View File
+ 38
- 3
api/order/task.js
View File
| @ -1,14 +1,49 @@ | |||||
| import upload from '@/utils/upload' | import upload from '@/utils/upload' | ||||
| import request from '@/utils/request' | import request from '@/utils/request' | ||||
| // 查询伴宠师列表 | |||||
| export function getTeacherList(params) { | |||||
| // 查询任务列表 | |||||
| export function getTaskList(params) { | |||||
| return request({ | return request({ | ||||
| url: '/applet/mall/teacher/getTeacherList', | |||||
| url: '/applet/mall/task/list', | |||||
| headers: { | headers: { | ||||
| "isToken": true | "isToken": true | ||||
| }, | }, | ||||
| method: 'get', | method: 'get', | ||||
| params | params | ||||
| }) | }) | ||||
| } | |||||
| // 查询任务详情 | |||||
| export function getTaskDetail(params) { | |||||
| return request({ | |||||
| url: '/applet/mall/task/taskDetail/' + params, | |||||
| headers: { | |||||
| "isToken": true | |||||
| }, | |||||
| method: 'get', | |||||
| }) | |||||
| } | |||||
| // 接受任务 | |||||
| export function acceptTask(params) { | |||||
| return request({ | |||||
| url: '/applet/mall/task/acceptTask', | |||||
| headers: { | |||||
| "isToken": true | |||||
| }, | |||||
| method: 'get', | |||||
| params | |||||
| }) | |||||
| } | |||||
| // 提交任务 | |||||
| export function submitTask(data) { | |||||
| return request({ | |||||
| url: '/applet/mall/task/submitTask', | |||||
| headers: { | |||||
| "isToken": true | |||||
| }, | |||||
| method: 'post', | |||||
| data | |||||
| }) | |||||
| } | } | ||||
+ 13
- 21
pages/companionPetList/companionPetInfo.vue
View File
+ 1
- 1
pages/personalCenter/index.vue
View File
+ 7
- 3
pages_order/components/order/CancelOrderPopup.vue
View File
+ 2
- 2
pages_order/order/orderList.vue
View File
+ 5
- 11
pages_order/order/orderReview.vue
View File
+ 77
- 0
pages_order/task/AppletTask.java
View File
| @ -0,0 +1,77 @@ | |||||
| package com.ruoyi.model.domain; | |||||
| import java.math.BigDecimal; | |||||
| import java.time.LocalDateTime; | |||||
| import com.fasterxml.jackson.annotation.JsonFormat; | |||||
| import com.ruoyi.common.annotation.Excel; | |||||
| import com.ruoyi.common.core.domain.BaseAudit; | |||||
| import lombok.Data; | |||||
| /** | |||||
| * 任务中心对象 applet_task | |||||
| * | |||||
| * @author daixiande | |||||
| */ | |||||
| @Data | |||||
| public class AppletTask extends BaseAudit { | |||||
| private static final long serialVersionUID = 1L; | |||||
| /** 标识 */ | |||||
| private Long id; | |||||
| /** 当前状态0待接受1以接受 */ | |||||
| @Excel(name = "当前状态0待接受1以接受") | |||||
| private Integer status; | |||||
| /** 下单用户标识 */ | |||||
| @Excel(name = "下单用户标识") | |||||
| private Long memberId; | |||||
| /** 任务类型名称 */ | |||||
| @Excel(name = "任务类型名称") | |||||
| private String taskName; | |||||
| /** 任务小图 */ | |||||
| @Excel(name = "任务小图") | |||||
| private String taskIcon; | |||||
| /** 任务报酬 */ | |||||
| @Excel(name = "任务报酬") | |||||
| private BigDecimal taskMoney; | |||||
| /** 图片 */ | |||||
| @Excel(name = "图片") | |||||
| private String image; | |||||
| /** 标题 */ | |||||
| @Excel(name = "标题") | |||||
| private String title; | |||||
| /** 主题 */ | |||||
| @Excel(name = "主题") | |||||
| private String theme; | |||||
| /** 任务截至时间 */ | |||||
| @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |||||
| @Excel(name = "任务截至时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") | |||||
| private LocalDateTime taskEndTime; | |||||
| /** 任务进度 */ | |||||
| @Excel(name = "任务进度") | |||||
| private Integer taskState; | |||||
| /** 审核状态 */ | |||||
| @Excel(name = "审核状态") | |||||
| private Integer examineState; | |||||
| /** 审核说明 */ | |||||
| @Excel(name = "审核说明") | |||||
| private String examineText; | |||||
| /** 审核图片 */ | |||||
| @Excel(name = "审核图片") | |||||
| private String examineImage; | |||||
| /** DEL_FLAG */ | |||||
| private Long delFlag; | |||||
| } | |||||