修改购物车数量显示不一致问题

packages/myOrders/index/index.vue

@@ -5,6 +5,7 @@
         :class="['tabItem', selectedTab === index ? 'active2' : '']" @click="selectTab(index, item)">
         {{ item.category_name }}
       </view>
+	  
     </view>
 
     <view class="content">

packages/park/addCar/index.vue

@@ -51,7 +51,7 @@ export default {
             color: '请选择',
             show: false,
             // 颜色选项列表
-            colorOptions: ['蓝色', '黄色', '黑色', '白色', '绿色', '渐变绿底黑字', '黄绿双拼底黑字'],
+            colorOptions: ['蓝牌', '黄牌', '黑牌', '白牌', '绿牌', '渐变绿底黑字', '黄绿双拼底黑字'],
             // 当前选中的颜色索引
             selectedColorIndex: -1
         };

packages/park/index/index.css

@@ -32,7 +32,7 @@ page {
 /* 车牌类型标签样式 */
 .plate-type-box{
   padding: 11rpx 2rpx;
-  border: 1rpx solid #1890ff;
+  /* border: 1rpx solid #1890ff; */
   border-radius: 8rpx;
 }
 

packages/park/index/index.vue

@@ -7,11 +7,11 @@
           <view class="license-plate">
             <view class="plate-type-box">
               <text class="plate-type" :class="{
-                'plate-color-blue': item.car_number_color === '蓝色',
+                'plate-color-blue': item.car_number_color === '蓝牌',
-                'plate-color-yellow': item.car_number_color === '黄色',
+                'plate-color-yellow': item.car_number_color === '黄牌',
-                'plate-color-black': item.car_number_color === '黑色',
+                'plate-color-black': item.car_number_color === '黑牌',
-                'plate-color-white': item.car_number_color === '白色',
+                'plate-color-white': item.car_number_color === '白牌',
-                'plate-color-green': item.car_number_color === '绿色',
+                'plate-color-green': item.car_number_color === '绿牌',
                 'plate-color-gradient-green': item.car_number_color === '渐变绿底黑字',
                 'plate-color-yellow-green': item.car_number_color === '黄绿双拼底黑字'
               }">{{ item.car_number_color }}</text>

packages/park/temporaryOrder/index.vue

@@ -158,7 +158,7 @@ export default {
             color: '请选择',
             show: false,
             // 颜色选项列表
-            colorOptions: ['蓝色', '黄色', '黑色', '白色', '绿色', '渐变绿底黑字', '黄绿双拼底黑字'],
+            colorOptions: ['蓝牌', '黄牌', '黑牌', '白牌', '绿牌', '渐变绿底黑字', '黄绿双拼底黑字'],
             // 当前选中的颜色索引
             selectedColorIndex: -1,
 

packages/shop/goods/index.css

@@ -24,15 +24,15 @@ image {
 }
 
 .isDay {
-	background-color: orangered;
+    background-color: orangered;
-	height: 35rpx;
+    height: 35rpx;
-	border-radius: 5rpx;
+    border-radius: 5rpx;
-	color: white;
+    color: white;
-	font-size: 22rpx;
+    font-size: 22rpx;
-	text-align: center;
+    text-align: center;
-	justify-content: center;
+    justify-content: center;
-	padding: 5rpx 10rpx;
+    padding: 5rpx 10rpx;
-	display: flex;
+    display: flex;
 }
 
 .tag {
@@ -188,7 +188,7 @@ image {
     margin: 0 20rpx;
     margin-top: 20rpx;
     font-weight: 700;
-	display: flex;
+    display: flex;
 }
 
 .Msg {
@@ -598,15 +598,17 @@ image {
     margin: 5rpx 5rpx 0 5rpx;
 }
 
+.itemSizeBox {
+    margin: 30rpx;
+}
+
 .itemSize {
-    width: 30%;
     font-size: 26rpx;
     color: #333;
     background: #F6F7FB;
     border-radius: 40rpx;
     padding: 10rpx 15rpx;
     white-space: nowrap;
-    margin:20rpx 30rpx;
 }
 
 .itemSize_active {
@@ -614,15 +616,14 @@ image {
     color: #fff;
 }
 
-.itemSize-img{
+.itemSize-img {
     width: 100rpx;
     height: 100rpx;
     margin-right: 30rpx;
     border-radius: 20rpx;
-    border:1rpx solid red;
 }
 
-.itemSize_top{
+.itemSize_top {
     display: flex;
     margin-left: 30rpx;
 }

packages/shop/goods/index.vue

@@ -39,7 +39,7 @@
 					{{ item.goods_spec }} / {{ item.goods_unit }}
 				</view>
 			</view>
-			<view class="GG_rigth">
+			<view class="GG_rigth" @click="showSizePopup">
 				共{{ info.commodity_goods_info_list.length }}款<u-icon size="26rpx" name="arrow-right"></u-icon>
 			</view>
 		</view>
@@ -297,9 +297,9 @@
 					<view class="itemSize_price">￥{{ changePrice }}/袋</view>
 				</view>
 			</view>
-			<view class="itemSize" v-for="(item, index) in info.commodity_goods_info_list" :key="item.id"
+			<view class="itemSizeBox" v-for="(item, index) in info.commodity_goods_info_list" :key="item.id"
-				@click="changeGG(item, index)" :class="index == currentGGIndex ? 'itemSize_active' : ''">
+				@click="changeGG(item, index)">
-				{{ item.goods_name }} {{ item.goods_spec }} / {{ item.goods_unit }}
+				<text class="itemSize" :class="index == currentGGIndex ? 'itemSize_active' : ''">{{ item.goods_name }} {{ item.goods_spec }} / {{ item.goods_unit }}</text>
 			</view>
 		</u-popup>
 	</view>
@@ -459,7 +459,7 @@ export default {
 				console.log("this.currentGG", this.currentGG);
 				this.currentGGIndex = 0;
 
-				this.changeImg = this.currentGG.commodity_pic[0]
+				this.changeImg = picUrl + this.currentGG.commodity_pic[0]
 				this.changeName = this.currentGG.goods_alias
 				this.changePrice = this.currentGG.sales_price
 			});
@@ -490,7 +490,7 @@ export default {
 					count: 0
 				};
 			}
-			this.changeImg = item.commodity_pic[0]
+			this.changeImg = picUrl + item.commodity_pic[0]
 			this.changeName = item.goods_alias
 			this.changePrice = item.sales_price
 			this.getComment(item.goods_id)
@@ -515,20 +515,35 @@ export default {
 
 		addCar() {
 			let that = this;
+			// 获取当前商品
+			const currentGoods = this.info.commodity_goods_info_list[this.currentGGIndex];
+			
+			// 获取当前购物车数量和库存数量
+			const currentQuantity = currentGoods.cart_count ? currentGoods.cart_count.count : 0;
+			const stockQuantity = currentGoods.stock_quantity || 0;
+			
+			// 检查库存是否充足
+			if (currentQuantity >= stockQuantity) {
+				uni.showToast({
+					title: "库存不足",
+					icon: "none",
+					duration: 2000
+				});
+				return;
+			}
+			
 			//如果没有当前商品 直接添加一个
 			let goods_id_and_count = [];
 			this.info.commodity_goods_info_list[this.currentGGIndex].cart_count = {
-				count: 1,
+				count: currentQuantity + 1,
 			};
 			this.info.commodity_goods_info_list.forEach((item) => {
-				console.log(item.cart_count);
 				goods_id_and_count.push({
 					goods_id: item.id,
 					count: item.cart_count ? item.cart_count.count : 0,
 				});
 			});
 
-			console.log(goods_id_and_count);
 			//因为是当前商品没有 调用update就是增加商品。增加商品之后再获取购物车数量
 			request(apiArr.updateCar, "POST", {
 				goods_id_and_count,

packages/shop/groupPurchase/index.vue

@@ -177,7 +177,10 @@ export default {
             })
         },
         getShopdetail() {
-            return request(shopApi.getCar, "POST").then((res) => {
+            const params = {
+                is_group_buy: 1,
+            }
+            return request(shopApi.getCar, "POST", params).then((res) => {
                 this.carNum = res.total;
                 // 合并当日达和普通商品数据
                 this.goodsDetail = [].concat(res.same_day_cart_list, res.normal_cart_list)
@@ -206,7 +209,11 @@ export default {
                 });
             });
         },
-        toDetail(item) {
+        toDetail(itemObj) {
+            const item = {
+                ...itemObj,
+                groupById: itemObj.group_buy_activity_info.id
+            };
             NavgateTo(`/packages/shop/groupPurchaseDetail/index?item=${JSON.stringify(item)}`)
         },
         // 获取商品价格范围
@@ -295,7 +302,10 @@ export default {
         },
         // 跳转到购物车
         shopCar() {
-            NavgateTo("../shopCar/index");
+            const item = {
+                is_group_buy: 1,
+            }
+            NavgateTo("../shopCar/index?item=" + JSON.stringify(item));
         },
         // 计算距离结束日期的剩余时间
         getEndTheCountdown(endTime) {

packages/shop/groupPurchaseDetail/index.vue

@@ -328,6 +328,7 @@ export default {
       boxshadow1: false,
       boxshadow2: false,
       id: "",
+      groupById: "",
       info: "",
       currentIndex: "1", //当前轮播图
 
@@ -568,9 +569,11 @@ export default {
     },
     //商品详情
     getGoodsInfo() {
-      request(apiArr.getGoodsInfo, "POST", {
+      const params = {
         id: this.id,
-      }).then((res) => {
+        group_buy_activity_id: this.groupById
+      }
+      request(apiArr.getGoodsInfo, "POST", params).then((res) => {
         // 分割图片
         res.commodity_goods_info_list.forEach((item) => {
           item.goods_detail_pic = item.goods_detail_pic ? item.goods_detail_pic.split(",") : [];
@@ -590,10 +593,14 @@ export default {
           });
         }
 
+        const currentTime = new Date().getTime();
+
         // 过滤掉group_buy_activity_info为空的数据
         if (res.commodity_goods_info_list && Array.isArray(res.commodity_goods_info_list)) {
           res.commodity_goods_info_list = res.commodity_goods_info_list.filter(item => {
-            return item.group_buy_activity_info !== null
+            const startTime = new Date(item.group_buy_goods_activity.group_buy_activity_info?.start_time).getTime();
+            const endTime = new Date(item.group_buy_goods_activity.group_buy_activity_info?.end_time).getTime();
+            return item.group_buy_activity_info !== null && currentTime >= startTime && currentTime <= endTime
           });
         }
 
@@ -670,7 +677,10 @@ export default {
     },
 
     getShopCarList() {
-      return request(apiArr.getCar, "POST", {}).then((res) => {
+      const params = {
+        is_group_buy: 1,
+      }
+      return request(apiArr.getCar, "POST", params).then((res) => {
         // 合并当日达和普通商品数据
         this.carOrderList = [].concat(res.same_day_cart_list, res.normal_cart_list)
           .flatMap(supplier => supplier.commodity_cart_and_goods_model);
@@ -809,6 +819,7 @@ export default {
     this.top = meun.top;
     this.localHeight = meun.height;
     this.id = this.itemObj.commodity_id ? this.itemObj.commodity_id : this.itemObj.id;
+    this.groupById = this.itemObj.groupById
     if (this.itemObj.commodity_id) {
       this.endTime = this.itemObj.group_buy_activity_info.end_time
     } else {

packages/shop/groupPurchaseSubmit/index.vue

@@ -168,8 +168,8 @@
                                     </view>
                                 </view>
                                 <!-- 运费 -->
-                                <view class="goods-desc" style="margin-top: 10rpx;">运费 ￥{{
+                                <!-- <view class="goods-desc" style="margin-top: 10rpx;">运费 ￥{{
-                                    item.commodity_goods_info.freight }}</view>
+                                    item.commodity_goods_info.freight }}</view> -->
                             </view>
                             <view class="quantity-control">
                                 <view class="decrease-btn" @tap.stop="decreaseQuantity(item)">-</view>
@@ -420,14 +420,24 @@ export default {
             }
         },
         increaseQuantity(item) {
+            console.log("🚀 ~ increaseQuantity ~ item:", item)
             const currentTime = new Date().getTime();
             const startTime = new Date(item.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
             const endTime = new Date(item.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
+            
+            if (item.count >= item.commodity_goods_info.stock_quantity) {
+                uni.showToast({
+                    title: '库存不足',
+                    icon: 'none'
+                });
+                return
+            }
+            
             if (currentTime >= startTime && currentTime <= endTime) {
                 if (item.count == 0) {
                     item.count += item.commodity_goods_info.min_order_quantity
                 } else {
-                    if (item.count == item.commodity_goods_info.total_stock) {
+                    if (item.count >= item.commodity_goods_info.stock_quantity) {
                         uni.showToast({
                             title: '库存不足',
                             icon: 'none'
@@ -474,9 +484,11 @@ export default {
                     const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
                     const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
                     if (currentTime >= startTime && currentTime <= endTime) {
-                        total += goods.commodity_goods_info.group_buy_price * goods.count + goods.commodity_goods_info.freight;
+                        // total += goods.commodity_goods_info.group_buy_price * goods.count + goods.commodity_goods_info.freight;
+                        total += goods.commodity_goods_info.group_buy_price * goods.count;
                     } else {
-                        total += goods.commodity_goods_info.sales_price * goods.count + goods.commodity_goods_info.freight;
+                        // total += goods.commodity_goods_info.sales_price * goods.count + goods.commodity_goods_info.freight;
+                        total += goods.commodity_goods_info.sales_price * goods.count;
                     }
                 });
                 // 加运费
@@ -488,9 +500,11 @@ export default {
                     const startTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.start_time).getTime();
                     const endTime = new Date(goods.commodity_goods_info.group_buy_activity_info?.end_time).getTime();
                     if (currentTime >= startTime && currentTime <= endTime) {
-                        total += goods.commodity_goods_info.group_buy_price * goods.count + goods.commodity_goods_info.freight;
+                        // total += goods.commodity_goods_info.group_buy_price * goods.count + goods.commodity_goods_info.freight;
+                        total += goods.commodity_goods_info.group_buy_price * goods.count;
                     } else {
-                        total += goods.commodity_goods_info.sales_price * goods.count + goods.commodity_goods_info.freight;
+                        // total += goods.commodity_goods_info.sales_price * goods.count + goods.commodity_goods_info.freight;
+                        total += goods.commodity_goods_info.sales_price * goods.count;
                     }
                 });
                 // 加运费

packages/shop/index/index.css

@@ -320,7 +320,7 @@ page {
     overflow: hidden;
     /* position: relative; */
     position: fixed;
-    z-index: 999;
+    z-index: 15;
     padding: 20rpx 10rpx;
     background-color: #ffffff;
 }
@@ -404,7 +404,7 @@ page {
     position: absolute;
     left: 0;
     top: 160rpx;
-    z-index: 11;
+    z-index: 20;
 }
 
 .header2 .slide .slide_con .slide_conBox:nth-child(5n) {

packages/shop/index/index.vue

@@ -33,17 +33,6 @@
 
     <!-- 整体展开的顶部 -->
     <view class="header header2" v-if="topShow">
-      <!-- <view class="searchBox" :style="{ height: localHeight + 'px', paddingTop: top + 'px' }">
-        <view class="searchBox_left">
-          <u-icon name="arrow-left" size="20px" color="#000"></u-icon>
-        </view>
-        <view class="searchBox_ipt">
-          <image src="https://wechat-img-file.oss-cn-beijing.aliyuncs.com/property-img-file/com_communitySearchIcon.png"
-            mode="aspectFill"></image>
-          <input type="text" placeholder="输入商品名称" />
-        </view>
-      </view> -->
-
       <view class="slide">
         <view class="slide_con">
           <view v-for="(item, index) in CateList" :key="index" class="slide_conBox" @click="changeCate(item.id)">
@@ -95,7 +84,7 @@
           </view>
         </view>
         <!-- 右下阴影 -->
-        <view class="boxshadow2" v-if="cateListShow"></view>
+        <view class="boxshadow2" v-if="cateListShow" @click="changeCateListShow"></view>
 
         <view class="CateIte">
           <view class="CateInfo"
@@ -312,9 +301,8 @@ export default {
       NavgateTo('1')
     },
 
-
-
     changeCate(id) {
+      this.checkItem(0)
       // 更新当前选中的顶级分类ID
       this.currentCategoryId = id;
       // 根据id查找对应的分类
@@ -322,6 +310,7 @@ export default {
       if (category) {
         // 将leftCateList设置为该分类的二级分类，若为null则设为空数组
         this.leftCateList = category.level_two_category || [];
+        this.tagList1 = category.level_three_category || [];
         if (this.leftCateList.length > 0) {
           this.currentLeftCateId = this.leftCateList[0].id;
           this.secondId = this.leftCateList[0].id;
@@ -342,7 +331,7 @@ export default {
       this.cateListShow = false
       this.rightTopActive = index;
       // 获取选中的标签ID
-      this.selectedTagId = this.tagList[index].id;
+      this.selectedTagId = this.tagList[index]?.id;
     },
     //右下角点击更多
     topOpen() {
@@ -448,26 +437,42 @@ export default {
     },
     //商品数量变化
     handleQuantityChange(val, item) {
-      // 先在前端直接更新数量，确保页面显示及时变化
-      // 注意：这里的val可能是直接的数值，也可能是包含value属性的对象
-      // 我们需要先确定正确的值
       const quantity = typeof val === 'object' && val !== null && 'value' in val ? val.value : val;
 
+      // 检查库存数量
+      let currentQuantity = 0;
+      let stockQuantity = 0;
+      let goodsToUpdate = null;
+      
       // 对于有规格的主商品（绑定到items.commodity_goods_info_list[0].quantity）
       if (
         item.commodity_goods_info_list &&
         item.commodity_goods_info_list.length
       ) {
         this.goodsId = item.commodity_goods_info_list[0].id;
-        // 使用$set确保响应式更新
+        currentQuantity = item.commodity_goods_info_list[0].quantity || 0;
-        this.$set(item.commodity_goods_info_list[0], 'quantity', quantity);
+        stockQuantity = item.commodity_goods_info_list[0].stock_quantity || 0;
+        goodsToUpdate = item.commodity_goods_info_list[0];
       }
       // 对于规格列表中的商品（绑定到ite.quantity）
       else {
         this.goodsId = item.id;
-        // 使用$set确保响应式更新
+        currentQuantity = item.quantity || 0;
-        this.$set(item, 'quantity', quantity);
+        stockQuantity = item.stock_quantity || 0;
+        goodsToUpdate = item;
       }
+      
+      // 判断是否增加数量且库存不足
+      if (quantity > currentQuantity && currentQuantity >= stockQuantity) {
+        uni.showToast({
+          title: "库存不足",
+          icon: 'none'
+        });
+        return;
+      }
+      
+      // 使用$set确保响应式更新
+      this.$set(goodsToUpdate, 'quantity', quantity);
 
       const params = {
         user_id: uni.getStorageSync("userId"),

packages/shop/shopCar/index.vue

@@ -228,7 +228,7 @@ export default {
 			isDayshow: false,
 			isParcelPostchecked: false,
 			parcelPostshow: false,
-
+			is_group_buy: ''
 		};
 	},
 	// watch: {
@@ -303,7 +303,10 @@ export default {
 
 		// 获取购物车列表
 		getShopCar() {
-			request(apiArr.getCar, "POST", {}).then((res) => {
+			const params = {
+				is_group_buy: this.is_group_buy
+			}
+			request(apiArr.getCar, "POST", params).then((res) => {
 				if (res.normal_cart_list.length > 0) {
 					res.normal_cart_list.forEach((item) => {
 						item.checked = false;
@@ -614,6 +617,13 @@ export default {
 					this.shopCarTotal++;
 				}
 			} else {
+				if (carItem.count >= carItem.commodity_goods_info.stock_quantity) {
+					uni.showToast({
+						title: '库存不足',
+						icon: 'none'
+					});
+					return
+				}
 				carItem.count++;
 				this.shopCarTotal++;
 			}
@@ -717,6 +727,7 @@ export default {
 		const meun = menuButtonInfo();
 		this.top = meun.top;
 		this.localHeight = meun.height;
+		this.is_group_buy = options.item ? JSON.parse(options.item).is_group_buy : ''
 		this.getShopCar();
 	},
 	onShow() {