From 61d98f78b0bbe2d716b242014c491c30b1032215 Mon Sep 17 00:00:00 2001
From: zc <2064281269@qq.com>
Date: Tue, 11 Nov 2025 10:18:48 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E5=85=B6=E4=BB=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/shop.ts           | 8 ++++++++
 src/utils/getUserInfo.ts  | 2 +-
 src/views/order/index.vue | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/api/shop.ts b/src/api/shop.ts
index 758064c..457f784 100644
--- a/src/api/shop.ts
+++ b/src/api/shop.ts
@@ -9,6 +9,14 @@ const shop = {
   getWxPayParams: ['/order/getWxPayParams'], // 下单获取微信支付参数接口
   // 订单
   orderList: ['/order/list'], // 订单列表
+  closeOrder: ['/order/close'], // 关闭订单接口：参数：tradeOrderId
+  deleteOrder: ['/order/delete'], // 删除订单接口：参数：buyerId、trackNumber(发货单号)、tradeOrderId(订单编号)（如果订单还没有发货，就传订单编号 ，如果订单已经发货了，就传 物流单号）
+  delivered: ['/order/delivered'], // 妥投(用户签收)：参数：trackNumber
+  // 评论
+  addReview: ['/comment/add'], // 添加评论接口：参数见接口文档
+  deleteReview: ['/comment/delete'], // 删除评论接口：参数：commentId
+  // 物流地址查询
+  queryLogisticsAddress: ['/logistics/query'], // 物流地址查询接口：参数：trackNumber、buyerId
 }
 
 export default shop
diff --git a/src/utils/getUserInfo.ts b/src/utils/getUserInfo.ts
index d7c94f0..447fdbf 100644
--- a/src/utils/getUserInfo.ts
+++ b/src/utils/getUserInfo.ts
@@ -19,7 +19,7 @@ export default class GetUserInfo {
     } */
     let returnData = ''
     const { returnData: returnDataStr } = getData.getUrlParams(location.search) || {}
-    returnData = JSON.parse(Base64.decode(decodeURIComponent(returnDataStr)))
+    if (returnDataStr) returnData = JSON.parse(Base64.decode(decodeURIComponent(returnDataStr)))
     const env = (GetUserInfo.env = GetUserInfo.envs[host.replace(/^([a-z]+).+/g, '$1')])
     const { envParams, extendParams } = (returnData as any) || {}
     GetUserInfo.logParams(env, returnData, envParams, extendParams)
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 683063a..f230c09 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -19,7 +19,7 @@
           </div>
           <!-- 商品信息 -->
           <div class="px-3 pt-3 flex" @click="goDetail(order.id)">
-            <img class="w-20 h-20 round-[0.08rem] bg-[#f5f5f5]" />
+            <img class="w-20 h-20 round-[0.08rem] bg-[#f5f5f5]" :src="order.productMainImageUrl" />
             <div class="flex flex-col justify-between flex-1 w-0 ml-3">
               <div>
                 <p class="product-name text-[.13rem]">{{ order.productName }}</p>
@@ -28,7 +28,7 @@
               <p class="text-[.13rem] text-right">
                 <span class="">共{{ order.num }}件商品</span>
                 <span class="ml-3"
-                  >实付款<i class="text-xs">¥</i><b class="text-base ml-1">{{ order.price }}</b></span
+                  >实付款<i class="text-xs">¥</i><b class="text-base ml-1">{{ order.promotionPrice }}</b></span
                 >
               </p>
             </div>
@@ -132,7 +132,7 @@ const handleGetList = () => {
   api.shop.orderList.post().then((res) => {
     orders.value = res.data.map((item) => ({
       id: item.id,
-      storeName: item.title,
+      ...item,
     }))
     console.warn('----- my data is res: ', res)
   })