优化活动详情页导航栏样式，修复扫码和关注页面逻辑问题

manifest.json

@@ -54,7 +54,11 @@
         "appid" : "wx5de24df912a4834c",
         "setting" : {
             "urlCheck" : false,
-            "minified" : true
+            "minified" : true,
+            "es6": true,
+            "postcss": true,
+            "minifyWXSS": true,
+            "minifyWXML": true
         },
         "usingComponents" : true,
         "optimization" : {

pages/index/scan.vue

@@ -147,7 +147,19 @@
 				const userInfo = uni.getStorageSync('userInfo')
 				const barInfo = uni.getStorageSync('barInfo')
 				
-				this.isLoggedIn = !!token
+				// 重置状态
+				this.isLoggedIn = false
+				this.isVerified = false
+				this.isVerifying = false
+				this.userInfo = null
+				this.barInfo = null
+				
+				// 检查登录状态
+				if (!token || !userInfo) {
+					return
+				}
+				
+				this.isLoggedIn = true
 				this.userInfo = userInfo
 				this.barInfo = barInfo
 				
@@ -171,14 +183,6 @@
 					this.isVerified = userInfo?.isVerified === 1
 					this.isVerifying = false
 				}
-				
-				console.log('【checkLoginStatus】登录状态:', {
-					isLoggedIn: this.isLoggedIn,
-					isVerified: this.isVerified,
-					isVerifying: this.isVerifying,
-					userInfo: this.userInfo,
-					barInfo: this.barInfo
-				})
 			},
 			// 登录成功回调
 			loginSuccess() {
@@ -194,9 +198,7 @@
 			},
 			// 跳转登录
 			toLogin() {
-				uni.navigateTo({
+				this.$refs.loginRef.open()
-					url: '/pages/index/chooseLogin'
-				})
 			},
 			handleScan() {
 				if (!this.isLoggedIn) {
@@ -250,8 +252,6 @@
 														}
 													}
 												})
-											} else if (res.cancel) {
-												console.log('用户点击取消')
 											}
 										}
 									})

pagesActivity/activityDetail.vue

@@ -1,7 +1,16 @@
 <template>
 	<view class="page-content">
+		<!-- 自定义导航栏 -->
+		<view class="custom-nav" :style="{ paddingTop: statusBaeHeight + 'px' }">
+			<view class="nav-content">
+				<view class="back-btn" @click="goBack">
+					<text class="cuIcon-back"></text>
+				</view>
+			</view>
+		</view>
+		
 		<view class="bg-white progress-box margin-bottom-sm" style="height: 600rpx;border-radius: 0 0 36rpx 36rpx;"
-			:style="{'padding-top': statusBaeHeight + 'px'}">
+			:style="{'margin-top': statusBaeHeight + 88 + 'px'}">
 			<process v-if="activityInfo.stage == 1" :value="processNum" progress_width="360" bg_color="#E3E3E5" border_width="6" progress_height="350"
 				start_color="#FEE034" end_color="#71F4B4" :total="activityInfo.duration"></process>
 			<process v-else :value="0" progress_width="360" bg_color="#E3E3E5" border_width="6" progress_height="350"
@@ -235,6 +244,9 @@
 						console.log(err)
 					}
 				})
+			},
+			goBack() {
+				uni.navigateBack()
 			}
 		}
 	}
@@ -242,12 +254,52 @@
 
 <style lang="scss" scoped>
 	.page-content {
-		// overflow-y: auto;
 		min-height: 100vh;
 		padding-bottom: 200rpx;
 		
+		.custom-nav {
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			z-index: 999;
+			background: transparent;
+			
+			.nav-content {
+				height: 44px;
+				display: flex;
+				align-items: center;
+				padding: 0 32rpx;
+				
+				.back-btn {
+					width: 64rpx;
+					height: 64rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: rgba(255, 255, 255, 0.8);
+					border-radius: 50%;
+					
+					.cuIcon-back {
+						font-size: 36rpx;
+						color: #000;
+					}
+				}
+				
+				.nav-title {
+					flex: 1;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: 32rpx;
+					font-weight: 500;
+					margin-right: 60rpx;
+				}
+			}
+		}
+
 		.progress-box {
 			position: relative;
+			margin-top: v-bind('statusBaeHeight + 44 + "px"');
 			
 			.progress-text {
 				position: absolute;

pagesCoin/beerCoin.vue

@@ -179,6 +179,7 @@
 /* 标签栏样式 */
 .tab-section {
 	display: flex;
+	border-radius: 12rpx;
 	margin-bottom: 28rpx;
 	padding: 24rpx;
 	background: #FFFFFF;

pagesMy/myAttention.vue

@@ -148,7 +148,7 @@
 				this.breweryQuery.pageNum = 1
 				
 				// 检查登录状态
-				if (!token) {
+				if (!token || !userInfo) {
 					return
 				}