From 7aed9620499790bc3766315637ef62178065e001 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Fri, 16 May 2025 10:21:22 +0800
Subject: [PATCH] =?UTF-8?q?refactor(cart):=20=E4=BD=BF=E7=94=A8=20`cellId`?=
 =?UTF-8?q?=20=E6=9B=BF=E6=8D=A2=20`id`=20=E4=BD=9C=E4=B8=BA=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=94=AF=E4=B8=80=E6=A0=87=E8=AF=86=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

为了与后端数据结构保持一致，将商品唯一标识符从 `id` 改为 `cellId`。这涉及修改购物车相关函数和组件中的引用，确保代码逻辑正确。
---
 src/pages/product/ProductList.vue     | 16 ++++++++--------
 src/pages/product/components/cart.vue |  7 ++++---
 src/pinia/stores/cart.ts              |  6 +++---
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/pages/product/ProductList.vue b/src/pages/product/ProductList.vue
index b487f8c..ed1177d 100644
--- a/src/pages/product/ProductList.vue
+++ b/src/pages/product/ProductList.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { publicPath } from "@/common/utils/path"
 import { useCartStore } from "@/pinia/stores/cart"
-import { useProductStore } from "@/pinia/stores/product"
+import { Product, useProductStore } from "@/pinia/stores/product"
 import { throttle } from "lodash-es"
 import { storeToRefs } from "pinia"
 import VanPopup from "vant/es/popup"
@@ -86,16 +86,16 @@ function showProductDetail(productId: number) {
   showDetailPopup.value = true
 }
 
-function handleAddToCart(product: any) {
+function handleAddToCart(product: Product) {
   cartStore.addToCart(product)
 }
 
-function handleRemoveFromCart(product: any) {
-  cartStore.removeFromCart(product.id)
+function handleRemoveFromCart(product: Product) {
+  cartStore.removeFromCart(product.cellId)
 }
 
-function getCartItemCount(productId: number) {
-  const item = cartItems.value.find(item => item.product.id === productId)
+function getCartItemCount(cellId: number) {
+  const item = cartItems.value.find(item => item.product.cellId === cellId)
   return item ? item.quantity : 0
 }
 
@@ -171,9 +171,9 @@ watch(() => route.path, (newPath) => {
                   还剩{{ product.stock }}份
                 </span>
                 <div class="cart-actions">
-                  <van-button v-if="getCartItemCount(product.id)" size="mini" icon="minus"
+                  <van-button v-if="getCartItemCount(product.cellId)" size="mini" icon="minus"
                     @click.stop="handleRemoveFromCart(product)" />
-                  <span v-if="getCartItemCount(product.id)" class="cart-count">{{ getCartItemCount(product.id) }}</span>
+                  <span v-if="getCartItemCount(product.cellId)" class="cart-count">{{ getCartItemCount(product.cellId) }}</span>
                   <van-button size="mini" type="primary" class="add-cart-btn" icon="plus"
                     :disabled="product.stock === 0" @click.stop="handleAddToCart(product)" :style="{
                       opacity: product.stock === 0 ? 0.6 : 1,
diff --git a/src/pages/product/components/cart.vue b/src/pages/product/components/cart.vue
index 74efe69..9960e87 100644
--- a/src/pages/product/components/cart.vue
+++ b/src/pages/product/components/cart.vue
@@ -1,5 +1,6 @@
 <script setup lang="ts">
 import { useCartStore } from "@/pinia/stores/cart"
+import { Product } from "@/pinia/stores/product"
 import { storeToRefs } from "pinia"
 import { showConfirmDialog } from "vant"
 import { useRouter } from "vue-router"
@@ -15,12 +16,12 @@ const { cartItems, totalPrice, totalQuantity } = storeToRefs(cartStore)// 处理
 function handleClose() {
   emit("cartClose")
 }
-function handleAddToCart(product: any) {
+function handleAddToCart(product: Product) {
   cartStore.addToCart(product)
 }
 
-function handleRemoveFromCart(product: any) {
-  cartStore.removeFromCart(product.id)
+function handleRemoveFromCart(product: Product) {
+  cartStore.removeFromCart(product.cellId)
 }
 
 function handleClearCart() {
diff --git a/src/pinia/stores/cart.ts b/src/pinia/stores/cart.ts
index f69f2cd..d3a9654 100644
--- a/src/pinia/stores/cart.ts
+++ b/src/pinia/stores/cart.ts
@@ -10,7 +10,7 @@ export const useCartStore = defineStore('cart', () => {
     if (quantity > product.stock && product.stock !== -1) {
       return false;
     }
-    const existingItem = cartItems.value.find(item => item.product.id === product.id)
+    const existingItem = cartItems.value.find(item => item.product.cellId === product.cellId)
     if (existingItem) {
       if (existingItem.quantity + quantity > product.stock && product.stock !== -1) {
         return false;
@@ -23,8 +23,8 @@ export const useCartStore = defineStore('cart', () => {
   }
 
   // 移除商品
-  const removeFromCart = (productId: number, quantity: number = 1) => {
-    const index = cartItems.value.findIndex(item => item.product.id === productId)
+  const removeFromCart = (cellId: number, quantity: number = 1) => {
+    const index = cartItems.value.findIndex(item => item.product.cellId === cellId)
     if (index !== -1) {
       if (cartItems.value[index].quantity <= quantity) {
         cartItems.value.splice(index, 1)