From 0bd3284165be2dbf886f30653c14f1ba6d5a2c03 Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Fri, 14 Jul 2023 11:25:16 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=A6=96=E9=A1=B5=E5=8A=A0=E5=85=A5?=
 =?UTF-8?q?=E8=B4=AD=E5=85=A5=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/commponent/home/goodList.vue | 151 +++++++++++------------------
 pages/views/tabBar/cart.vue        |   2 +-
 pages/views/tabBar/category.vue    |   2 -
 3 files changed, 60 insertions(+), 95 deletions(-)

diff --git a/pages/commponent/home/goodList.vue b/pages/commponent/home/goodList.vue
index 3beead2..90e4864 100644
--- a/pages/commponent/home/goodList.vue
+++ b/pages/commponent/home/goodList.vue
@@ -31,13 +31,13 @@
 						<!-- <text v-if="item.skuItem.dashPrice" class="text2 text-xs"> {{item.skuItem.dashPrice.text}}</text> -->
 
 					</view>
-					<view class="g_left price" v-else>
+					<view class="g_left price" v-if="!item.price">
 						<text  class="text1  text-bold text-sm">客服询价 </text>
-						
+
+					</view>
+					<view class="g_right" v-if="item.price" @tap="addCart(item)">
+						<image src="/static/images/new/jiagou.png" style=" width: 24px;height: 24px;" mode="aspectFill"></image>
 					</view>
-					<!-- <view class="g_right" @tap="addCart(item)">
-						<image src="/static/images/new/jiagou.png" style=" width: 28px;height: 28px;" mode="aspectFill"></image>
-					</view> -->
 				</view>
 			</view>
 
@@ -52,13 +52,13 @@
 							<image :src="good_item.picUrl" style="width: 100%;" class="h-100" mode="aspectFit"></image>
 							<image :src="'/static/images/new/tag'+index+'.png'" class="cboardVO_tag" mode="aspectFit"></image>
 						</view>
-						<view class="h-100 flex flex-wrap flex-direction justify-center" style="width: 50%;"> 
+						<view class="h-100 flex flex-wrap flex-direction justify-center" style="width: 50%;">
 							<view class="w-100 priceColor">{{good_item.sellPrice.text}}</view>
 							<view class="w-100 text-gray text-sm padding-top-xs">日售{{good_item.dailySales}}</view>
 						</view>
 					</view>
 				</view>
-				
+
 			</view> -->
 
 		</view>
@@ -72,7 +72,7 @@
 
 <script>
 	import { setTabBarBadge } from '@/utils/util.js'
-	import {getCart, setCart ,resetCart, getCartNumber,setGoodsData, 
+	import {getCart, setCart ,resetCart, getCartNumber,setGoodsData,
 	setCartDetails,
 	 setGoodsDetails,getToken} from '@/utils/auth.js'
 	export default {
@@ -116,90 +116,57 @@
 					url: '/pages/views/goods/goodsDetails?id=' + item.id
 				});
 			},
-			addCart(e) {
-				console.log(e)
-				
-				// 此处应该判断是否登录 如果没登录 跳转到登录页
+			addCart(item) {
 				if(!getToken()){
-						uni.navigateTo({ //登录
-							url:'/pages/login/index1'
-						})
-						return
+					uni.navigateTo({ //登录
+						url:'/pages/login/index1'
+					})
+					return
 				}
-				setCartDetails(e.skuItem)
-				
-				setGoodsDetails(e.skuItem)
-				var data = this.good_data
-				data.status= 0;
-				data.img =  e.skuItem.picUrl;
-				data.title =  e.skuItem.skuTitle.text;
-				data.money = parseFloat(e.skuItem.sellPrice.text.substr(1));
-				
-				data.imgList.push(e.skuItem.picUrl);
-				data.imgList.push(e.skuItem.detailPagePic);
-				data.xiaoliang = e.skuItem.skuId;
-				data.goods_id = e.skuItem.skuId;
-				
-				
-				
-				if(data.skuArr){
-					let sku = data.skuArr
-				
-					for(let i=0;i<sku.length;i++){
-						sku[i].img = data.img
-						sku[i].goods_sku_text = data.title+"测试规格"+i;
-						sku[i].money = data.money 
-						
-					}
-
-				}
-				if(data.sku){
-					let sku = data.sku[0].child
-				
-					for(let i=0;i<sku.length;i++){
-						sku[i].imgs = data.img
-						sku[i].tagname = data.title+"测试规格"+i;
-						sku[i].money = data.money 
-						
-					}
-				
+				if (!item.ifSale) {
+					this.$toast('该商品已下架')
+					return
 				}
-				data.selectSku.goods_sku_text = data.skuArr[0].goods_sku_text
-				data.selectSku.img = data.skuArr[0].img
-				data.selectSku.money = data.skuArr[0].money
-				
-				
-				let colCart = getCart();
-				if(colCart.length){
-					const hasItem = colCart.some(v => v.goods_id === data.goods_id)
-					if (!hasItem) {
-						colCart.push(data)
-					} else {
-						for(let y = 0;y < colCart.length; y++){
-							const item = colCart[y]
-							if (data.goods_id === item.goods_id) {
-								item.number ++
-								break
+				const cartList = getCart()
+				item.imgList = item.url.split(',')
+				item.number = 1
+				item._selectedSku = [{
+					id: item.id,
+					imgs: '',
+					money: item.price,
+					number: 1,
+					tagname: item.goodsName
+				}]
+				item._skus = [
+					{
+						sku_id: item.id,
+						skuname: '规格',
+						child: [
+							{
+								id: 1,
+								imgs: '',
+								money: item.price,
+								number: 1,
+								tagname: item.goodsName
 							}
-						}
+						]
 					}
-				} else {
-					colCart = [data]
+				]
+				const goodsItem = item
+				let hasItem = false
+				const cartHasGoodsList = cartList.map(v => {
+					if (v.id === (goodsItem.id +'')) {
+						hasItem = true
+						v.number = v.number >= 99999 ? 99999 : v.number + 1
+					}
+					return v
+				})
+				if (!hasItem) {
+					cartHasGoodsList.push(item)
 				}
-				resetCart(colCart)
-				/**
-				 * 模拟获取购物车的数量 getCart
-				 */
-				// let cartNum = getCart()
-				setTabBarBadge(colCart.length)
-				
-				
-				// 存储商品数据
-				uni.showToast({
-				  title: '加入购物车成功 !',
-				  icon: 'none'
-				});
-				
+				resetCart(cartHasGoodsList)
+				setTabBarBadge(cartHasGoodsList.length)
+				this.$toast('加入购物车成功')
 			},
 		},
 	}
@@ -250,12 +217,12 @@
 		width: 50rpx;height: 50rpx;position: absolute;
 		left: 0;top: 0;
 	}
-	
-	
-	
-	
-	
-	
+
+
+
+
+
+
 
 	.loading {
 		height: 80upx;
diff --git a/pages/views/tabBar/cart.vue b/pages/views/tabBar/cart.vue
index 40f1992..39442e4 100644
--- a/pages/views/tabBar/cart.vue
+++ b/pages/views/tabBar/cart.vue
@@ -142,7 +142,7 @@
 			this.bottomShow = 0
 			// #endif
 			// #ifdef H5
-			this.bottomShow = '100upx'
+			this.bottomShow = '50px'
 			// #endif
 			// #ifdef APP-PLUS
 			this.showHeader = true   //在APP端对样式进行调整
diff --git a/pages/views/tabBar/category.vue b/pages/views/tabBar/category.vue
index 82f252f..6b36aed 100644
--- a/pages/views/tabBar/category.vue
+++ b/pages/views/tabBar/category.vue
@@ -35,8 +35,6 @@
 				 <view class="type_good">
 				 	<goodList :has-token="hasToken" style="width: 100%; background-color: #FFFFFF;" :propsList = "cateGood"  ></goodList>
 				 </view>
-				
-				
 			</scroll-view>
 		</view>
 	</view>