对接服务订单接口

pages/personalCenter/servicesOrders/api/index.ts

@@ -24,6 +24,7 @@ export interface OrderList {
   lon: number;
   orderAmt: number;
   orderName: string;
+  orderStatus: number,
   orderNo: string;
   province: string;
   startTime: string;
@@ -31,20 +32,22 @@ export interface OrderList {
 }
 
 
-export interface ListStatusResp {
-  status: string;
-  code: number;
-  nextCode: number;
+export interface GetServiceOrderStatusResp {
+  id: number;
+  orderStatus: number;
+  userPort: string;
+  flyerPort: string;
+  managePort: string;
 }
 
 export default {
   //查询服务订单列表
   queryOrderTaskList(params: QueryOrderTaskListParams, options: any): Promise<Response<QueryOrderTaskListResp>> {
-    return request('/pms/serviceOrderTask/queryOrderTaskList', 'post', params, options)
+    return request('/oms/serviceOrderTask/queryOrderTaskList', 'post', params, options)
   },
 
   //订单状态-字典
-  listStatus(): Promise<Response<ListStatusResp[]>> {
-    return request('/oms/mallorder/listStatus', 'get');
+  getServiceOrderStatus(): Promise<Response<GetServiceOrderStatusResp[]>> {
+    return request('/oms/serviceOrderTask/getServiceOrderStatus', 'POST');
   }
 }
\ No newline at end of file

pages/personalCenter/servicesOrders/index.page.tsx

@@ -16,8 +16,9 @@ import errImg from "~/assets/errImg";
 import Right from "~/components/contentBox/right";
 import LayoutView from "~/components/layout";
 import Sider from "../components/sider";
-import api, { OrderList, QueryOrderTaskListResp } from "./api";
+import api, { OrderList, GetServiceOrderStatusResp } from "./api";
 import styles from "./index.module.scss";
+import Moment from 'moment';
 
 const items: TabsProps["items"] = [
   {
@@ -25,19 +26,19 @@ const items: TabsProps["items"] = [
     label: `全部`,
   },
   {
-    key: "0",
+    key: "200",
     label: `待付款`,
   },
   {
-    key: "1",
+    key: "575",
     label: `待验收`,
   },
   {
-    key: "2",
+    key: "700",
     label: `已完成`,
   },
   {
-    key: "3",
+    key: "900",
     label: `已取消`,
   },
 ];
@@ -54,12 +55,12 @@ export default function ServicesOrder() {
   const [orderList, setOrderList] = useState<OrderList[]>([]);
   const [loading, setLoading] = useState(false);
   const [orderNo, setOrderNo] = useState<string | undefined>();
-  const [tranStatusMap, setTranStatusMap] = useState<QueryOrderTaskListResp[]>([]); //订单状态字典
+  const [tranStatusMap, setTranStatusMap] = useState<GetServiceOrderStatusResp[]>([]); //订单状态字典
 
   //获取订单状态字典
   useEffect(() => {
-    api.listStatus().then((res) => {
-      // setTranStatusMap(res.result || []);
+    api.getServiceOrderStatus().then((res) => {
+      setTranStatusMap(res.result || []);
     });
   }, []);
 
@@ -142,14 +143,15 @@ export default function ServicesOrder() {
                       }}
                     >
                       <div className={styles.font2}>
-                        {item.startTime} - {item.endTime}
+                        {Moment(item.startTime).format("YYYY/MM/DD")} -{" "}
+                        {Moment(item.endTime).format("YYYY/MM/DD")}
                       </div>
                       <div className={styles.font3}>
-                        {/*  {
+                        {
                           tranStatusMap.find(
-                            (status) => status.code === item.statusCode
-                          )?.status
-                        } */}
+                            (status) => status.orderStatus === item.orderStatus
+                          )?.userPort
+                        }
                       </div>
                     </Row>
                     <Row
@@ -199,10 +201,12 @@ export default function ServicesOrder() {
                             marginRight: 24,
                           }}
                         >
-                          <Button className={styles.btn1}>取消订单</Button>
+                          <Space direction="vertical" size={0} align="center">
                             <Button className={styles.btn2} type="primary">
-                            查看合同
+                              预付款
                             </Button>
+                            <Button type="text">取消订单</Button>
+                          </Space>
                         </Space>
                       </Col>
                     </Row>