From ee04a02cb6d0925ccb58be3eb7b73d2a70871d26 Mon Sep 17 00:00:00 2001
From: linxi <linxi.jiang@jeeyor.com>
Date: Tue, 3 Sep 2024 17:27:07 +0800
Subject: [PATCH] =?UTF-8?q?Style(=E8=B4=AD=E7=89=A9=E8=BD=A6)=EF=BC=9AUI?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 assets/css/v12-style.less       |  13 +++
 components/CheckboxIcon.vue     |   8 +-
 pages.json                      |   1 +
 pages/cart.vue                  | 142 +++++++++++++++++++++-----------
 pages/home/index.vue            |   2 +-
 static/tabbar/icon-cart-hot.png | Bin 2292 -> 1027 bytes
 static/tabbar/icon-home.png     | Bin 3212 -> 656 bytes
 static/tabbar/icon-user.png     | Bin 2516 -> 934 bytes
 8 files changed, 111 insertions(+), 55 deletions(-)

diff --git a/assets/css/v12-style.less b/assets/css/v12-style.less
index bf38100..94dc2f5 100644
--- a/assets/css/v12-style.less
+++ b/assets/css/v12-style.less
@@ -17,6 +17,9 @@ each(@colors, {
   .v12-@{classname}-text{
     color: @color !important;
   }
+  .v12-@{classname}-border{
+    border: 1px solid @color !important;
+  }
 });
 
 /*===================字体大小======================*/ 
@@ -100,6 +103,8 @@ each(@colors, {
 .generateRadius(100);
 /*=========================================*/ 
 
+/*====================flex 函数表达式=====================*/
+
 .v12-d-flex{
   display: flex !important;
 }
@@ -110,6 +115,14 @@ each(@colors, {
   display: flex;
   align-items: center;
 }
+.v12-align-start{
+  display: flex;
+  align-items: start;
+}
+.v12-align-end{
+  display: flex;
+  align-items: end;
+}
 .v12-justify-center{
   display: flex;
   justify-content: center;
diff --git a/components/CheckboxIcon.vue b/components/CheckboxIcon.vue
index 1ff67c1..e50fab9 100644
--- a/components/CheckboxIcon.vue
+++ b/components/CheckboxIcon.vue
@@ -1,6 +1,7 @@
 <template>
   <view class="components-checkbox-icon jc-center ai-center" :class="{'isSelected':isSelected}" @click="change">
-    <image class="icon-hook" :src="webUrl + '/20240109175325131970.png'" mode="scaleToFill" v-if="isSelected"/>
+    <!-- <image class="icon-hook" :src="webUrl + '/20240109175325131970.png'" mode="scaleToFill" v-if="isSelected"/> -->
+    <u-icon name="checkmark-circle-fill" color="#C52733" v-if="isSelected"></u-icon>
   </view>
 </template>
 
@@ -43,7 +44,7 @@ export default {
   width: 32rpx;
   height: 32rpx;
   box-sizing: border-box;
-  border: 2rpx solid #D5D7D8;
+  border: 2px solid #D5D7D8;
   border-radius: 50%;
 }
 
@@ -53,7 +54,6 @@ export default {
 }
 
 .isSelected {
-  border: 3px solid #FD5749;
-  background: #FD5749;
+  border: 3px solid #C52733;
 }
 </style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index ce30577..50f12b8 100644
--- a/pages.json
+++ b/pages.json
@@ -836,6 +836,7 @@
   },
   "tabBar": {
     "color": "#8B8F99",
+    "custom": true,
     "selectedColor": "#FF564A",
     "borderStyle": "black",
     "backgroundColor": "#ffffff",
diff --git a/pages/cart.vue b/pages/cart.vue
index e4059db..f764b2d 100644
--- a/pages/cart.vue
+++ b/pages/cart.vue
@@ -41,49 +41,51 @@
               class="store-cover"
               mode="scaleToFill"
             />
-            <view class="mer-name">{{ item['merName'] }}</view>
+            <view class="mer-name v12-font-24 v12-font-bold">{{ item['merName'] }}</view>
           </view>
           <view
-            class="flex ai-center hotle-btn"
+            class="flex ai-center hotle-btn v12-primary-text"
             @click="navToStore(item['hotelId'])"
           >
-            进店逛逛
-            <image
+            进店逛逛>
+            <!-- <image
               :src="$VUE_APP_RESOURCES_URL + '/20240109234706982937.png'"
               style="width: 24rpx;height: 24rpx"
               mode="scaleToFill"
-            />
+            /> -->
           </view>
         </view>
         <view class="good-box">
           <view
             v-for="(good, gIndex) in item['carts']"
             :key="gIndex"
-            class="good flex ai-center"
+            class="good flex v12-align-start"
           >
-            <CheckboxIcon
-              :default-state="good['state']"
-              :mark="[index, gIndex]"
-              style="margin-right: 24rpx;"
-              @change="onChange"
-            />
-            <image
-              v-if="good['productInfo']['attrInfo']['image']"
-              :src="good['productInfo']['attrInfo']['image']"
-              class="good-cover flex-0"
-              mode="scaleToFill"
-              @click="navToGood(good)"
-            />
-            <image
-              v-else
-              :src="good['productInfo']['image']"
-              mode="scaleToFill"
-              class="good-cover flex-0"
-              @click="navToGood(good)"
-            />
+            <view class="v12-align-center">
+              <CheckboxIcon
+                :default-state="good['state']"
+                :mark="[index, gIndex]"
+                style="margin-right: 24rpx;"
+                @change="onChange"
+              />
+              <image
+                v-if="good['productInfo']['attrInfo']['image']"
+                :src="good['productInfo']['attrInfo']['image']"
+                class="good-cover flex-0 v12-radius-16"
+                mode="scaleToFill"
+                @click="navToGood(good)"
+              />
+              <image
+                v-else
+                :src="good['productInfo']['image']"
+                mode="scaleToFill"
+                class="good-cover flex-0"
+                @click="navToGood(good)"
+              />
+            </view>
             <view style="width: 100%">
               <view
-                class="one-t"
+                class="one-t v12-font-28"
                 @click="navToGood(good)"
               >{{ good['productInfo']['storeName'] }}</view>
               <view
@@ -92,16 +94,24 @@
               >
                 规格：{{ good['productInfo']['attrInfo']['sku'] }}
               </view>
+              <!-- <view class="v12-mt-1 v12-align-center">
+                <view class="v12-primary-text v12-primary-border v12-radius-8 v12-font-24 v12-px-1">
+                  <text>券</text>
+                </view>
+                <view class="v12-primary-text v12-primary-border v12-radius-8 v12-font-24 v12-px-1">
+                  <text>满100-30</text>
+                </view>
+              </view> -->
               <view
                 class="flex jc-between ai-center"
-                style="width: 100%;margin-top: 26rpx;"
+                style="width: 100%;margin-top: 4rpx;"
               >
                 <view
-                  style="color:#E92727;font-size: 32rpx;"
+                  class="v12-font-bold v12-primary-text"
                   @click="navToGood(good)"
                 >
-                  <text class="bold" style="font-size: 24rpx">￥</text>
-                  {{ good['truePrice'] }}
+                  <text class="bold v12-font-22">￥</text>
+                  <text class="v12-font-36">{{ good['truePrice'] }}</text>
                 </view>
                 <u-number-box
                   :value="good.cartNum"
@@ -113,15 +123,15 @@
                   @change="e => changeNumHandle(index, gIndex, good, e)"
                 >
                   <template v-slot:minus>
-                    <view class="num-btn flex jc-center ai-center">
+                    <view class="v12-minus-btn v12-font-bold flex jc-center ai-center">
                       <u-icon name="minus" size="12" color="#FFFFFF"/>
                     </view>
                   </template>
                   <template v-slot:input>
-                    <view class="num-input tc">{{ good['cartNum'] }}</view>
+                    <view class="num-input tc v12-num-input">{{ good['cartNum'] }}</view>
                   </template>
                   <template v-slot:plus>
-                    <view class="num-btn flex jc-center ai-center">
+                    <view class="v12-plus-btn v12-font-bold flex jc-center ai-center v12-primary">
                       <u-icon name="plus" size="12" color="#FFFFFF"/>
                     </view>
                   </template>
@@ -139,13 +149,15 @@
             :mark="[-1]"
             @change="onChange"
           />
-          <text style="color:#666666;font-size: 32rpx">全选({{ selectCount }})</text>
+          <text class="v12-dark-text v12-font-32 v12-font-bold">全选({{ selectCount }})</text>
         </view>
         <view class="flex ai-center">
-          <view style="margin-right: 20rpx;color:#666666;font-size: 32rpx">合计:
-            <text class="bold" style="color:#E92727">￥{{ total }}</text>
+          <view >
+            <text class="v12-font-24 v12-dark-text v12-font-weight-550"> 合计:</text>
+            <text class="v12-font-22 v12-primary-text v12-font-bold">￥</text>
+            <text class="v12-font-26 v12-primary-text v12-font-bold">{{ total }}</text>
           </view>
-          <view class="btn-submit bold flex jc-center ai-center" @click="submit">结算</view>
+          <view class="btn-submit v12-mx-3 bold flex jc-center ai-center v12-radius-80 v12-primary" @click="submit">结算</view>
         </view>
       </view>
       <view
@@ -550,6 +562,36 @@ export default {
 </script>
 
 <style scoped lang="less">
+.v12-minus-btn{
+  border-radius: 28rpx 0rpx 0rpx 28rpx;
+  border: 1px solid #E6E6E6;
+  background-color: rgba(208,208,208,0.39);
+  height: 40rpx;
+  width: 40rpx;
+  padding: 0 20rpx;
+  font-weight: bold;
+}
+.v12-plus-btn{
+  border-radius: 0rpx 28rpx 28rpx 0rpx;
+  border: 1px solid #C52733;
+  background-color: #C52733;
+  height: 40rpx;
+  width: 40rpx;
+  padding: 0 20rpx;
+  font-weight: bold;
+}
+.v12-num-input{
+  height: 40rpx;
+  // width: 40rpx;
+  border: 1px solid #E6E6E6;
+  line-height: 40rpx;
+  font-weight: bold;
+  font-size: 28rpx;
+  color: #333;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
 view {
   box-sizing: border-box;
 }
@@ -593,10 +635,10 @@ view {
     margin-top: 24rpx;
 
     .good-cover {
-      width: 160rpx;
-      height: 160rpx;
+      width: 140rpx;
+      height: 140rpx;
       margin-right: 16rpx;
-      border-radius: 8rpx;
+      border-radius: 16rpx;
     }
 
     .one-t {
@@ -609,20 +651,20 @@ view {
 
     .sku {
       display: inline-flex;
-      margin-top: 12rpx;
+      margin: 4rpx;
       padding: 10rpx 20rpx;
-      border-radius: 22rpx;
-      background: #FDF1F3;
-      color: #999999;
-      font-size: 28rpx;
+      border-radius: 60rpx;
+      background: rgba(240,240,240,0.6);
+      color: #666666;
+      font-size: 24rpx;
     }
 
     .num-btn {
       width: 40rpx;
       height: 40rpx;
       background: rgba(236, 236, 238, 1);
-      border: 2px solid rgba(236, 236, 238, 1);
-      border-radius: 50%;
+      // border: 2px solid rgba(236, 236, 238, 1);
+      border-radius: 40rpx;
     }
 
     .num-input {
@@ -644,8 +686,8 @@ view {
 
   .btn-submit {
     width: 196rpx;
-    height: 100rpx;
-    background: #FD5749;
+    height: 64rpx;
+    background: #C52733;
     color: #FFFFFF;
     font-size: 32rpx;
   }
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 390562f..190786e 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -299,7 +299,7 @@ export default {
     }
   },
   onLoad() {
-    uni.hideTabBar()
+    // uni.hideTabBar()
     const _this = this
     _this.init()
     uni.getSystemInfo({
diff --git a/static/tabbar/icon-cart-hot.png b/static/tabbar/icon-cart-hot.png
index 60aa99059101c1299d6a564ef79b82f499f7d30a..ce85313107c24fff62f3da918185b63824adbf7b 100644
GIT binary patch
literal 1027
zcmV+e1pNDnP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px&y-7qtR7gv;m2GHSRT#(r&$&soDWVb`mLb*&S}jd)?wy^wFLT9>O;_vO9LU0G
z@C6EWGWCN)1vlagD!31Vu5}h)s~vXk(<bU*1MA%Gu}#g?4;!LIWd^JjT$}XXzd50;
zX_vaS>H{Hg&v~BT^L_;Xvxu>8+jgr`$|iXdKt?Hb!t=bsf5DbSBC$;=^-{SplH(%s
z4aor!88Fa%K0h!tH1ykiq2f5sF%elhsdxrJRV5=N3E)QngCxHakwNqGJns|$b5>DI
z1V@!pO#nXfJa2s>k%$3^o6L!b4WLm(t_KjB!^R&Z2ThbDHOWjam-~8nc-S}#ab5Rg
z0Jj0y>3QB$m5kKZ)?OHk#cm*JU<va-3BGs^s1M+95Cm-o&<kJ#$z59Ohv$)FiO1u$
zN~ySrI3iMt8o*T|QfeNP6_cV)rPO^SyS3JB^8i%5T31&WtFErz3t$Dw69(|2QtFXn
z*nL{-_5T)N^c~09E+T1?M-1RerPK}ppB?VJBN+`x=gRB(v8{=brO6K;1+b0eK2w8-
z0PGThKDuY)CnQo3Oy%(Wj85GmNWq@vsl7EmnFR2<*tWgJvaD_ZC%<@e%R8d1CqSqv
zosrM87~XvlESSdlTO@2@@%^iD>GJxrj|c?8&Zf=XHv(821i^C#&}vy$AHdv~z1yFL
zl9xePQ(8a2djO~3KUgu6MVnTk=H4~s03YDirn{fr4B#dJj~T!U%d!rEEF3@ZN|NAP
zB*N2C`vLy^?i5&<xtb&#M)bNR5NkSEKu{op<gzte(*Uj^*(QyRjfqewq>aJ-J+Izb
zbH!ynVC8jj&VmTe_<qo`Y~{vY5xJx|*)7u0(6A&DiI^>l=bzcJuDQASZ7^6^CkcKZ
z9T{DH>#DW=X4rxtxJ4!hBWD1qRH~)Dy}c8_qH}s%@d8ix_3hh`PN$EUW8e3$HSHL3
zUAL5A+qUoO>gu{3z~u`A;Mb0hj`#Ze`#&}MV`F2nQop;dI||?;00UK3RXrv;k`WOx
z;5k?Eq!T440Tg`Sm*Tt8O7dm^6Q1W?Py#rPvtLBkEzs-A$s!MFtyh)+rVi0)^aTKB
z?_Vh*i_5eoNFJ|bMMPYntfk4HilzJkz_;V$<Bw;v*<a3D36A4DAR@0#&jEQ%Yi%B+
zvt-t52$BzKt#{9u_}N<Z_4ScRB=Sb_;lBsK_k}`XQznxs&B<(u$Ky^Y6f!ltItYRf
x^7(vQHk-}=BcSZitc#foXzn7JaSkdS{{=pTcXq;0F|q&v002ovPDHLkV1oJ=;#U9w

literal 2292
zcmV<Q2n+X#P)<h;3K|Lk000e1NJLTq002S&002S=1^@s6<5U3X00001b5ch_0Itp)
z=>Px-u1Q2eRCr$Pn|p9ncNND!=eK!60HtPXTXk9_trqIoqEsDgS1jZK1tD3a7MTvU
zs60l*jyP&tgi<RC<1m6Pv_PQ`U_)i-B%7pV$V`jVDFx|3tI)@Qk5&p4O5WMM_c-@v
ziAkE|-rXe+A@{G${LbC)`F(!p_qgYGA`Cn(0U6-XLSO(yJQ4;#41j3AC=5hIR}rC0
zmKa{I%p_}wX=Qc-$jnq?F^im>n1sXD#kR<{iwJcV&rs25L}!BJqVdI4P*fXHeHX(%
zRQD0CJR_hN3y}68Lcts)`yr5ffUFLkv_YFuc^~XjEVEjkEkAydg2*3^n8!e-0RNjB
z9eb<Pqin)zx?ldh`}D;CqeDc5GSJ!|U}QNkr27u)IV>}e({)>=x;pm%4&x)chJJ6t
zU>ao<YVxq{mZ&fYVy;GHE^v8kr&TMdWx7Nn=Po)B-E~N(PbvayCrEnS?q7%$%C@q@
zmllZ0lZTKQeHD>wTRN^Ep!S^-uB^DUK!idWQ2P`jCGn2egD#Nmkqws`hyYUi3y`Jp
zj@zgmLFC1L146|{^fb}He$uj!N;ur$$G3!!*jk)Foq&0=b)8U+A@r|Z!-0W1+xnw4
zrLUG<yK1~(Bn~1}cq<~?+U*`*Dt*^}2HXCXlvb?uav^aL#RXp=V4ea-d;NGnXjhbd
z)JuVsm7VF%pTt2-EBq7z*^Kbbe$Y`rE*!;*O_3c{f4{IGLbnZrjI{_ex;=*baj|!7
z4ijj)O`h59d_#BnBpwmB-#&=!*!>_s?&QO)ce>_Z#m3e>lt#vTeJLjn!Z}Nr`tPIq
zu=n?fe~){}vKi%15-wlp_4|o~a1%E#PXgJ1$YovvecWD;r3+<8WWARk34?GC*2P6P
zW8_IhM|uhLX}fY3jZKu&s=s*oktB#oc^GRwBDZ=8^l7{5TSRrd?5sHE<wtTLLWQ{?
ze?a)Imp~u4??LrD5{{ho@*_DAW5%R2B6m4r?(N@~M7o(wYp!gms_PLD?m7`F{1GC*
z0|tAE^ijJFEaUpIOJ&It=kIQxq$0uvQBpVo!$y!Ry+rz`y$<Yovc2L7Kl;go_;%rE
zNv8~v>--4yfz1ijE|GA>OMbMI2T@p<Ne;V#uOX83@Az>tDI4V-0?}J!>+|pWc|WBN
zXsBQ#n3)J^e#Cm$Mqfg6f_`u1QU$RHF%JUSz1vA2YPP*bN-O63uyjpQ1d(5W1e_$z
zP``q`W@lTorL=ORU%k{oOf9;WG^!D<@GIC$b`~*ftUOzJz^`6vAg1MCK_IXT;Y)r6
zd&N$9kEW&@Wmoq(h_=3@2Es|wNXFwpaj$gHw}`z5jZKyC3m^J@B{dLp=A?7>-zz{p
zzxVw*bb;(1p+*-<B+}&f_fi7ko-jj2i-6zuqb=0J*2R=YR(WNmF4)v?L6j6s!^j4Z
zVSefNu-z$ad#;pLgcH$8JtFRy@Hy<XGL#XC2=|<=9zg8bvaRy9L^M(d;p8x-c3C``
zo0*7s57^d#{YM&Wej~f~dfskb(5c~0kICP<oXqrvh|B=_Odq8AEtKPk{WQ%y&d!SC
ziL4JPpDf!F)leuK&RvCS9%?Q_HRWjY6)_@C$=iFR@itkF|B+4AjlSONV01y8)lewF
z;FIap<qCsOD#wWRMmf<(bn9}Xem}B0!b%B5OF81WE0N4EBa(+Y*(z<u)^`y83PavX
z*0JtJ)ddi(`7~+VgprXTgFqXw^-b*PK|Zklk?26A1|pO{5(zwj>I6ibl$}#^<<wp}
zHJJyob*1d6C{HF-y9F^V|0V+FK199}zhrWBopfBSTLUWgDz;ZvC$df?1;UMlsYQ9D
zsdESVjW#t^ZTxp@6pmoo_j0<iD$x<@3WOHtkHQ3=K=>jM=)}%O^=}||NVxov-$6(Y
zL}=Vqkhub6dh3Z&RS|KVFl{ncHp<Ju4+)naPGp2S>wr4f2*MVS@vS>kr@F2mFOb$W
z%j@#@yiUR(-1({JCSd}PwkZ~Iwy!r(Uc+z==-4(<QiF0IwfaaRXa7z?loZUs7)SSf
z{v(QV0MR2r9>^FVBmQn3mOW2)^ic9vgTX9vvlbxc0XLQ3G9s@d)=cL#=Z+e(5n*E7
zA?NJB0clty;p$qyq1w?-ox7B4a(|66KWj53_F(MUvbExvx^)|@bIKiC-&I!e@e@Cn
zb^D`Uy2(UDHd413a2#?{bWTUNN@--~c`*$Y+=ZC7*`YAa^>bur^;s{6x?CHaa)iv-
zN{q~jPYVm%UWQaWC}Avh7V1#JLd2|S1?7}Ue;AuDRXuRQqjv?fsLx)6$}bTHxe)=c
zkk&lq{Cw0<!DEQIJKia$Mqvxh=?nZ6b#)2C$(j#gIml035U#E~L%PhDr_0W0FqlJb
z_DbNMHfz*cYIKpGDVcag1cPaOBC7;r)&Rp>9M>o+RfrwN=Ia=9XPbm>J*p2exM5|o
zr@l6kb~l*S?f|&5G$FbfOZH$ih%gJJ<-ZEtHhwDG%N;*GpM*iU8li&gK-MBA2-<ZO
zzvGT_1hwWc`m1~WT)lOFewa9dfL)5njh;P&gILk&vg7$Teb^?K#ddcNyC$E2`90v=
zbaeqkPhqo^oQCzOMnlUWBNP`*AYe8DpX{cCr?7PvrI8B1TXs?r(Hg471w|O+tQ9wa
z8?Md)$2mJRg8mb99VZ*tN_BD{LY;1*PQ}ilS4s%zVpQ_t)5OuW++#NKHkPj8*!!Dg
zzxQr&UL!RS&U%qM=<~ohR7YXtW7t{`90mJDWaz7YOMv}^Z|eX!3+JHN4G_46fVmzR
zhT{CI#2eV`r8#g&o_o&m!}pUCh}Li|EX*LMA)P2`*h4LbpNn#JusPK=q1*MsnI`RY
zqZZMj&D<P`$`bdxBcUf{5DBUEW8(o3@xd7YF#w|dJROLLfrw}y5&s2*r!8>l^SA8)
O0000<MNUMnLSTXeKu#$D

diff --git a/static/tabbar/icon-home.png b/static/tabbar/icon-home.png
index e82384bd8226be977eff5619714f0aed16afe7c4..bdc7c0c96151754b4c295f707233f35167b1b7fa 100644
GIT binary patch
literal 656
zcmV;B0&o3^P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px%N=ZaPR7gwhmOp3{VHn1r=Sao)Z_%MH9R$JZAc%wRmD;J`q=QS4eqRVyjb^B*
zJ%s9Hu@JpK6ao=+w448T1yP*pB%(u#j^+p#l6&n}?j)wMP0|Vu-g0pFywC66`=0N;
zBf301&)W;&Tr8hgN>#ck<$5C9wynXzK@H$G$z8Gj2Y{(crQ+DO9j)cDCcyXoLs1mX
zlROri)Z_COa~6@;0JPTn!=E4>0i{xDYZ!(%02D~3VzWohW;35or<?V9eU9Xr7U*mk
zhW6y-WY`W`1@L`;B#NT@B=^V0p8;gG)=yiD9mg3ZX>|Ky-6sGOTI*M>x?g}|vA8>x
zO3jiy3xFchAUPKV!S#GTU+eS=%H{I*TCFxMBA1d*0X!HO7`U9tWWJl46@ce?M*utn
zuqS?+w<0o;&1T=P7XowNb=|`N%vv3d>%Wm4Q%b!{051THh=_U8simc*d$w&ix-m~Q
zaoWzuX-flmsgydA02Top5Rsc&>*-#M+qI74*p_7(kB>^J;da19t@YeS0Ius^AbI!S
z0+_S}L2%WwtR1GiD2l4pYV}s3Pzc()?W+TmdCRhX+Xnzfl~T_)1>m~wNs>=m%|v9Z
zee=bU?R^bA&l>`;0AOb_>>7>6crKUwx+xv>lB&Me;6K0&yJS@S-JJ~Jic;!MFYmlV
zit;3l$Ld*RE|R>q4661C*(M@00EPi9Dy0st3_I6#7f6oxY1*+&L>_CcPbJfINJJhk
qe{_zMv^D|~5%ZVvhU96b)R&*v7Ii4wQ}bs40000<MNUMnLSTZ!)G?a?

literal 3212
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

diff --git a/static/tabbar/icon-user.png b/static/tabbar/icon-user.png
index e921103e9cf4cb8996827acb30e3d4005a58d7d0..a0776095516c0bf178685ba95b4bc7522bbb1aea 100644
GIT binary patch
literal 934
zcmV;X16lluP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px&U`a$lR7gv;m0f5YRTzff_iQpDyA=^@tX^3!DukjHi&VuTdM9c`p<ZZ%Nj7`V
zNDBTy1dDa33Kk*7nCzUhOOReKsR~}G5DP^tDk}yph+bHG;U;Qg{R8Qe`P>s`OR$?=
zyT!SjIp6o3@8^Ao_@5tk%5SaROENDacLTT<z~2DA5|Q~_E;lzkJp5O?9Ge2>=H{-b
z*Xw1HkNE^5k^uMxz!s9(H0h5?lI#z|@T1KjEdf(gQ~lX&_9V&OB60@6i@m+Q?~aX)
z{Q-b+9Pc9e9LdK4oEMQHW6b-lAT0sb+L)vP@Np0X4~~qCoNE>Aob#=7B!34msI{*B
z``kr<a=E;HZEfvaA5^c`cT7x7thDQ~we~2<rvc1ptq*hr#BqF3DfJ3~Lt5*XXJ==(
zWHOoi78VxXt5hm$K0&Ee+R;e3wNNO0;+)$mA~lk~)@rqFQ55-EU3f04z&ZCefQLoo
zPGig|=iDTKBO>ysG3L0BwAOx3@|J3~nk$t`b!+V@l6x|l%nkW`{)e^zYwZb=_b8=q
z93LP5-Z}RIfL8(R(^^+jz!xNMu2!r4Dc~KFLnLo46bfH<0?d<qWJ3j4CQ0(Z^73*e
zilXyAIF93;N~vqK)+bWndId?6Y!AcGZ{6lCverIN@--1TY>auSlMtIT0I+I|+2$qF
z7SP-x0KbXIU>Jr!b=aa=l1~9Rs<nQ$;})eQPm??#BA@p3^xU7%=T}=nthI(@QAAcZ
zyG%==O;1nv1wr74eTRsg1#q~puW#N9E{Y;GFfeetQtBC!`%-Tj(prD`pOx$nI_I*f
zN}osrMMTb#%mE0}cV|UpzcJ?IC3(@t!^L8856Lm5)ZPa7IuY^ic^bg+Y&LuBlH7D=
zX69;=y`46v-S@@C#TBoO=9%>wSZj9!c#GuD%SrBIMdVMCZ`5kFL*6#L^$w8yrt$JB
z5&1gx{BAitUd;gfoF=u_uhTiFeGwv3HpUdX&D@N$)((>N7yV9aeUq<XQYm$$NxWQu
z|5@d7IsgAy(OO^6VzGFeQtC6WTmWx+$#)BB*oz|hkT**J$F$Z@t`FHcchGweN!4xg
zjd6aKK@i+KIy(CE1tt65iO5}zcJ+4)@k#`6W@%~ZgQoNT1BoGmD410jNB{r;07*qo
IM6N<$f|xtI$N&HU

literal 2516
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