up

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<T> {
+    private T data;
+    private int code;
+    private String msg;
+
+}

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<TaoGoods> goodsList(TaoGoodsBo bo, PageQuery pageQuery) {
+    public ApiResult<PageResult<TaoGoods>> goodsList(TaoGoodsBo bo, PageQuery pageQuery) {
         PageResult<TaoGoods> 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<PageResult<TaoGoods>> r = new ApiResult<>();
+          r.setCode(result.getCode());
+          r.setMsg(result.getMsg());
+          r.setData(result);
+//        return result;
+        return r;
     }
 }

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<any> {
+  return request({
+    url: "/api/tao-api/goods/list",
+    method: "get",
+    params: queryParams,
+  });
+}

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;
+}

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<MenuQuery>({});
+const queryParams = reactive<OrderQuery>({});
-const menuList = ref<MenuVO[]>([]);
+const menuList = ref<any>();
 
 const menuOptions = ref<OptionType[]>([]);
 
@@ -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(() => {
         <el-table-column label="菜单名称" min-width="200">
           <template #default="scope">
             <svg-icon :icon-class="scope.row.icon" />
-            {{ scope.row.name }}
+            {{ scope.row.id }}
           </template>
         </el-table-column>