From 62446e075be54ca7616b60c0eaad62eba90c464e Mon Sep 17 00:00:00 2001
From: zc <2064281269@qq.com>
Date: Sun, 26 Oct 2025 19:25:21 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=88=86=E7=B1=BB=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 miniprogram/api/index/index.ts             | 12 +++++++++++-
 miniprogram/pages/category/index.ts        |  4 ----
 miniprogram/pages/home/index.wxml          |  2 +-
 miniprogram/pages/shopping-cart/index.ts   | 20 ++++++++++++++++++++
 miniprogram/pages/shopping-cart/index.wxml |  5 +++--
 5 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/miniprogram/api/index/index.ts b/miniprogram/api/index/index.ts
index 4c91a14..1b95b7b 100644
--- a/miniprogram/api/index/index.ts
+++ b/miniprogram/api/index/index.ts
@@ -10,13 +10,23 @@ export const apiGetHome = (data: any) => {
   });
 };
 
-// 获取首页数据
+// 获取商品列表数据
 export const apiGetCommodityList = (data: any) => {
   return httpRequest.post<any>(`${baseUrl}/api-interface/app/index/page/list`, {
     ...data,
   });
 };
 
+// 获取购物车列表数据
+export const apiGetCartList = (data: any) => {
+  return httpRequest.post<any>(
+    `${baseUrl}/api-interface/app/shipping/cart/list`,
+    {
+      ...data,
+    }
+  );
+};
+
 // 获取首页数据
 export const apiGetAppCategoryList = () => {
   return httpRequest.post<any>(
diff --git a/miniprogram/pages/category/index.ts b/miniprogram/pages/category/index.ts
index 29a365f..c1eea28 100644
--- a/miniprogram/pages/category/index.ts
+++ b/miniprogram/pages/category/index.ts
@@ -183,10 +183,6 @@ Page({
     });
   },
   handleGetAppCategory() {
-    console.warn(
-      '----- my data is getGlobalData("categoryId"): ',
-      getGlobalData("categoryId")
-    );
     const initCategoryId = getGlobalData("categoryId");
     apiGetAppCategoryList().then((res: any) => {
       console.warn("----- my data is res2333: ", res);
diff --git a/miniprogram/pages/home/index.wxml b/miniprogram/pages/home/index.wxml
index fcd91ee..cde37fe 100644
--- a/miniprogram/pages/home/index.wxml
+++ b/miniprogram/pages/home/index.wxml
@@ -16,7 +16,7 @@
    </view>
   <!-- 分类图标区 -->
   <view class="category-grid home-page-block-gap">
-    <view class="category-item" wx:for="{{categories}}" wx:key="id" data-id="{{item.categoryId}}" bindtap="onGoCategory">
+    <view class="category-item" wx:for="{{categories}}" wx:key="id" data-id="{{item.id}}" bindtap="onGoCategory">
       <image class="category-icon" src="{{item.icon}}" />
       <text class="category-name">{{item.name}}</text>
     </view>
diff --git a/miniprogram/pages/shopping-cart/index.ts b/miniprogram/pages/shopping-cart/index.ts
index 82c5039..8c39682 100644
--- a/miniprogram/pages/shopping-cart/index.ts
+++ b/miniprogram/pages/shopping-cart/index.ts
@@ -1,3 +1,5 @@
+import { apiGetCartList } from "../../api/index/index";
+
 // pages/index/index.ts
 Page({
   data: {
@@ -62,4 +64,22 @@ Page({
     const data = this.data.commodities.filter((item) => item.id !== id);
     this.setData({ commodities: data });
   },
+  onShow() {
+    apiGetCartList({ buyerId: 2 }).then((res: any) => {
+      console.warn("----- my data is res2555: ", res);
+      this.setData({
+        commodities: res.data.rows.map((item: any) => ({
+          id: item.id,
+          name: item.productName,
+          icon: item.icon,
+          originalPrice: item.originalPrice,
+          price: item.singlePrice,
+          attribute: JSON.parse(item.skuInfo)
+            .map((item) => item.propertyValue)
+            .join("-"),
+          active: false,
+        })),
+      });
+    });
+  },
 });
diff --git a/miniprogram/pages/shopping-cart/index.wxml b/miniprogram/pages/shopping-cart/index.wxml
index cd17879..4012e4b 100644
--- a/miniprogram/pages/shopping-cart/index.wxml
+++ b/miniprogram/pages/shopping-cart/index.wxml
@@ -12,10 +12,11 @@
             </view>
             <view class="item__texts">
                 <view class="item__title">{{item.name}}</view>
-                <view class="item__attribute">我是属性</view>
+                <view class="item__attribute">{{item.attribute}}</view>
                 <view class="item__line">
                     <view class="line__price">
-                        <view class="line__price__actual">¥<text>20</text>.00</view>
+                        <!-- <view class="line__price__actual">¥<text>20</text>.00</view> -->
+                        <view class="line__price__actual">¥{{item.price}}</view>
                         <view class="line__price__origin">¥39.00</view>
                     </view>
                     <view class="line__num">