修改购物车逻辑

components/cate-one/cate-one.vue

@@ -256,8 +256,11 @@
 			
 			// 添加到购物车(默认商品数量+1,可以让后端连表查询商品数量字段)
 			async addCartFun(item) {
-				console.log("🚀 ~ addCartFun ~ item:", item)
+				uni.navigateTo({
-				
+					url: `/pages/shop/shop?id=${item.id}&showPopup=true`
+				})
+				return
+
 				// 限购逻辑
 				if (item.first_category_id === 1 || item.first_category_id === 2) {
 					// 统计购物车中同类商品的总数量
@@ -346,7 +349,7 @@
 
 			// 去结算
 			goSettle() {
-			console.log(this.cartLists)
+				console.log(this.cartLists)
 				this.showCart = false
 				const goods = this.cartLists.map(item => {
 					return {

components/shop-spec/shop-spec.vue

@@ -36,10 +36,11 @@
 				
 					<view class="row u-row-center mt20 u-p-b-20" :class="specValueText.indexOf('请选择') != -1 || checkedGoods.stock == 0 ? 'disabled' : ''">
 						<view class="w-40 mr10">
-							<u-button @click="close" hover-class="none" :customStyle="{color: themeColor, border: '1px solid ' + themeColor, padding: '16rpx 0'}" :plain="true" :hair-line="false" shape="circle">取消</u-button>
+							<!-- <u-button @click="close" hover-class="none" :customStyle="{color: themeColor, border: '1px solid ' + themeColor, padding: '16rpx 0'}" :plain="true" :hair-line="false" shape="circle">取消</u-button> -->
+							<u-button @click="confirm('cart')" hover-class="none" :customStyle="{color: themeColor, border: '1px solid ' + themeColor, padding: '16rpx 0'}" :plain="true" :hair-line="false" shape="circle">加入购物车</u-button>
 						</view>
 						<view class="w-40 ml10">
-							<u-button @click="confirm" hover-class="none" :customStyle="{backgroundColor: themeColor, color: '#fff', border: 'none', padding: '16rpx 0'}" :hair-line="false" shape="circle">确定</u-button>
+							<u-button @click="confirm('buy')" hover-class="none" :customStyle="{backgroundColor: themeColor, color: '#fff', border: 'none', padding: '16rpx 0'}" :hair-line="false" shape="circle">确定</u-button>
 						</view>
 					</view>
 				</view>
@@ -198,7 +199,7 @@
 			// },
 
 			// 确认选择的规格
-			confirm() {
+			confirm(type) {
 				let { checkedGoods, goodsNum } = this;
 				if (this.specValueText.indexOf("请选择") != -1)
 					return this.$toast({
@@ -211,6 +212,7 @@
 				checkedGoods.goodsNum = goodsNum;
 				this.$emit('buynow', {
 					detail: checkedGoods,
+					type
 				});
 			}
 		},

pages/shop/shop.vue

@@ -82,7 +82,7 @@
 			</view>
 		</view>
 		
-		<shop-spec v-model="showSpec" :name="goods.name" :goods="goods" @close="closePopup" @confirm="confirmSpec" @buynow="onBuy"></shop-spec>
+		<shop-spec v-model="showSpec" :name="goods.name" :goods="goods" @confirm="confirmSpec" @buynow="onBuy"></shop-spec>
 	</view>
 </template>
 
@@ -113,11 +113,15 @@
 				source: '',
 				cartLists: [],
 				totalPrice: 0,
+				showPopup: false,
 			}
 		},
 
 		onLoad(options) {
+			console.log("🚀 ~ onLoad ~ options:", options)
 			this.id = options.id
+			this.showPopup = options.showPopup === 'true' ? true : false
+			this.showSpec = this.showPopup
 		},
 
 		onShow() {
@@ -174,7 +178,6 @@
 
 			// 将当前的商品添加到购物车里面
 			addCartFun() {
-				this.source = 'cart'
 				this.showSpec = true
 			},
 
@@ -188,7 +191,6 @@
 				console.log("data>>>", data.spec);
 				this.spec = data.spec
 				this.showSpec = false
-				this.source = ''
 			},
 
 			onChangeGoods(e) {
@@ -202,16 +204,13 @@
 				this.showSpec = true;
 			},
 
-			closePopup() {
-				this.source = ''
-			},
-
 			// 购买商品
 			onBuy(e) {
-				if (this.source === 'cart') {
+				if (e.type === 'cart') {
 					// 限购逻辑:套餐和单品内的商品列表，每个都是只能购买两个
-					console.log("🚀 ~ onBuy ~ this.goods:", this.goods)
 					if (this.goods.first_category_id == 1 || this.goods.first_category_id == 2) {
+						console.log("🚀 ~ onBuy ~ this.cartLists:", this.cartLists)
+
 						const totalNum = this.cartLists
 							.filter(i => i.first_category_id === this.goods.first_category_id)
 							.reduce((sum, i) => sum + (i.goods_num || 0), 0);
@@ -220,8 +219,9 @@
 							this.$toast({ title: '该类商品每人限购2件' });
 							return;
 						} else {
+							let {id} = e.detail
 							addCart({
-								item_id: this.goods.id,
+								item_id: id,
 								goods_num: 1
 							}).then(res => {
 								this.getCartListFun()