From ce75ba93a48203833734989e5b7007fd1e911435 Mon Sep 17 00:00:00 2001
From: davy <davy@example.com>
Date: Fri, 4 Apr 2025 00:10:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=9F=E4=B8=80=E4=BA=86review.vue=E4=B8=AD?=
 =?UTF-8?q?=E5=86=99=E9=85=92=E8=AF=84=E3=80=81=E7=94=9F=E6=88=90=E9=85=92?=
 =?UTF-8?q?=E5=8D=95=E5=92=8C=E6=94=B6=E8=97=8F=E4=B8=89=E4=B8=AA=E6=8C=89?=
 =?UTF-8?q?=E9=94=AE=E7=9A=84=E6=9D=83=E9=99=90=E5=88=A4=E6=96=AD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                    |  36 +++++++++++++++-----
 pages/index/my.vue            |   2 +-
 pages/index/myJoin.vue        |  41 ++++++++++++-----------
 pages/index/review.vue        |  57 +++++++++++++++++++++++++++++++
 pages/index/scan.vue          |  61 ++++++++++++++++++++++++++++------
 static/icons/wechat-white.png | Bin 0 -> 1833 bytes
 static/tabbar/scan-s.png      | Bin 1290 -> 1302 bytes
 static/tabbar/timer-s.png     | Bin 1119 -> 1353 bytes
 static/tabbar/timer.png       | Bin 1229 -> 1683 bytes
 9 files changed, 156 insertions(+), 41 deletions(-)
 create mode 100644 static/icons/wechat-white.png

diff --git a/pages.json b/pages.json
index 1ebbdb8..1ae9578 100644
--- a/pages.json
+++ b/pages.json
@@ -143,7 +143,9 @@
 			"path" : "pages/index/myJoin",
 			"style" : 
 			{
-				"navigationBarTitleText" : ""
+				"navigationBarTitleText" : "我参与的",
+				"navigationBarBackgroundColor": "#19367A",
+				"navigationBarTextStyle": "white"
 			}
 		},
 		{
@@ -230,7 +232,9 @@
 					"path" : "winelist",
 					"style" : 
 					{
-						"navigationBarTitleText" : "生成酒单"
+						"navigationBarTitleText" : "生成酒单",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
@@ -267,7 +271,9 @@
 					"path" : "beerCoin",
 					"style" : 
 					{
-						"navigationBarTitleText" : "啤酒币兑好礼"
+						"navigationBarTitleText" : "啤酒币兑好礼",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
@@ -308,42 +314,54 @@
 					"path" : "myWineReview",
 					"style" : 
 					{
-						"navigationBarTitleText" : "我的酒评"
+						"navigationBarTitleText" : "我的酒评",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
 					"path" : "myAttention",
 					"style" : 
 					{
-						"navigationBarTitleText" : "我的关注"
+						"navigationBarTitleText" : "我的关注",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
 					"path" : "myAddress",
 					"style" : 
 					{
-						"navigationBarTitleText" : "我的地址"
+						"navigationBarTitleText" : "我的地址",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
 					"path" : "feedback",
 					"style" : 
 					{
-						"navigationBarTitleText" : ""
+						"navigationBarTitleText" : "意见反馈",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
 					"path" : "setting",
 					"style" : 
 					{
-						"navigationBarTitleText" : ""
+						"navigationBarTitleText" : "设置",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				},
 				{
 					"path" : "addAiad",
 					"style" : 
 					{
-						"navigationBarTitleText" : ""
+						"navigationBarTitleText" : "修改地址",
+						"navigationBarBackgroundColor": "#19367A",
+						"navigationBarTextStyle": "white"
 					}
 				}
 				// {
diff --git a/pages/index/my.vue b/pages/index/my.vue
index 33b7f74..dfc6c44 100644
--- a/pages/index/my.vue
+++ b/pages/index/my.vue
@@ -349,7 +349,7 @@
 		height: 100vh;
 		overflow-y: auto;
 		padding-bottom: 40rpx;
-		background: #F2F2F2;
+		background: #f9f9f9;
 
 		.user-box {
 			margin-left: 36rpx;
diff --git a/pages/index/myJoin.vue b/pages/index/myJoin.vue
index b4ba432..69cbbc8 100644
--- a/pages/index/myJoin.vue
+++ b/pages/index/myJoin.vue
@@ -622,48 +622,49 @@
 <style lang="scss" scoped>
 .activitypage {
 	height: 100vh;
-	background: #F9F9F9;
+	background: #FFFFFF;
 	display: flex;
 	flex-direction: column;
 
 	.main-nav {
+		display: flex;
+		justify-content: center;
+		align-items: center;
 		position: fixed;
 		top: 0;
 		left: 0;
 		right: 0;
 		z-index: 100;
-		display: flex;
 		padding: 0 32rpx;
 		background: #FFFFFF;
-		// border-bottom: 1rpx solid #F5F5F5;
 		height: 88rpx;
-		align-items: center;
-
+		
 		.nav-item {
 			position: relative;
 			padding: 28rpx 0;
-			margin-right: 48rpx;
+			margin: 0 48rpx;
 			color: #606060;
 			font-size: 32rpx;
 			font-weight: 400;
-
+			// margin-right: 24rpx;
+			
 			&.nav-active {
 				font-size: 32rpx;
 				font-weight: 600;
-				padding: 32rpx;
+				// padding: 32rpx;
 				color: #19367A;
-				font-weight: 600;
-
-				.nav-line {
-					position: absolute;
-					bottom: 0;
-					left: 50%;
-					transform: translateX(-50%);
-					width: 48rpx;
-					height: 4rpx;
-					background: #19367A;
-					border-radius: 2rpx;
-				}
+				// font-weight: 600;
+			}
+			
+			.nav-line {
+				position: absolute;
+				bottom: 0;
+				left: 50%;
+				transform: translateX(-50%);
+				width: 48rpx;
+				height: 4rpx;
+				background: #19367A;
+				border-radius: 2rpx;
 			}
 		}
 	}
diff --git a/pages/index/review.vue b/pages/index/review.vue
index 6d7fee7..af21c43 100644
--- a/pages/index/review.vue
+++ b/pages/index/review.vue
@@ -374,6 +374,25 @@
 					this.$refs.loginRef.open()
 					return
 				}
+				
+				// 检查认证状态
+				const barInfo = uni.getStorageSync('barInfo')
+				if (!barInfo || barInfo.authState !== 2) {
+					uni.showModal({
+						title: '提示',
+						content: '请先认证门店',
+						showCancel: true,
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/index/registration'
+								})
+							}
+						}
+					})
+					return
+				}
+				
 				uni.navigateTo({
 					url: '/pages/index/writeReview?beerId=' + this.beerId
 				})
@@ -398,6 +417,25 @@
 					this.$refs.loginRef.open()
 					return
 				}
+				
+				// 检查认证状态
+				const barInfo = uni.getStorageSync('barInfo')
+				if (!barInfo || barInfo.authState !== 2) {
+					uni.showModal({
+						title: '提示',
+						content: '请先认证门店',
+						showCancel: true,
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/index/registration'
+								})
+							}
+						}
+					})
+					return
+				}
+				
 				let data = {
 					beerId: this.beerId,
 					status
@@ -451,6 +489,25 @@
 					this.$refs.loginRef.open()
 					return
 				}
+				
+				// 检查认证状态
+				const barInfo = uni.getStorageSync('barInfo')
+				if (!barInfo || barInfo.authState !== 2) {
+					uni.showModal({
+						title: '提示',
+						content: '请先认证门店',
+						showCancel: true,
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/index/registration'
+								})
+							}
+						}
+					})
+					return
+				}
+				
 				uni.navigateTo({
 					url: "/pagesActivity/winelist?beerId=" + this.beerId
 				})
diff --git a/pages/index/scan.vue b/pages/index/scan.vue
index fc76afb..581248f 100644
--- a/pages/index/scan.vue
+++ b/pages/index/scan.vue
@@ -125,20 +125,43 @@
 		data() {
 			return {
 				userInfo: null,
+				barInfo: null,
+				isLoggedIn: false,
+				isVerified: false,
 				navHeight: 0,
 			};
 		},
 		onLoad() {
-				let a = uni.getMenuButtonBoundingClientRect()
-					this.navHeight = a.bottom +18
+			let a = uni.getMenuButtonBoundingClientRect()
+			this.navHeight = a.bottom +18
+			this.checkLoginStatus()
+		},
+		onShow() {
+			this.checkLoginStatus()
 		},
-		// created(){
-		// 	this.userInfo = uni.getStorageSync('userInfo')
-		// 	if(this.userInfo) {
-		// 		this.handleScan()
-		// 	}
-		// },
 		methods: {
+			// 检查登录状态
+			checkLoginStatus() {
+				const token = uni.getStorageSync('token')
+				const userInfo = uni.getStorageSync('userInfo')
+				const barInfo = uni.getStorageSync('barInfo')
+				
+				this.isLoggedIn = !!token
+				this.userInfo = userInfo
+				this.barInfo = barInfo
+				this.isVerified = barInfo && barInfo.authState === 2
+				
+				console.log('【checkLoginStatus】登录状态:', {
+					isLoggedIn: this.isLoggedIn,
+					isVerified: this.isVerified,
+					userInfo: this.userInfo,
+					barInfo: this.barInfo
+				})
+			},
+			// 登录成功回调
+			loginSuccess() {
+				this.checkLoginStatus()
+			},
 			openP(index) {
 				uni.hideTabBar()
 				this.$refs['p' + index].open()
@@ -154,10 +177,27 @@
 				})
 			},
 			handleScan() {
-				if (!uni.getStorageSync('token')) {
+				if (!this.isLoggedIn) {
 					this.$refs.loginRef.open()
 					return
 				}
+				
+				if (!this.isVerified) {
+					uni.showModal({
+						title: '提示',
+						content: '请先认证门店',
+						showCancel: true,
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/index/registration'
+								})
+							}
+						}
+					})
+					return
+				}
+				
 				uni.getSetting({
 					success: (res) => {
 						if (!res.authSetting['scope.userLocation']) {
@@ -187,12 +227,11 @@
 									})
 								}
 							})
-						}else {
+						} else {
 							this.startScan()
 						}
 					},
 				})
-				
 			},
 			// 开始扫码
 			startScan() {
diff --git a/static/icons/wechat-white.png b/static/icons/wechat-white.png
new file mode 100644
index 0000000000000000000000000000000000000000..8fda4213d8da44cdf93022986f075c276a365feb
GIT binary patch
literal 1833
zcmbVNc~BE)6b~ZEVK`J!j>@uP#g@%xcN0hgXdwZK0x|(Z)Dc~F7l@K<$gU(Hpdub<
zYef{TpoJ=mw1X6HL`4Pbebl2B6t5Ymil_r<XB6oM!S)ZwKe{u!-}k<KzxRIc+AWNW
zoyK?Ybl~xLd}WkE#jSwlwzK7)Om=n;w|KA-8aAFzVNJM^;)RiPG6g7gcq*l$a55|7
zJQc#@Su@%M4XcTXmJzg0fLn9~W}SgU^LQas%?6xUM6p0Jm8#W;f-jDp1OY7>3MPtU
zgfRv=m8Ol#Hd67~u?a->B0@@nQ>OqSW*KKdN3l3y)}`winK=|3uq)&CmSY$M22|KZ
zq2LEnnwU61P8%seED%G45D@`EQUM}HL=q$bK!pef3o#hMAOw{Or7}be3|=7T%}A!m
zREo$!Uz`*Qrm?I+2E!(kNnpYRv@sP%q*5s?L}3(#I1Px&(zCc3(lZl=EGQ_3Flr5~
zmevCni+D1<m<<IvrXNDk8De5S8rCy|iQ-ZQn{fk-2!yasXNhY-n_*SdzcfCn%_L+Q
zC|E@?^kO5y)gxuX5SYu|=N(xTIX1GHMlDwqJY7K(i*=NqRVqS3?u~%dk}?#>g+hr~
z0tqFg1QOvvDG*LdFbE3@#6=iFA(#{$vhyi?M5F=<lPkmsiYX8zLKH3*Dk8$AXrw$)
z9F9sOhp<XL!{T~^8uG2>d=FwppT)}LMha(XV**X54|PFY8qLy78f^gNa=<?ZC$xHt
zJlRsC4<Rckqc)QwBaO5U7)Y{A`w0R>id0Nt1O`dTKnxNQ(qst7ND-7m;0Q`cgt!P5
zgM)bT|0WOSNWqp)`A_Ez9dYew*?yb@PWU)Ul%5+OBR3~sSXFm(;}@+|ge90;niA(m
zjlsu-?(b?}xMc6On*q-%z<?!d3O02%-)#agM|ASjQzM>LB!Q>FzmB$z@&!SEM0xRA
zf@W=11Kz&b#WkK0CuW$Mdk<l`{hjsm$~-2SZaH7M(s^lWM_K<{xSK!8ZkT)iGgMbD
zpYqVpce%@|2L+|qV$Bi$V6@$<*nRE!Ry8-+GN+k#u9`cwqXiC2wr|d}_S+HJLEHOk
zw!d^if3SCY9*OlmnZ0ty3@Uk#`!K=2<&vCji3fU$D_<8%?y1RA3`cf>VLsnqZi%|&
zz|>xL-kG|4?7?F7rr`VK^r86><-S_|_@-)q?mB_3X{Q7CadBeHVzUf3&eOfABl=@2
zE2OO|TW{|Zo;H>4PtNW%d%kfgYU%f?yq*<&<xNM$S!!1LZxs=3jrNS~h0GAS-QkAj
zQ*{~D@L0F?U)fmC-^K5AZe3k}PhGHRSnImo=Ae!B@z>kCHZ<(BD()Xq*7z{2^Z2sn
z*~0aw|9lJX*;L{_s_&|B?uO*(_rbGnMfM-v(6upkPju;-vwq~(fGYN8)y2ly-P*!g
z7yDLqUMQi9i769`t@4nozVb(p)-|ln`TBsXG;6O?Lu*8KHwrTg7KX2=e}4HTb}cBP
z$}8U^FOv$KZx1Q0S9JM={V~35yoxSwzT?SS^GC-#<&SaRVtcQVX?5(it@b|nw@B?H
zdUf?NAKY`ms_k&j`(@>oV8vt4-68Q->#+6jUjJ+%OxliXX%8;CVOHi;1RU%7Db-`d
z<Bd0p#EsQw91`8uX8S-h?jjwE%-ouDzUpnLY~zbzOXHsZdaw5R$tCm9m!pDYdO}!G
z(kA<HYqY;txg>4MgI4+QgqG^-lD2O*ts$FAUjuV|CboI)7$3H!+pDeb-Lgl^RXvw;
zN8DxtPHOV+pBZ^%^YprLxuRbtyvW$!=d|t1(&JA$U%TCISUR;gDfQMI{|=jyF{#(D
zj%4fBUr+~3w1qPyMV^x0xi$5*bxMsO*wrJjsH!NwEXwKuG9$?sPv@U-OmfuL$oPGd
zbLXY`sW#dEtH+18o$gt_Ami5WE2Hys-I~1Yr$sS0>2E|CmzqzgO|A}h-=)L$$@O<!
kmipBuO>%uVKj7r>aXfYG?X7vxu7RJIG9p${6TTq-9}jc9m;e9(

literal 0
HcmV?d00001

diff --git a/static/tabbar/scan-s.png b/static/tabbar/scan-s.png
index 38a70949d70e2c77fffb5a51f46ff24871ab1c5e..b6581815607f93e17a1a4097de56762278bcb206 100644
GIT binary patch
delta 1288
zcmV+j1^4=j3YH2XiBL{Q4GJ0x0000DNk~Le0000m0000m2nGNE09OL}hmj#5f51sZ
zK~!jg?OH){n@ALWzX2t?aD$MwB^#X}@(tt@#6H2uRUVCYv3D-TRq~v`&Izm=jBbEp
z$?K344B2G_^v|LJBUzvZd2FXDZzGC^&->lK|Lfl^;5VKZROMmM9XJidwv5<bZHr9P
zZ%@yCJv%+yj7)c3TNOKih6A(ae@TZ7;{#ZB0eV3E9vp-seAk{{24(g<ci>nu_R4L+
z2hk)XI@{!oS^S}%-H01kOz46cdV}@a22kn%@FM`MO@<sWA6m?Z^S!^WL;CNysAJZ$
zQoSVq0pO@R91zij8Dq)#PAnf7i_B=csrU2t%_wr#wHbo;n5e^yZtk`pe+sd`ZZsY^
z;JH29k_|5<PmJ-x5XV*G@-g7K1E&$o5mV-fABshLwUfl^ix$5cAtBGe+0JZu@YLi1
zpgleJcV@!_2F{XOP9ttytv<Ij0!iq61ys-P%!UU~z;z?;TK$`JBv{J**8F0Uwk?f-
z#r!e7UKrx|$rx^c;=%y{e~@8($hR$r5OW6rh%kPRuqi@&dhQd^1OQYzzekovJ$K+h
zN(TUlc~bQwWg?eHRiR43j4^;NK(^-&oYY3<fEh&&gc^`o@)upwmXv=0d<ZFR27yGm
zURW{?Jh!(|@Kzxi-&4~K#91d53fU&inkOBS@r_c{N-GlR3Enb@e`Nqt9h@KKS`K*b
zz#%EG04PJu6G0e9OyAatTpmjBK2;)LhFT6J*~$TwR<vfHP9KX<RXh+fE!<}UzjZr2
zeKa;TP}u>`9XRPqQh+ZXgM{byY-P7PG6y0vnkup2ATmwA=!N_uEModr=c9S3OlEzx
zWbAovuP_A{@yi@&e@`!iP#A5srq|2Un<lIdRELlaP+^f%#?M@S=;f&II;`VYZxX*C
zXr<A74NF2~!%RZBv*yWG1d8nGE;%+zsAdiOKR~a>)(D{=kEWW{@p@yYX)R*%HEc5E
zqonDWrJUC0S7J}M#@3nxNi6yRFl(NGl2t29In7r`b+E0ye_uWeEjh4_q(2uj2XrM}
zn3TmOlh`^lZEGWQKv&WiFfs>B;<wv;eAPzT8Vpz;A(iKVn$T*8KrZi|)dCZBlB=Lh
zxQZgA<|L+T^+TQcZogO01~A|4_p&WS663OGiz1{}MHUM2w<Y7lM4d->d;RysJkcpB
znS^Z;zfDH3f0NwyL!z^i*9uX~f%f#=pEXYoNYE7khZ$W4bp-)w;avm*AVE0^<$xt0
zwQq-h9WL3|s%Dqg{9+Ocu@9o_bWT(Q2LLWZVYIgq!)yc=Faiq_03Zl&bY4y--4TGJ
zvMuvGgh{~yM(KoI2Sd=FOs@0UYH2Mr-~IDnfNUa+e|NsTjE&tCcYFPtWWxK++u^(P
z{&K)3nShx)FG-O-ci`M-t7MNf!IA?U$Dh>|*^O9^@IsL1vYM@y9B9oiCZsk|!G!K?
zw}1L13`;QE?Vo0+G(^{{bLW>oV$wY1Q)dRmJSp0_uCr~vdS1*VY(aQKgf268a%HUk
zAz$9OUd69QU_R8NqgTV;+t;hLRRk=KitH9Daq_~E=MK&+=8wtgjZ;pm%C>pgc`*kd
yG3Ge_+}t2?mH%o`Bvw_<iHq#j6}jJdPW%MUHkgWn(#K-}0000<MNUMnLSTXrBUKat

delta 1276
zcmV<Y1Oxk)3W^FLiBL{Q4GJ0x0000DNk~Le0000y0000y2nGNE06P5Ha*-h*f3!(N
zK~!jg?OQQ&<2Dq1pVFYPXB4L65Gt@Y(4JuBF5P-hu)2YFyQIqI1hG$G?G4sly4WYM
zZm=jsS*gOzs9BDTpTeL7QKT$cBrVx`jRE5ee2*U_K7dc)fCF9>sEkgOQffM#DrQyy
zV2tsJ$ls<<W{y42i`~Cb6b-iJfBGcB?RLA%%<lnon7IRBD{&hjCZYi|-w@Har`&*z
z1czaGN<?SO+}-p-Re*@D0ep?3sK54a)-ei#KzW|`Hvm;&5);t?fKKbo{NK7Ha)}ZB
z1i)uzpNRZNMv^whoQ%g~UC=)7_b~%0<tJwTJ#(>`i2BTYBZL@etslKme;Kehz60Pr
zfL^9KCZa#0C^}!&$4bFg?4NF@04{_O=UVIdDWuCn5Cp2xXml;VnKOv!^D5DWg6-YB
zbvhduV?L}iZ0bbL;}#oZ-WKuniaN5Lq++!YVy$PSZj8rcErfUrAbn%|mU}L81xqP=
zSiEB=&pm`!L2DfwV?N;Fe~|+K6^7wyo^6qbKc)pD`n-#t&BAiLNb5v&mS?vlSW4M(
z=h^%F`|I-QRRbZ!IjonNx!Z2HyIGqh!OZLqh5kNxH-*+ZCZc{?x6$ANmIM>gJEwY8
z4YlgP%r{Q8lWouQ@XW{<vvsguH-r!~&aRde3xcJTZul1O({N5<f1|$iZS5<il-s@_
z*j>`u*til%DSLM6s{}6h>2#{xwx(M##>@mWb0zbxl(NUnm$r;eRyrF%r-gKlo??}U
zD-rAx$dai83xZt_WBwfMBWBz)nu<NV?Rxe(;d0MzHDx{A$HVy7w*2C-@Y1r=(3|I>
zQV$B3hc6We!7m-nf5%PMhYc#!DjOnt$ION8cFU&c*y}QblhOpc5!5QI5(~_>mXvE>
zW<>V7hqT@Lykus7(;dnviuzK@N5e%sq`O7!#+Z}ZhP3B-y_5_QodQ_7sh!0-#KJKA
z0-#&eZg29JO|H8M3WxNzr+>SOSN9Ab1iy5=Zo%%hjy<2<e@nRBvs+aQf<4c38~6Dw
zJ>#CyRR54BBAr(*6U<z=8MzR65RrCbT~!5{G$KpORb0cSNB~&&@PgoGv#FCL0g%6I
zUlyton!@Ft_3%;#Kp2Mq!af5+h&OfRZ<GbQy!>vf@n|&q*=^4|Oq=c6CrMJ7m#czJ
zdI6AsdXo3jf0`L(P7?P8vm?^XNg{xJ56_NBnYpKw+MDSq2m%Esor#FPWo?!O4~N5R
zo8blkev%}gD&ki<8jVIbEfdjoUTR|QJj~1&PW8;*xt&H31S*qL_BGG0Fi$HC!|#~S
z#RDP4&Svr`rTipGZZYSpN25{hfkI)VWsEt&{7|Zse<aE6E_yl$0+l35HZkp_$i7k3
zFqur^R;%>`z%TY+J`wd=t=2!s$H(zxGI>^SE2aFSqoZGm=n_s;NJPKg-QE3F^t-1f
zmjXZ^z?Cs(P*-Y%Qc5LB(y<$XJuD}@ZkJq|V%_v%W{&MadTHsywyJ7NA9i8$GCuB7
zf;cl@QjA8UrTMn-H&3~c&DJ}$L#y^r000b#=xR6|UT@k#DIa-ADLX{uryqBe`H=_k
muxxEMn|j|CG6x(`1O5jl=TINCe<y1I0000<MNUMnLSTX(N@|k;

diff --git a/static/tabbar/timer-s.png b/static/tabbar/timer-s.png
index ea11ebe3da406bd47f01493eb883d2d20064d35e..2abe34fd71cbaaa8154ff5a9f3cfa2950f1a23dc 100644
GIT binary patch
delta 1305
zcmV+!1?KwS2+0bNL4Wf}L_t(&f$dqbQtL((J$HEsW@z-f)vCz8F9>w$FkMo``GRM@
z0Qdsn3k+WXl&K(9N}Mho{sWZ4vO4sJCW!Ig6yEidg)GS+lZG>+8C$x$_Z;or-Md%7
z2R`s7&?-8WQfeZ)Afjz%PKjt}j5$h@Bx>7N>jJ_s>@jm6fPZgqrS^A9M0=yrXxOGd
z(Pn3s`~?7?na|=lCeQP}F!PzccN>P`cAGw1Ll}lVr4-xir1)GZbz+}Av?-#M5Yk%v
zS(ZK6zo&5=pOo2IVaJ$;)wwa|vS_pHJZU6AN~whq#{jwj(m0O4lsvx!aK4DVLr%mZ
zq|7{I=KUsOYJUY-a<>4qy%l+$w-ZHCTGw_Flu}&)UzzzuC=t=jk1=NN%`2Bu>RKtq
zK@i+ZDRpgwH$rRe2SL!c^W~z>zIFtZQV#%p&+|UN<*hG++?-0|IR0E^+hiH_0pPvJ
z7kv4ZhG=;oSOl$gEs@t^r2<?mXIb{pB%WV`l?hNvoqrI~VeVEh2!ejwekujzhJLB|
zw>#}I02pKTh-e1@h^VtfH)(-GDJlhIS=IpnW-d*@wAQ|qvLmJJxb#44?c00^%zTz4
z$zTc6GdQ2m&(GZ|yM+QQAs4rQ6rU@lx>=Up3n6ZW5Vy>Hr<A(SvaAna8$h(Nv2h9j
zlgZ>q+kdQaCMtxuvO@Y*xl^ftFbubu`4-b<>~cIFpA~If%FN6IW*z{DFx{<t0AP&S
zcgx}0+L|NqPg4P-(dZJuDQdFV7aLiTd>qI7Wet^53;=N)695E3@G}wpX~mt5$K#`1
zpM7RN1Q0QEG;>arGV@<$FDU2d1U3OIJ5S7wfPa)yHz8jJX8zayOkL<WOeT|a*byS4
zj=KPKiKt(-I@#pVjl^{^otYD0Gfp4C%`)T*LWad%J4uqr^Sm7*+A+rLxyup*5mio9
zE8-G>%Zg|CRB+xQA{b+i&@!y3x#5>mMnZ^VX0B~dMCZ)h!*qd|K@^PKq+8k6Kj&PC
zo`3Z_sI#3+CMf_g^BlM0Dm1i42dyxy0W<FcfHCH(&Q=J~2VRPu6JU%v#dNau%FeZI
z!j@h-0MgCP&C313=22Y$spUAsoPZ=rA|m<?({22Cl_H4fSNrp(Dpj}Sd$7xB@r3qb
zBO8rILn7M4>P2*c>hLL&FRLk)?!-kAVSgC*>evV&d;lP#pX`};A+*+hUHAk+a9Brv
zp@5u-BLFbQd@V5<0<$yo1-@4rHUV5$joj1Ile4V~9~WZ#Rn@#tiyi>L`uh4!mSq=2
z^db*o<|}(Y|F$ClSD1=94uW7;2r*>lZ@G56F0HN#ALrBayg?PmCWrdDoF|Vk41c#>
zrYVH@W{epoNfJpZJ3@#Hd@se6VPOHR&Tnf1s$eS%9cKQ4i1L+%p%dDM-^vhr3v6uP
ztg3&9cd1IO5={g&I-9nMWzOPF1l$1ArSCmNNGbKx)6=#6JE*f?y11J^QO!Cb8UnbA
z<M`DvZzug7az*4O#ofl`b@$B+)qmx_%B2yQ9T5+VF*`+aN~wF>|BW%`w3YID5oHx>
zo7W#$=S@Cv;601QjSz<6wo>Y$!6znel3V>R$cqSqpzkJquHN4|`Bi*o&6j1|CstsZ
zRUX-TPit6fvoipAe0)r{wzhsJBF)S`5rLWiX69eU<ME(ve;@e38}T2b1`?FB;^g~H
P00000NkvXXu0mjfSkQAl

delta 1069
zcmV+|1k(G-3f~BjL4OHJL_t(&f$dqba@#l%eM?L1#8IgcRNxbIUAiz|VE@6%UyxjP
zSK0ak+g}j1S4A$bW4^%tgTu{;v`fy=#SJZUQv}q(5+G6{Bb{gRDuCSO?gO#FVgdZb
zaY1c-L<liqX1SALA{EE+tf}oz(+_CpKkur?%n(ALDG9HM@_+vUZ+;5Bd9?BeOh_r^
za=DbuEQ_M(1AymwDG@1VPUASfZ_{2Y1V*D#$jqnAJOR+J5LW;q0JpyHM@p%*iS0%N
z27`h0Jns(GPP?Fp=q8Ti>wSG_L|`}^UIMsSdz=!{J-&~0Il6rSQU|)Ud`c0~bf2JZ
zL_i2JX67#dKz~GYBD!5H7EzT>Q4}E&eZ(f2X_6$DyZF$05bpxL{9fQSk-6{t=XGP_
zs008&O4-lz{4;<v<MDlxB)`<rKdB=mgqQ?DFwU}UrzNnCUYe%=W?A-Uuh%00p?*9F
zf}o#e*<V#QDhcR7y#jC+1i?RbNf<d&ExjzuqBRoldVjqhWmy(&)7zR04F&^=%~hrr
z%+#W8nvo>QB@vlR>V@{fiLC@Y&$}|Z2gzOHIR1@@qOyN-a<VnkbrKLlj9~;;Q4}BA
zaIg-DXj-<JIUJ2fp-a|DfSErU-Pz;gqiV&w8qj;m%<#oIjjaTvlzjk`vR@R%)F$^M
zK}0uYn}3<d+NTXz3FLVm8Xt-dIr=4Z)>_)_FPF=)P0mVyh~69BR@2{IKt%Jh&CI7Z
z8CMLf*b>og%YM}cGk-PO(k5diz|5=p*6DOq+m6)*5t+87O~&;HOyNccjwa}KyQb~>
zL2L@|dtx$2Z*3%NLn&qINt=v|z)Dd{X;rL39Dm0%B049c^L=;lHQUN2<0@>eM*aEu
zdEet=<D%7?ZR<>^`~$nzd)fpM^^JCY0&Da4y-ns2SX=w8`;m*lYVBv{Gn>pIz|3LU
zcI`)20-a9h9{<fbsWa1qLZ1UlyQ!;KU?rfGDoY~(HZs$L!1Fva1C5+=t`}xb4q&n^
zCx34ndh{m_UtYmUV6j+4=E-PVPTn>=&--F@XWQzjTaT14FE8h1o0&r)#ML(WHlS^+
zVy@~evb8Gl^z@YOQz_UNx&rdM@o4(+@Gy6X1E^6}$+9d8f}juJoqiPl2omdcRwBAi
zlH`vnz1o$z;c$2d<JV%x5}*sZGIs?dXn(OoWv=!eneY1_0GPk?EYI^hA;iR?QVAi%
zr##R9#%t&2+Ey*>TpM+i)D<(|c%Bzk-N1}Sqp&E75WufER(0A@RW6})E~T(}KQM;<
zU~;tkflqpumV1681#sj0{`KAmr#%g?po1_3aEkBCt*lT<b+zGZx7(c`^^VL2AtuC_
ni2Al$%1)=F){cok@#gUju7k>qvq}b(00000NkvXXu0mjf0e%ei

diff --git a/static/tabbar/timer.png b/static/tabbar/timer.png
index 2b6064e04c0bf436d5fb37967b2643ba67703918..ffaccf35f5459195926a74c7b42b349ff4957a6a 100644
GIT binary patch
delta 1638
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

delta 1181
zcmV;O1Y-M>4b2IVKz{^xNkl<ZXo2ln&ui;O5Z)Oj7LhGGU{gnyO$`;!rGY|DuTXfW
z_Yd@6?Ww(_r$Qm8JSa)s;)g8@LhQ>5gJo%_he%>^S3fK(Nnd&2Nm_Px=F@6-XTD|Z
z3*Ht`#~`+CPlOQWAvTD}UDtg$*7wl_;^5y`u|>q2V@cpK#()0>eD=T4XOCKDK*r_e
zrMcN`Od&)I0CdI}Bcd%L`a+1U>$<Bt{nbKXG#U+}C>jI6L<rHybqK(P5FTS})@rr9
z>2$h1#`jSKdcB^h>-vvHL1#J#;E4Efu~^(yjo~N)mStTt#;)ZyL=1>%g@{}T5yWkc
zc#*e==wFK+0Dm|D+*VoCM-i}XyGukL;@3}_rp@N_`Lf6c00u&cZxv*2J<q#6B!=1-
z@gcBndqPClG7$in8HVv|*|nj)TzJLcoUi)*{-0qOo-@YI<L2|-Za4CM|Bo_blp<i;
z_N3izcRA+=ZGmO%*6Ve|IseNvO~x1-#LY&h(`j(d7k@=Q3JF-2bxlOy6VbTS>F}~7
zk{qe5o$vdeOoE8|rfD+Y_q{y3++3*F>zQnCmnjQ5wJ4irc%FBQi1L<t9mkM~Tmp?o
z<6ZI$0I!m}xUTyf0Hj~N(P+HS>z_#=-Xh1zdk_Ra)e&GBXquL8r9@<nMx#Mi-%J8g
z6kSP!JbyerJ@NWN%*T8_UlLI|+ffu{{>DlIj^pS6FiGCSFg)mRsRNp(rE38Ix{l-M
zs(wlWzVBO-vG<x^KY{DID*)h(F(!m)Y`5F4s-KboBFg_<t?BQ9_>??EQ8ZR{$XWv_
zTTRnuwT5&6gb;FG)l&6Q5+I^9JvI#E)qkG^nt!IHzExQ)W7)q@+Bu4%p#IRxq19@o
zz5zg4b0`VO1xnS52@$#K`4HUS-&dP~Wc4%lT;o=8?z-*+BHkRM{m8!Mm}H!&8i^>K
zI^Xvzm5Yo$lc;LD?^}*ZM&S%ZQB-LL>Hs39hZg{pC%_o<r9m?Dke9~Z-mg55lmzzn
z{(rCQ3+XTrQJN8CokvOnx~{JfF^C5-ZQE8J<1dN04(KxWtaN0F1xf<b>2ym(>6FQt
z>1*NS<Rr~Ni6~R)$V{i@oE!iqc{zFA==FN0oDBm&W;UEjU_PHO<;o~8C$Af)r>BY5
z#E9r2PfyJ)DT5%mkp{AC+kThRy%xki(tkBqREy-Q5}VB?sG<~9MXZ2)CpFzZK0eO!
zYzk!+-}k*vr_&&!e%v&82@?A{D<a-4m&@Oa>`Dn+ob!cgnq$V85jPFm?RK}{?=RNt
zbyOwb1dikAhGG0bMDk9zS}vDAm$5G`EnZw){Jk#$hGF<kyWI{BRqPTBhr_GgZh!Yd
z2=P_Y1^}~Wv-wNe4|A}%tCG|cou7!7MK>^`(P$8cp#=bwH&dros&YEub0X-g?gs#%
ztGWz%v-^SJaCnuW^Opi5211CtX0!RRYT<PB{ea^*dMv|?5z#6lgNOkD%!p`tc6RpZ
vP4CE5ux-1Gh`Q>Q(l87zmx*8Se-^+$rnNz42Dvq{00000NkvXXu0mjf;{`=+