订单

src/pages/shop/confirmOrder.vue

@@ -186,7 +186,7 @@ onShow(() => {
   if (outTradeNos.value) {
     // 查询订单状态决定是否支付
     getOrderDetail({ orderNumber: outTradeNos.value }).then((res) => {
-      switch (res.data.baseOrder.substatus) {
+      switch (res.data.baseOrder.subStatus) {
         case '1':
           xma.showToast({
             title: '支付失败',

src/pages/shop/paymentSuccessful.vue

@@ -31,26 +31,33 @@
 import Header from '@/pages/order/components/Header/index.vue';
 import { getOrderDetail, getShopDetail, getProdDetail } from '@/api/order';
 import QRCode from 'qrcode';
+const myOutTradeNos = ref('');
 /**
  * 获取订单详情
  */
 const orderDetail = ref();
 onLoad((options) => {
   const { outTradeNos } = options;
-  getOrderDetailFn('NEONO-2024080509591318964');
+  myOutTradeNos.value = outTradeNos;
+  getOrderDetailFn(outTradeNos);
 });
 function getOrderDetailFn(orderNumber) {
   getOrderDetail({ orderNumber }).then((res) => {
-    orderDetail.value = res.data;
-    const outTradeNo = res.data.orderNumber;
+    orderDetail.value = res.data.baseOrder;
+    orderDetail.value.orderItems = res.data.orderItems;
+    orderDetail.value.orderStore = res.data.orderStore;
+    const outTradeNo = res.data.baseOrder.orderNumber;
     const indexOfDash = outTradeNo.indexOf('-');
     if (indexOfDash !== -1) {
-      res.data.orderNumber = outTradeNo.substring(indexOfDash + 1);
+      res.data.baseOrder.orderNumber = outTradeNo.substring(indexOfDash + 1);
     } else {
       console.log(`订单编号 ${outTradeNo} 中没有找到 "-" 符号。`);
     }
-    if (orderDetail.value.status === '2' || orderDetail.value.status === '3') {
-      codeDetail(orderDetail.value.orderNumber);
+    if (
+      orderDetail.value.orderStore.status === '2' ||
+      orderDetail.value.orderStore.status === '3'
+    ) {
+      codeDetail(orderNumber);
     }
     getProductDetail(orderDetail.value.orderItems[0].prodId);
     getShopMailDetail(orderDetail.value.shopId);