From 54f3534be4f93c42ade658b03f95f77577836ef9 Mon Sep 17 00:00:00 2001
From: davy <davy@example.com>
Date: Sat, 5 Apr 2025 15:28:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B4=BB=E5=8A=A8=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E9=A1=B5=E5=AF=BC=E8=88=AA=E6=A0=8F=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=89=AB=E7=A0=81=E5=92=8C=E5=85=B3?=
 =?UTF-8?q?=E6=B3=A8=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manifest.json                    |   6 +++-
 pages/index/scan.vue             |  28 +++++++--------
 pagesActivity/activityDetail.vue |  58 +++++++++++++++++++++++++++++--
 pagesCoin/beerCoin.vue           |   1 +
 pagesMy/myAttention.vue          |   2 +-
 static/tabbar/scan-s.png         | Bin 1302 -> 1344 bytes
 6 files changed, 76 insertions(+), 19 deletions(-)

diff --git a/manifest.json b/manifest.json
index 2e7bf93..ac1e051 100644
--- a/manifest.json
+++ b/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" : {
diff --git a/pages/index/scan.vue b/pages/index/scan.vue
index 9f7fa76..2fe7031 100644
--- a/pages/index/scan.vue
+++ b/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({
-					url: '/pages/index/chooseLogin'
-				})
+				this.$refs.loginRef.open()
 			},
 			handleScan() {
 				if (!this.isLoggedIn) {
@@ -250,8 +252,6 @@
 														}
 													}
 												})
-											} else if (res.cancel) {
-												console.log('用户点击取消')
 											}
 										}
 									})
diff --git a/pagesActivity/activityDetail.vue b/pagesActivity/activityDetail.vue
index 972f9e2..3be7ba0 100644
--- a/pagesActivity/activityDetail.vue
+++ b/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,13 +254,53 @@
 
 <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;
 				top: 200rpx;
diff --git a/pagesCoin/beerCoin.vue b/pagesCoin/beerCoin.vue
index aee2747..de382d2 100644
--- a/pagesCoin/beerCoin.vue
+++ b/pagesCoin/beerCoin.vue
@@ -179,6 +179,7 @@
 /* 标签栏样式 */
 .tab-section {
 	display: flex;
+	border-radius: 12rpx;
 	margin-bottom: 28rpx;
 	padding: 24rpx;
 	background: #FFFFFF;
diff --git a/pagesMy/myAttention.vue b/pagesMy/myAttention.vue
index c197eba..806c048 100644
--- a/pagesMy/myAttention.vue
+++ b/pagesMy/myAttention.vue
@@ -148,7 +148,7 @@
 				this.breweryQuery.pageNum = 1
 				
 				// 检查登录状态
-				if (!token) {
+				if (!token || !userInfo) {
 					return
 				}
 				
diff --git a/static/tabbar/scan-s.png b/static/tabbar/scan-s.png
index b6581815607f93e17a1a4097de56762278bcb206..769e30ce03db905fa658f72be1f187ffabd67536 100644
GIT binary patch
delta 1296
zcmV+r1@HQn3cw1GL4WE=L_t(&f$dsPPa8)R|GimoO{FHQo|bTkxp9k;D6uM`nr~n}
zLEzS&T5ek|F&D=-(o>H($DHDC5KC|%P9)q<kc||;w{BEaT*o`F2hXn8#=D+fTR^1z
zF2K&t+uxh_=KYxg_=?*FC3)E@*g3-!rpMB}HaG{TeNuIF<bRm?vYDOh<i`#skOOEa
zV6E9j7~%;@lt8#n+y}$G`kYyITV*#^Uct_hCr)E!0S*xwlH~p*W#*y=%zW8g$aD_@
zl)%ukRW{o(0mLfM>15r7`R*i9Ic97Vi|q%G_iF$Cm)VV4n6b31f}JBNUIWMh02nR^
z4F=Z*@JUL(CV#Bc%eE%1epo(wO7<ur5|2PA0w{$ZJ1pepIBQ%}K&|{~Kpv>Gkh@9z
zau!gFcz}T-&Q&+FI=V>4=)~_I{`e<=A^;Guf6=V`a{2LCYh`DN%a6zI<=N58drKRn
z_?YvCw{m%Q^fLV3kOh?1@7166i)Ll(X6VLaaeeO<lz$~y%FXt>YQrBB;THvqr~dCO
z<nB!ooCFqf7p#JVA)bWCh7@4#yAFW*P5XQt+9y>9ga!bR9NOH2FlrU-9Apr68c9DA
zo8*SSm?%;CU~rv4B@j%jVCQ@pgFMhf&bJ4%{7aWKdB(2*Z$rYA1Q3b%NgiA?U!Iuo
zMj?PttbcwtJP|BXWFngcYt1f_CtiU#e#OT?C*h4kN_I)~V@}x0sT5Gr>JU)n0CNMN
zIuU;um*m3e^s+7YZL-ymLn;LXi>Is-9Rd62Z=aQCMJO?sG?RD`37qq0r93-2$&pwA
zt6=AXN|Nz>79`Ak*|Z9FF3sFPfle>m0>cHv#eW=}$Qhv`jEFy^`Dhqc!Oktrci)pI
zPR)EdG9X0p3lwl$WtR=Pdi6Q8tQ)5%ZCEYz(6=Zdy2***H?)cGQuZB(ar{zk;=2T`
zFdFV*$)G$`N+g5w)|x#Pfk=6pCCB8RSg(hjJv4jli7wRXWN*Bg@u5nNSZE!qgnQV&
z$$#mfKbv>i<JL4JqvYxK*jjr)`Jw{=)|w5!sA7*>;qE96rj_@_N1-7Frb+3yg+Kw_
zlx~m+{89*-Ix<ZwV_*Tzl<pZaP=J{pPV@0=GU945jQ5bld!T(%b%GNDa4G(64UjrW
zV7PIKE6PJsZeptSe^7Dp@$bK-lL4r?C4T@QfqLxA5gwANBV)t+gFLYff(fRB#r3_P
zz-Z{SltPf%cN;E&si+=1lH`6GE~yk~pHv-d&E6sshv>JKB@jvs3SxQ`7*Oex{0A<x
z+-Wz{Rl<P_C5<lachv?9xk-fDU{53f!v)iGHstCw$uO{hXGoW1UmpqF*O{y~-G2^%
zowy_OFboo|XUNzMI}SwRQHXUgcgWt0KkWUjs?Ixeu<Ijq!0TKzE6e`#;j>Xc5-^H)
zDI+T`{b)tQ$DYGs)RQj&00dKAF5C%(xr|1up$m@7^JC|`rHwp*6#y&umNw|0v!lk1
zu#CWi^}RBHp8<dfwTm~;UWCWL_<t)Vy-U76>R>b?Pp(rOn~&ZX3qhs??h~j4MlsaJ
z>R<AOg@5}^_kbDOT5L3XSRV;`?fO+WvlAsZvKDe%W%v9|Wru}aCPEE}uM`2j9@a-}
zug!3oP-7`KFPfFDxJ60)uLe=cD#<-@l)SV_?kjE+{{znpa}q00yXOD^00{s|MNUMn
GLSTXvdu>es

delta 1253
zcmV<B1RDFm3YH3xL4UwWL_t(&f$dsBa+^pLeZK)EyKsY$wIv&!Ao3056U08j$W<PV
zcCmLZ#Z~g0z|IM*8;ov%V#(`}6Aam91oY3M0V7$U26=3!DsLl-hR^%mzyIssE#Nnv
z7gXh8&mA}o#I}ssUTup^({E4DeLXup+l)+iU0W49fQAFJ=6^|t4C4b>b^&@o{2m;H
zB7E1LUIu0MJa^z&GWN=C!3WVKBs$yVj9L7lp52HWS4`-F8G3{D+6GYS0PrIKtWAa-
zFdtgXhx5I^u0#6oxTs^+vQoVy{{i5rI~)+vgc)PW_)aVz7>mqkx~cc`_RT1A*0mXe
z_L!){jBf6>AAbt5ziu=hIN-TG+ma10B~Og;!Vt$*;_@-zxdW#W%MnxNh#!hYd$p6q
z>Wdb?8X+Oiz}e1hc<|KZ0iZoS_jhK)0|w5LTTUZxT&+I0Gy+NJd<9g`@63h=Pr!8}
z?ppnubR<~H{nq?qlC~|4fW`bVy<QmN_{kV<fa1ad0Dq8Se8{&ghY)iI0EjStj<6|0
zdwT8@(F6cgI=@GjMm=}nKuQMyh<Q@=BV{6&M^&Lp!HhA0E<m>D4xH3R=71SR4ul$z
zSn?NL(w3Be0DK53Z3clvxn5W@4m`KFQSeqF8Q)XW4a8X|6$;rV%$g@1lJSjF)JiK7
z=n393h<{}OQXQNh<ysDS?!X}_uK*}R%o9NvM@-+=iCi8^@IF-{Uxr!^B-zRVlvcE6
zpH3f(P*pq-GA-O^0>5=TJbg4aHBi|B&mB1FN>YF?AA^MF_H1RhIx+_$Gny)~;2<(h
zzvzYhA}nJ1R_CL6s7z*kwPfshZm%!}7xBv+Xn#*HgHRZ4wWin0)0-x&4pfJb4Nzf`
zQ^wC+e(2?>?>emGS8o!(AZVr0d<{!NWW!8CxU=TTRs@Rd=`J}oN~mTH`#(Uh#?}a-
zACIP*)$w{`r)e!>@-=KS<fEkNn5CT7=2v1*x5n0*14%6U05EHwfRa@!OF7L~M|H5R
zy?<Xm3oSXYjif&pG6!@eU6_=`C6m}XGi_@lb3j+p7cephOyalOe0<eL*%}O3A0d_J
zfSS;1hd?gxp49>qb&{)~Ot^|7q~;{1YxP5&`EI{g&jv8x?f0@RL=xk&XNw}FRz(&H
z@wX-8!$h4&cYFQ!#5~a{DVc<A62DDGuYZ%=_CunxlGh4R%YpXv+@Cd14oJ`y0EZb}
z26Y7iY2jT20w6&-3FUw#AGL3XejP5^*Q#ch*8E};3b7BO>vT?30|x*uLt(VH5yNZ*
z7BB(}5&$3wZ**QxCfyN$qp~gYJcLQX0!HbCT?a$Zo=mRu*=lJmG~fO6Uw~{PjDL5&
zyo`<A6nA_5n`FZK&D-I-^!{?dCYgYlJ1<F*J$K;TXRBn7G{KSs9LJy471@ngj_^W|
z=dzlumK<o!FD9fmQNe`nY`1^<Bn(S1+wGrbr!+*@t8?d<KVs56<Wpw`#5^h5xvsNq
zzItBFBy2%=Lxe6fcXDN{{vlu9xL(DtMqobFqoY^D-rLu!wN(Txj*9FSDsl3{k>?K1
zEas2N>5WrPtID={*?BPsATj1R{@mOka+UvTP$X7W&WVfc)fKtlcuxET&Ni5eg3`xh
P00000NkvXXu0mjf)2~nj