From d641d7c493edd3705e8fad9c6476461e9bb1de8e Mon Sep 17 00:00:00 2001
From: mac <yiyezhiqiutel@163.com>
Date: Mon, 8 Jun 2026 15:55:24 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B8=85=E7=90=86=E6=AD=BB=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=20CartBar/CartPopup=20=E7=BB=84=E4=BB=B6=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=20cart.js=20=E4=B8=AD=20price=20=E5=86=97?=
 =?UTF-8?q?=E4=BD=99=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/CartBar.vue   | 25 -------------------
 components/CartPopup.vue | 63 ------------------------------------------------
 stores/cart.js           |  3 +--
 3 files changed, 1 insertion(+), 90 deletions(-)
 delete mode 100644 components/CartBar.vue
 delete mode 100644 components/CartPopup.vue

diff --git a/components/CartBar.vue b/components/CartBar.vue
deleted file mode 100644
index 4f95b05..0000000
--- a/components/CartBar.vue
+++ /dev/null
@@ -1,25 +0,0 @@
-<template>
-  <view class="cart-bar" @tap="$emit('open')">
-    <view class="cart-icon-wrap">
-      <text class="cart-icon">🍷</text>
-      <text v-if="count > 0" class="cart-badge">{{ count }}</text>
-    </view>
-    <text class="cart-text">{{ count > 0 ? count + '件 · 去呼唤调酒师' : '购物车空空' }}</text>
-  </view>
-</template>
-
-<script>
-export default {
-  name: 'CartBar',
-  props: { count: { type: Number, default: 0 } },
-  emits: ['open']
-}
-</script>
-
-<style scoped>
-.cart-bar{position:sticky;bottom:0;height:100rpx;background:var(--bg-card);border-top:1px solid var(--border);display:flex;align-items:center;padding:0 24rpx;z-index:100;gap:16rpx}
-.cart-icon-wrap{position:relative}
-.cart-icon{font-size:48rpx}
-.cart-badge{position:absolute;top:-8rpx;right:-8rpx;background:var(--red);color:#fff;font-size:20rpx;width:36rpx;height:36rpx;border-radius:50%;display:flex;align-items:center;justify-content:center;font-weight:700}
-.cart-text{flex:1;font-size:28rpx;color:var(--text-dim)}
-</style>
diff --git a/components/CartPopup.vue b/components/CartPopup.vue
deleted file mode 100644
index d320f58..0000000
--- a/components/CartPopup.vue
+++ /dev/null
@@ -1,63 +0,0 @@
-<template>
-  <view class="cart-popup" :class="{ show: visible }">
-    <view class="popup-header">
-      <text class="popup-title">购物车 ({{ items.length }})</text>
-      <text class="popup-clear" @tap="onClear">清空</text>
-    </view>
-    <scroll-view class="popup-body" scroll-y>
-      <view v-for="item in items" :key="item.product.id" class="cart-item">
-        <text class="cart-item-emoji">{{ item.product.emoji }}</text>
-        <view class="cart-item-info">
-          <text class="cart-item-name">{{ item.product.name }}</text>
-          <text class="cart-item-alc" v-if="item.product.alc > 0">{{ item.product.alc }}%</text>
-        </view>
-        <view class="cart-item-qty">
-          <text class="qty-btn" @tap="onQty(item.product.id, -1)">−</text>
-          <text class="qty-num">{{ item.qty }}</text>
-          <text class="qty-btn" @tap="onQty(item.product.id, 1)">+</text>
-        </view>
-      </view>
-    </scroll-view>
-    <view class="popup-footer">
-      <text class="popup-total">共 {{ cart.totalCount }} 件</text>
-      <button class="popup-submit" @tap="onSubmit" :disabled="items.length===0">去呼唤调酒师</button>
-    </view>
-  </view>
-</template>
-
-<script>
-import { useCartStore } from '@/stores/cart'
-
-export default {
-  name: 'CartPopup',
-  props: { visible: { type: Boolean, default: false }, items: { type: Array, default: () => [] } },
-  emits: ['close', 'submit'],
-  setup(props, { emit }) {
-    const cart = useCartStore()
-    function onQty(id, d) { cart.updateQty(id, (cart.items.find(i=>i.product.id===id)||{}).qty + d) }
-    function onClear() { cart.clearCart() }
-    function onSubmit() { emit('submit') }
-    return { cart, onQty, onClear, onSubmit }
-  }
-}
-</script>
-
-<style scoped>
-.cart-popup{position:fixed;bottom:0;left:0;right:0;background:var(--bg-card);border-radius:32rpx 32rpx 0 0;z-index:200;transform:translateY(100%);transition:transform .3s;max-height:60vh;display:flex;flex-direction:column}
-.cart-popup.show{transform:translateY(0)}
-.popup-header{display:flex;justify-content:space-between;padding:24rpx 28rpx;border-bottom:1px solid var(--border)}
-.popup-title{font-size:30rpx;font-weight:700;color:var(--text)}
-.popup-clear{font-size:24rpx;color:var(--red)}
-.popup-body{flex:1;padding:0 28rpx;max-height:400rpx}
-.cart-item{display:flex;align-items:center;padding:20rpx 0;border-bottom:1px solid var(--border);gap:16rpx}
-.cart-item-emoji{font-size:44rpx}
-.cart-item-info{flex:1}
-.cart-item-name{font-size:28rpx;font-weight:600;color:var(--text);display:block}
-.cart-item-alc{font-size:22rpx;color:var(--gold-light)}
-.cart-item-qty{display:flex;align-items:center;gap:20rpx}
-.qty-btn{width:48rpx;height:48rpx;border-radius:50%;background:var(--border);color:var(--text);display:flex;align-items:center;justify-content:center;font-size:32rpx;font-weight:700}
-.qty-num{font-size:28rpx;color:var(--text);min-width:40rpx;text-align:center}
-.popup-footer{display:flex;align-items:center;padding:20rpx 28rpx;padding-bottom:calc(20rpx + var(--safe-b));border-top:1px solid var(--border);gap:20rpx}
-.popup-total{font-size:28rpx;color:var(--text-dim)}
-.popup-submit{flex:1;height:80rpx;border-radius:var(--radius-sm);background:linear-gradient(135deg,var(--orange),var(--red));color:#fff;border:none;font-size:28rpx;font-weight:700}
-</style>
diff --git a/stores/cart.js b/stores/cart.js
index 03cd68e..9c069c8 100644
--- a/stores/cart.js
+++ b/stores/cart.js
@@ -5,7 +5,6 @@ export const useCartStore = defineStore('cart', () => {
   const items = ref([])
 
   const totalCount = computed(() => items.value.reduce((s, i) => s + i.qty, 0))
-  const totalAmount = computed(() => items.value.reduce((s, i) => s + i.product.price * i.qty, 0))
 
   function addItem(product, qty = 1) {
     const exist = items.value.find(i => i.product.id === product.id)
@@ -32,5 +31,5 @@ export const useCartStore = defineStore('cart', () => {
     items.value = []
   }
 
-  return { items, totalCount, totalAmount, addItem, removeItem, updateQty, clearCart }
+  return { items, totalCount, addItem, removeItem, updateQty, clearCart }
 })