diff --git a/tao-api/src/main/java/com/qihang/tao/common/ApiResult.java b/tao-api/src/main/java/com/qihang/tao/common/ApiResult.java new file mode 100644 index 00000000..4f7c5853 --- /dev/null +++ b/tao-api/src/main/java/com/qihang/tao/common/ApiResult.java @@ -0,0 +1,15 @@ +package com.qihang.tao.common; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.qihang.common.enums.HttpStatus; +import lombok.Data; + +import java.util.List; + +@Data +public class ApiResult { + private T data; + private int code; + private String msg; + +} diff --git a/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java b/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java index da6e3823..bae7df6d 100644 --- a/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java +++ b/tao-api/src/main/java/com/qihang/tao/controller/GoodsController.java @@ -2,6 +2,7 @@ package com.qihang.tao.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.qihang.tao.common.ApiResult; import com.qihang.tao.common.PageQuery; import com.qihang.tao.common.PageResult; import com.qihang.tao.domain.TaoGoods; @@ -20,7 +21,7 @@ import java.util.List; public class GoodsController { private final TaoGoodsService goodsService; @RequestMapping(value = "/list", method = RequestMethod.GET) - public PageResult goodsList(TaoGoodsBo bo, PageQuery pageQuery) { + public ApiResult> goodsList(TaoGoodsBo bo, PageQuery pageQuery) { PageResult result = goodsService.queryPageList(bo, pageQuery); // try { @@ -29,6 +30,11 @@ public class GoodsController { // }catch (Exception ex){ // return new ApiResult<>(EnumResultVo.Fail.getIndex(),EnumResultVo.Fail.getName()+ex.getMessage()); // } - return result; + ApiResult> r = new ApiResult<>(); + r.setCode(result.getCode()); + r.setMsg(result.getMsg()); + r.setData(result); +// return result; + return r; } } diff --git a/vue3/src/api/taoOrder/index.ts b/vue3/src/api/taoOrder/index.ts new file mode 100644 index 00000000..1866f87e --- /dev/null +++ b/vue3/src/api/taoOrder/index.ts @@ -0,0 +1,10 @@ +import request from "@/utils/request"; +import { AxiosPromise } from "axios"; +import { OrderQuery, OrderVo, ResultVo } from "./types"; +export function listOrder(queryParams: OrderQuery): AxiosPromise { + return request({ + url: "/api/tao-api/goods/list", + method: "get", + params: queryParams, + }); +} diff --git a/vue3/src/api/taoOrder/types.ts b/vue3/src/api/taoOrder/types.ts new file mode 100644 index 00000000..2f1b101d --- /dev/null +++ b/vue3/src/api/taoOrder/types.ts @@ -0,0 +1,16 @@ +export interface OrderQuery { + pageIndex: number; + pageSize: number; + orderNum?: string; +} + +export interface ResultVo { + code: number; + msg: string; + records?: OrderVo[]; + total?: number; +} + +export interface OrderVo { + id: number; +} diff --git a/vue3/src/views/tao/order/index.vue b/vue3/src/views/tao/order/index.vue index bca9f991..b69405b0 100644 --- a/vue3/src/views/tao/order/index.vue +++ b/vue3/src/views/tao/order/index.vue @@ -5,15 +5,15 @@ defineOptions({ inheritAttrs: false, }); -import { MenuQuery, MenuForm, MenuVO } from "@/api/menu/types"; +import { OrderQuery, OrderVo, ResultVo } from "@/api/taoOrder/types"; import { - listMenus, getMenuForm, getMenuOptions, addMenu, deleteMenu, updateMenu, } from "@/api/menu"; +import { listOrder } from "@/api/taoOrder"; import { MenuTypeEnum } from "@/enums/MenuTypeEnum"; @@ -29,8 +29,8 @@ const dialog = reactive({ visible: false, }); -const queryParams = reactive({}); -const menuList = ref([]); +const queryParams = reactive({}); +const menuList = ref(); const menuOptions = ref([]); @@ -67,13 +67,15 @@ const menuCacheData = reactive({ function handleQuery() { // 重置父组件 loading.value = true; - listMenus(queryParams) + listOrder(queryParams) .then(({ data }) => { - menuList.value = data; + console.log('查询结果:',data) + menuList.value = data.records; }) .then(() => { loading.value = false; }); + } /** 重置查询 */ @@ -246,7 +248,7 @@ onMounted(() => {