From daa9adbc0e2fded884ea9e51fbe44cd22f6756a1 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期六, 28 二月 2026 15:16:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 mini-program/pages/special-zone/special-zone.vue |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/mini-program/pages/special-zone/special-zone.vue b/mini-program/pages/special-zone/special-zone.vue
index f9dfd9a..52f99fc 100644
--- a/mini-program/pages/special-zone/special-zone.vue
+++ b/mini-program/pages/special-zone/special-zone.vue
@@ -48,6 +48,7 @@
 				<view class="cart-num" v-if="cardObj && cardObj.cartTypeNum > 0">{{cardObj.cartTypeNum}}</view>
 			</view>
 		</view>
+		<Login ref="login" />
 	</view>
 </template>
 
@@ -55,9 +56,11 @@
 	import {
 		mapState
 	} from 'vuex'
+	import Login from '@/components/login/login.vue'
 	export default {
+		components: {Login},
 		computed: {
-			...mapState(['navHeight', 'statusbarHeight'])
+			...mapState(['navHeight', 'statusbarHeight', 'userInfo'])
 		},
 		data() {
 			return {
@@ -72,7 +75,9 @@
 		onLoad(options) {
 			this.qualityId = options.qualityId
 			this.getGoodsList()
-			this.cardNum()
+			if (this.userInfo) {
+				this.cardNum()
+			}
 		},
 		onReachBottom() {
 			this.getGoodsList()
@@ -84,6 +89,10 @@
 				})
 			},
 			addCard(e) {
+				if (!this.userInfo) {
+					this.$refs.login.open()
+					return;
+				}
 				this.$u.api.addCart({
 					goodsId: e.id,
 					goodsSkuId: e.skuResponsesList[0].id,
@@ -96,6 +105,10 @@
 				})
 			},
 			jumpCard() {
+				if (!this.userInfo) {
+					this.$refs.login.open()
+					return;
+				}
 				uni.navigateTo({
 					url: '/pages/shopping-cart/shopping-cart'
 				})

--
Gitblit v1.9.3