完成商城下单功能

src/views/booking/order/components/orderInfo.vue

@@ -149,7 +149,7 @@
 
 <script lang="ts" setup>
   import { ref, reactive, watch } from 'vue';
-  import { Form } from 'ant-design-vue';
+  import { Form, message } from "ant-design-vue";
   import { assignObject } from 'ele-admin-pro';
   import { Order } from '@/api/shop/order/model';
   import { ColumnItem } from 'ele-admin-pro/es/ele-pro-table/types';
@@ -158,6 +158,7 @@
     CloseOutlined,
     CoffeeOutlined
   } from '@ant-design/icons-vue';
+  import { pageOrderInfo } from '@/api/shop/orderInfo';
 
   const useForm = Form.useForm;
 
@@ -364,8 +365,12 @@
     (visible) => {
       if (visible) {
         if (props.data) {
-          loading.value = false;
+          loading.value = true;
           assignObject(form, props.data);
+          pageOrderInfo({ orderId: form.orderId }).then((res) => {
+            form.orderInfoList = res?.list;
+            loading.value = false;
+          });
           loadSteps(props.data);
         }
       } else {

src/views/booking/order/index.vue

@@ -221,6 +221,7 @@
   } from '@/api/booking/order';
   import type { Order, OrderParam } from '@/api/booking/order/model';
   import { formatNumber } from 'ele-admin-pro/es';
+  import { getMerchantId } from '@/utils/common';
 
   // 表格实例
   const tableRef = ref<InstanceType<typeof EleProTable> | null>(null);
@@ -248,6 +249,8 @@
       where.status = filters.status;
     }
     where.type = 1;
+    // where.sceneType = 'showOrderInfo';
+    where.merchantId = getMerchantId();
     return pageOrder({
       ...where,
       ...orders,