From e6cb80c0434f3667cb5a996c75e6934ed9599f07 Mon Sep 17 00:00:00 2001
From: HHS <1339084443@qq.com>
Date: Thu, 22 May 2025 17:52:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=95=86=E5=93=81=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/shoppingCart/shoppingCart.vue | 75 ++++++++++++++++++++---------
 pages/shoppingMall/shopDetails.vue  | 25 +++++++++-
 2 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/pages/shoppingCart/shoppingCart.vue b/pages/shoppingCart/shoppingCart.vue
index 41f0854..27530c5 100644
--- a/pages/shoppingCart/shoppingCart.vue
+++ b/pages/shoppingCart/shoppingCart.vue
@@ -2,7 +2,7 @@
 	<view class="container">
 		<!-- 购物车头部 -->
 		<view class="cart-header">
-			<text class="header-title" @click="editGoods">编辑商品</text>
+			<text class="header-title" @click="editGoods" v-if='cartList.lenght>0'>编辑商品</text>
 		</view>
 		<!-- 商品列表 -->
 		<scroll-view scroll-y class="goods-list">
@@ -33,7 +33,7 @@
 
 		<!-- 结算区域 -->
 		<view class="settlement-bar">
-			<view class="pay-content" v-if="!isEdit">
+			<view class="pay-content" v-if="!isEdit ">
 				<view class="total">
 					合计({{ selectedCount }})：
 					<view class="price">
@@ -42,7 +42,12 @@
 					</view>
 				</view>
 				<view class="pay-btn">
-					<button class="settle-btn" @click='payBtn'>立即付款</button>
+					<button class="settle-btn"  >
+						<text @click='payBtn' v-if='cartList.length>0'>立即付款</text>
+						<text v-else>暂无商品</text>
+					
+					
+					</button>
 				</view>
 			</view>
 			<view class="edit-actions" v-else>
@@ -55,32 +60,56 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
-
+import { ref, computed ,onMounted} from 'vue';
+import {
+		request
+	} from '@/utils/request'
 const num = ref(1);
 const isEdit = ref(false);
 // 购物车数据
 const cartList = ref([
-	{
-		id: 1,
-		name: '蜂蜜',
-		price: 68.0,
-		image: '/static/logo.png',
-		weight: '5000g',
-		count: 1,
-		selected: false
-	},
-	{
-		id: 2,
-		name: '蜂王浆',
-		price: 128.0,
-		image: '/static/logo.png',
-		weight: '250g',
-		count: 1,
-		selected: false
-	}
+	
 ]);
+//获取购物车列表
+const getCartList = async () => {
+  try {
+    const res = await request({
+      url: '/app-api/trade/cart/list',
+      showLoading: true, 
+    })
+	console.log(res)
+    if (res.code === 0 || res.code === 200) {
+	cartList.value=res.data.validList
+    } else {
+      throw new Error(res.msg || '数据异常')
+    }
+  } 
+  catch (err) {
+    console.error('获取商场数据失败:', err)
+  }
+}
+// 获取购物车商品
+// const getCartList = async () => {
+//   try {
+//     const res = await request({
+//       url: '/app-api/trade/cart/list',
+//       showLoading: true, 
+//     })
+//     if (res.code === 0 || res.code === 200) {
+// 	cartList.value=res.data
+//     } else {
+//       throw new Error(res.msg || '数据异常')
+//     }
+//   } 
+//   catch (err) {
+//     console.error('获取商场数据失败:', err)
+//   }
+// }
 
+onMounted(() => {
+  getCartList()
+})
+ 
 //编辑商品
 const editGoods = () => {
 	isEdit.value = true;
diff --git a/pages/shoppingMall/shopDetails.vue b/pages/shoppingMall/shopDetails.vue
index a0edc32..327f12f 100644
--- a/pages/shoppingMall/shopDetails.vue
+++ b/pages/shoppingMall/shopDetails.vue
@@ -79,12 +79,33 @@
 		"secondBrokerageProportion": 0
 	})
 
-	const buyBtn = () => {
-		console.log('跳转到购物车')
+	//添加物品
+	const buyBtn = async () => {
+		
+	  try {
+	    const res = await request({
+	      url: '/app-api/trade/cart/add',
+	      showLoading: true, 
+		  method:'post',
+		  data:{
+			  skuId:commodityDetails.value.id,
+			  count:'1'
+		  }
+	    })
+	    if (res.code === 0 || res.code === 200) {
 		uni.navigateTo({
 			url: '/pages/shoppingCart/shoppingCart'
 		})
+	    } else {
+	      throw new Error(res.msg || '数据异常')
+	    }
+	  } 
+	  catch (err) {
+	    console.error('获取商场数据失败:', err)
+	  }
 	}
+
+
 	const getCommodityDetail = async (id) => {
 		try {
 			const res = await request({