From a5f6bf336e497d9b1b96bf896528734fc02e9e6a Mon Sep 17 00:00:00 2001
From: "1054425342@qq.com" <1054425342@qq.com>
Date: Wed, 17 Sep 2025 10:12:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 subPackages/order/gwcOrder.vue |  3 --
 subPackages/techan/detail.vue  |  4 +--
 subPackages/user/gwc.vue       | 50 +++++++++++++++++++++++++++-------
 3 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/subPackages/order/gwcOrder.vue b/subPackages/order/gwcOrder.vue
index e3535b4..5a9a083 100644
--- a/subPackages/order/gwcOrder.vue
+++ b/subPackages/order/gwcOrder.vue
@@ -149,15 +149,12 @@ export default {
 	},
 	onLoad() {
 		this.info = this.$store.state.user.sshoppingCart
-		console.log('info',this.info);
-		
 		this.info.forEach(item => {
 			this.getDiscount(item)
 		})
 		if (!this.info) {
 			uni.navigateBack();
 		}
-		console.log('----***info***------',this.info);
 	},
 	onShow() {
 		this.getContacts();
diff --git a/subPackages/techan/detail.vue b/subPackages/techan/detail.vue
index 01ea9a3..b652de6 100644
--- a/subPackages/techan/detail.vue
+++ b/subPackages/techan/detail.vue
@@ -31,8 +31,8 @@
 						<!-- <view class="old-price">￥{{info.price / 100}}</view> -->
 					</view>
 				</view>
-				<view class="tag no-scrollbar" v-if="info.goods_new_tag">
-					<view class="tag-item" v-for="(item, index) in info.goods_new_tag.split(',')" :key="index">
+				<view class="tag no-scrollbar" v-if="info.labels">
+					<view class="tag-item" v-for="(item, index) in info.labels.split(',')" :key="index">
 						{{ item }}
 					</view>
 				</view>
diff --git a/subPackages/user/gwc.vue b/subPackages/user/gwc.vue
index 4667843..ebecf76 100644
--- a/subPackages/user/gwc.vue
+++ b/subPackages/user/gwc.vue
@@ -48,12 +48,14 @@
 			<view class="title flex-between">失效商品<span @click="delLoseGood('', 1)">清空失效商品</span></view>
 			<view class="goodItem" v-for="(goodItem, goodIndex) in loseList" :key="goodIndex">
 				<view class="noSelect"></view>
-				<image :src="showImg(goodItem.specifications_image)" mode="aspectFill"></image>
+				<image :src="showImg(goodItem.specUrl)" mode="aspectFill"></image>
 				<view class="contentBox">
-					<view class="title text-overflow">{{ goodItem.good_name }}</view>
+					<view class="title text-overflow">{{ goodItem.goodsName }}</view>
 					<view class="subTitle text-overflow">{{
-            goodItem.Specifications_name
-          }}</view>
+							  goodItem.specValueOne
+							}}-{{
+							  goodItem.specValueTwo
+							}}</view>
 					<view class="priceBox flex-between">
 						<view class="price">{{ goodItem.salePrice }}</view>
 						<view class="btn" @click="delLoseGood(goodItem.id, 0)">删除</view>
@@ -106,11 +108,14 @@
 						"/framework/cart/list", "DES"
 					)
 					.then((res) => {
-						this.list = res.data || [];
+						const list = res.data || [];
 						this.loseList = [];
-						this.list.forEach((item) => {
+						this.list = [];
+						list.forEach((item) => {
 							if (item.effectStatus == 1) {
 								this.loseList.push(item);
+							} else {
+								this.list.push(item)
 							}
 						});
 						console.log("购物车数据更新:", this.list);
@@ -359,10 +364,35 @@
 					});
 					return;
 				}
-				console.log("list参数", list);
-				this.$store.commit("changeOrderSCart", list);
-				// this.gotoPath('/subPackages/order/eCartOrder')
-				this.gotoPath("/subPackages/order/gwcOrder");
+				this.Post({
+							bos: list,
+							method: 'post'
+						},
+						`/framework/cart/check-cart-items`,
+						"DES"
+					)
+					.then((res) => {
+						if (res.data.canOrder) {
+							this.$store.commit("changeOrderSCart", list);
+							this.gotoPath("/subPackages/order/gwcOrder");
+						} else {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+							this.getShoppingList()
+						}
+
+					}).catch((res) => {
+						uni.showToast({
+							title: '部分商品无法下单，请重新加载购物车',
+							icon: 'none'
+						})
+						setTimeout(() =>{
+							this.getShoppingList()
+						},800)
+					})
+
 				// this.gotoPath('/subPackages/goods/goodsOrder')
 			},
 		},