Просмотр исходного кода

Merge remote-tracking branch 'origin/wl_dev' into swj_dev

# Conflicts:
#	pages.config.ts
#	src/components/shop-tabbar/shop-tabbar.vue
suwenjiang 3 дней назад
Родитель
Сommit
fc10a021d6

+ 9 - 6
pages.config.ts

@@ -28,22 +28,25 @@ export default defineUniPages({
     spacing: '3px',
     list: [
       {
-        icon: '/static/tabbar/Parenting.png',
+        icon: '/static/tabbar/Parenting.svg',
+        iconShow: '/static/tabbar/goods.svg',
         pagePath: 'pages/index/index',
-        text: 'tabbar.home',
+        text: '育儿',
         iconType: 'local',
       },
       {
-        icon: '/static/tabbar/music.png',
+        icon: '/static/tabbar/music.svg',
+        iconShow: '/static/tabbar/Frame.svg',
         pagePath: 'pages/music/music',
-        text: 'tabbar.music',
+        text: '音乐',
         iconType: 'local',
       },
 
       {
-        icon: '/static/tabbar/user.png',
+        icon: '/static/tabbar/user.svg',
+        iconShow: '/static/tabbar/macon.svg',
         pagePath: 'pages/community/community',
-        text: 'tabbar.community',
+        text: '我的',
         iconType: 'local',
       },
     ],

+ 65 - 42
src/components/shop-tabbar/shop-tabbar.vue

@@ -1,41 +1,33 @@
-<template>
-  <view class="shop-tabbar-container">
-    <view class="home-item" @click="selectTabBar(Parenting.path, 0)">
-      <view class="home-item-wrapper">
-        <image :src="Parenting.icon" class="home-item-img" mode="widthFix"></image>
-      </view>
-    </view>
+<!-- 代码已包含 CSS:使用 TailwindCSS , 安装 TailwindCSS 后方可看到布局样式效果 -->
 
-    <view class="home-item" @click="selectTabBar(music.path, 0)">
-      <view class="home-item-wrapper">
-        <image :src="music.icon" class="home-item-img" mode="widthFix"></image>
-      </view>
-    </view>
-    <view class="home-item" @click="selectTabBar(user.path, 0)">
-      <view class="home-item-wrapper">
-        <image :src="user.icon" class="home-item-img" mode="widthFix"></image>
+<template>
+  <view class="tab-bar">
+    <view
+      v-for="(item, index) in tabBar.list"
+      :key="index"
+      :class="['tab-item', { active: currentTab === index }]"
+      @click="selectTabBar(index, item.pagePath)"
+    >
+      <view class="icon-wrapper">
+        <image v-if="currentTab === index" :src="item.iconShow" class="home-item-isShow"></image>
+        <image v-else :src="item.icon" class="home-item-img"></image>
       </view>
+      <span class="label">{{ item.text }}</span>
     </view>
   </view>
 </template>
 
-<script setup lang="ts">
+<script lang="ts" setup>
   import { tabBar } from '@/pages.json'
   import { t } from '@/locale'
   import { useTabbarStore } from '@/store/tabbar'
+  import { ref } from 'vue'
 
   const tabbarStore = useTabbarStore()
+  const currentTab = ref(0)
 
-  const [Parenting, music, user] = tabBar.list.map((item) => ({
-    ...item,
-    path: `/${item.pagePath}`,
-    text: t(item.text),
-  }))
-
-  function selectTabBar(url: string, index: number) {
-    console.log(url, '11111111')
-    console.log(index, '222222')
-
+  function selectTabBar(index: number, url: string) {
+    currentTab.value = index
     tabbarStore.setCurIdx(index)
     uni.switchTab({ url })
   }
@@ -63,35 +55,66 @@
     // #endif
   })
 </script>
-<style lang="scss" scoped>
-  .shop-tabbar-container {
+
+<style scoped>
+  .tab-bar {
     position: fixed;
+    right: 0;
     bottom: 0;
     left: 0;
     display: flex;
-    justify-content: space-between;
-    width: 100vw;
-    height: 3.5rem;
-    background-color: #fff;
+    align-items: center;
+    justify-content: space-around;
+    width: 100%;
+    height: 80px;
+    background: #ffffff;
+    box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.05);
   }
-  .home-item {
+
+  .tab-item {
     display: flex;
-    flex: 1;
     flex-direction: column;
     align-items: center;
-    justify-content: center;
+    width: 80px;
+    padding: 6px 0;
+    color: #999999;
     cursor: pointer;
+    transition: color 0.3s ease;
+  }
+
+  .icon-wrapper {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: 45px;
+    height: 45px;
+    border-radius: 50%;
     transition: all 0.3s ease;
   }
-  .home-item-wrapper {
-    margin-bottom: 5rpx;
+
+  .tab-item.active {
+    color: #60a5fa;
   }
+
+  .tab-item.active .icon-wrapper {
+    /* background: #60a5fa; */
+    color: #ffffff;
+    transform: translateY(-18px);
+  }
+
+  .label {
+    margin-top: 3px;
+    font-size: 12px;
+    transition: all 0.3s ease;
+  }
+
+  .tab-item.active .label {
+    transform: translateY(-8px);
+  }
+
   .home-item-img {
-    width: 7.125rem;
-    height: 2.5rem;
+    width: 1.25rem;
+    height: 1.25rem;
     object-fit: contain;
   }
-  .home-item-img:hover {
-    color: #007aff;
-  }
 </style>

+ 23 - 0
src/static/tabbar/.svg

@@ -0,0 +1,23 @@
+<svg width="51" height="50" viewBox="0 0 51 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_164_25197)">
+<rect x="6.83334" y="4" width="38" height="38" rx="19" fill="url(#paint0_linear_164_25197)" shape-rendering="crispEdges"/>
+<path d="M25.8333 21C27.4902 21 28.8333 19.6569 28.8333 18C28.8333 16.3431 27.4902 15 25.8333 15C24.1765 15 22.8333 16.3431 22.8333 18C22.8333 19.6569 24.1765 21 25.8333 21Z" fill="white" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.8333 30.4857V31H33.8333V30.4857C33.8333 28.5655 33.8333 27.6055 33.4458 26.872C33.1049 26.2269 32.561 25.7024 31.892 25.3737C31.1314 25 30.1357 25 28.1445 25H23.5222C21.5309 25 20.5353 25 19.7747 25.3737C19.1057 25.7024 18.5618 26.2269 18.2209 26.872C17.8333 27.6055 17.8333 28.5655 17.8333 30.4857Z" fill="white" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<filter id="filter0_d_164_25197" x="0.833344" y="0" width="50" height="50" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="3"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.313333 0 0 0 0 0.702444 0 0 0 0 1 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_164_25197"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_164_25197" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_164_25197" x1="44.8333" y1="23" x2="6.83334" y2="23" gradientUnits="userSpaceOnUse">
+<stop stop-color="#50B3FF"/>
+<stop offset="1" stop-color="#A3D4FF"/>
+</linearGradient>
+</defs>
+</svg>

+ 22 - 0
src/static/tabbar/Frame.svg

@@ -0,0 +1,22 @@
+<svg width="51" height="50" viewBox="0 0 51 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_164_15339)">
+<rect x="6.5" y="4" width="38" height="38" rx="19" fill="url(#paint0_linear_164_15339)" shape-rendering="crispEdges"/>
+<path d="M33.4155 14.6923C33.0769 14.4099 32.6799 14.2061 32.2532 14.0954C31.8264 13.9848 31.3804 13.9702 30.9472 14.0525L24.0593 15.344C23.1995 15.5051 22.4232 15.9617 21.8646 16.6347C21.3059 17.3077 21.0001 18.1548 21 19.0295V26.417C20.546 26.1471 20.0282 26.0031 19.5 26C18.9067 26 18.3266 26.176 17.8333 26.5056C17.3399 26.8352 16.9554 27.3038 16.7284 27.852C16.5013 28.4001 16.4419 29.0033 16.5576 29.5853C16.6734 30.1672 16.9591 30.7018 17.3787 31.1213C17.7982 31.5409 18.3328 31.8266 18.9147 31.9424C19.4967 32.0581 20.0999 31.9987 20.6481 31.7716C21.1962 31.5446 21.6648 31.1601 21.9944 30.6667C22.3241 30.1734 22.5 29.5933 22.5 29V22.157C22.5 21.8071 22.6223 21.4681 22.8458 21.1988C23.0694 20.9295 23.38 20.7469 23.724 20.6825L32.1112 19.1075C32.22 19.087 32.332 19.0909 32.4392 19.1188C32.5463 19.1467 32.6459 19.198 32.7309 19.269C32.8158 19.34 32.884 19.4289 32.9306 19.5293C32.9771 19.6298 33.0008 19.7393 33 19.85V24.17C32.5463 23.899 32.0285 23.754 31.5 23.75C30.9067 23.75 30.3266 23.926 29.8333 24.2556C29.3399 24.5852 28.9554 25.0538 28.7284 25.602C28.5013 26.1501 28.4419 26.7533 28.5576 27.3353C28.6734 27.9172 28.9591 28.4518 29.3787 28.8713C29.7982 29.2909 30.3328 29.5766 30.9147 29.6924C31.4967 29.8081 32.0999 29.7487 32.648 29.5216C33.1962 29.2946 33.6648 28.9101 33.9944 28.4167C34.3241 27.9234 34.5 27.3433 34.5 26.75V17C34.5005 16.5592 34.4036 16.1237 34.2161 15.7248C34.0286 15.3258 33.7552 14.9732 33.4155 14.6923ZM31.8352 17.636L23.4472 19.208C23.1137 19.2716 22.7934 19.3913 22.5 19.562V19.0295C22.4999 18.5047 22.6833 17.9963 23.0185 17.5924C23.3536 17.1885 23.8194 16.9145 24.3352 16.8178L31.224 15.5263C31.4405 15.4857 31.6634 15.4934 31.8766 15.5487C32.0899 15.604 32.2883 15.7056 32.4579 15.8463C32.6274 15.987 32.7639 16.1633 32.8576 16.3627C32.9513 16.5621 32.9999 16.7797 33 17V17.738C32.6279 17.6004 32.2256 17.5651 31.8352 17.636Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_164_15339" x="0.5" y="0" width="50" height="50" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="3"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.313333 0 0 0 0 0.702444 0 0 0 0 1 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_164_15339"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_164_15339" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_164_15339" x1="44.5" y1="23" x2="6.5" y2="23" gradientUnits="userSpaceOnUse">
+<stop stop-color="#50B3FF"/>
+<stop offset="1" stop-color="#A3D4FF"/>
+</linearGradient>
+</defs>
+</svg>

BIN
src/static/tabbar/Parenting.png


+ 4 - 0
src/static/tabbar/Parenting.svg

@@ -0,0 +1,4 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M8.35366 16.0845C7.48581 16.0845 7.059 16.073 6.90013 16.0523C6.83137 16.0431 6.76735 16.0293 6.70333 16.0156L6.62034 15.9995C6.34528 15.9513 6.13425 15.74 6.0892 15.4714C5.97064 14.7274 5.31857 14.1878 4.54083 14.1878C4.31557 14.1878 4.09268 14.2361 3.88402 14.3279C3.62793 14.4427 3.32442 14.3853 3.12999 14.1855C1.86379 12.8813 1.16667 11.0123 1.16667 8.92277C1.16667 8.57146 1.46069 8.28674 1.82348 8.28674H15.6924C16.0552 8.28674 16.3492 8.57146 16.3492 8.92277C16.3492 11.0582 15.811 12.8469 14.789 14.0937C14.6111 14.3118 14.3053 14.3922 14.0373 14.2912C13.8524 14.2223 13.6603 14.1855 13.4683 14.1855C12.6976 14.1855 12.0479 14.7205 11.9223 15.4576C11.8772 15.7286 11.6567 15.9398 11.3793 15.9811C10.9833 16.0431 10.6157 16.073 10.2601 16.073L9.87594 16.0753C9.26181 16.0822 8.75912 16.0845 8.35366 16.0845ZM7.26766 14.8032C7.82252 14.8216 9.32583 14.8101 9.86646 14.8055L10.2601 14.8032C10.4213 14.8032 10.5825 14.7963 10.7509 14.7802C11.1469 13.6758 12.2234 12.9158 13.4683 12.9158C13.6508 12.9158 13.8334 12.9318 14.0112 12.9663C14.5946 12.0938 14.9384 10.9319 15.019 9.55881H2.50637C2.61545 10.9021 3.06597 12.0983 3.81288 13.0076C4.05 12.9479 4.29423 12.9158 4.5432 12.9158C5.79992 12.9181 6.87642 13.6873 7.26766 14.8032Z" fill="#666666"/>
+<path d="M4.54083 18.5C2.95215 18.5 1.6575 17.2486 1.6575 15.7079C1.6575 14.1672 2.94978 12.9181 4.54083 12.9181C6.13188 12.9181 7.42179 14.1695 7.42179 15.7079C7.42179 17.2463 6.13188 18.5 4.54083 18.5ZM4.54083 14.1878C3.67536 14.1878 2.97112 14.8698 2.97112 15.7079C2.97112 16.546 3.67536 17.2279 4.54083 17.2279C5.4063 17.2279 6.11054 16.546 6.11054 15.7079C6.11054 14.8698 5.4063 14.1878 4.54083 14.1878ZM13.4706 18.5C11.8819 18.5 10.5897 17.2486 10.5897 15.7079C10.5897 14.1672 11.8819 12.9181 13.4706 12.9181C15.0593 12.9181 16.3516 14.1695 16.3516 15.7079C16.3516 17.2463 15.0593 18.5 13.4706 18.5ZM13.4706 14.1878C12.6051 14.1878 11.9009 14.8698 11.9009 15.7079C11.9009 16.546 12.6051 17.2279 13.4706 17.2279C14.3361 17.2279 15.0403 16.546 15.0403 15.7079C15.038 14.8698 14.3337 14.1878 13.4706 14.1878ZM15.6948 9.5611C15.332 9.5611 15.038 9.27638 15.038 8.92507V4.66572C15.038 4.60602 15.0474 4.54402 15.064 4.48662C15.0925 4.39248 15.792 2.19047 18.4833 2.08026C18.846 2.06878 19.1519 2.33742 19.1661 2.68873C19.1804 3.04005 18.9006 3.33625 18.5378 3.35003C17.0155 3.41202 16.4725 4.47514 16.3516 4.77364V8.92277C16.3516 9.27638 16.0576 9.5611 15.6948 9.5611ZM8.36788 9.39808H1.82822C1.47018 9.39808 1.17852 9.12024 1.17141 8.77352C1.16904 8.75745 1.16904 8.73219 1.16904 8.70464C1.16904 5.39819 3.45958 2.44534 6.74127 1.52459C6.9191 1.47637 7.10643 1.49933 7.26055 1.59118C7.41705 1.68302 7.52849 1.83227 7.56643 2.00448L9.01047 8.63346C9.05078 8.82174 9.00335 9.01692 8.87768 9.16616C8.75201 9.31082 8.56469 9.39808 8.36788 9.39808ZM2.50874 8.12601H7.55695L6.43539 2.97346C4.25866 3.85059 2.73163 5.84823 2.50874 8.12601Z" fill="#666666"/>
+</svg>

+ 23 - 0
src/static/tabbar/goods.svg

@@ -0,0 +1,23 @@
+<svg width="50" height="50" viewBox="0 0 50 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_164_27806)">
+<rect x="6" y="4" width="38" height="38" rx="19" fill="url(#paint0_linear_164_27806)" shape-rendering="crispEdges"/>
+<path d="M23.187 29.4424C22.3191 29.4424 21.8923 29.4302 21.7335 29.4083C21.6647 29.3986 21.6007 29.384 21.5367 29.3694L21.4537 29.3524C21.1786 29.3014 20.9676 29.0777 20.9225 28.7932C20.804 28.0055 20.1519 27.4342 19.3742 27.4342C19.1489 27.4342 18.926 27.4852 18.7174 27.5825C18.4613 27.704 18.1578 27.6433 17.9633 27.4317C16.6971 26.0508 16 24.0718 16 21.8594C16 21.4874 16.294 21.186 16.6568 21.186H30.5257C30.8885 21.186 31.1825 21.4874 31.1825 21.8594C31.1825 24.1204 30.6443 26.0144 29.6223 27.3345C29.4445 27.5655 29.1386 27.6506 28.8707 27.5436C28.6857 27.4707 28.4936 27.4317 28.3016 27.4317C27.531 27.4317 26.8813 27.9982 26.7556 28.7786C26.7105 29.0655 26.49 29.2892 26.2126 29.333C25.8166 29.3986 25.4491 29.4302 25.0934 29.4302L24.7093 29.4326C24.0951 29.4399 23.5925 29.4424 23.187 29.4424Z" fill="white"/>
+<path d="M19.3742 32C17.7855 32 16.4908 30.675 16.4908 29.0436C16.4908 27.4123 17.7831 26.0897 19.3742 26.0897C20.9652 26.0897 22.2551 27.4147 22.2551 29.0436C22.2551 30.6726 20.9652 32 19.3742 32ZM19.3742 27.4342C18.5087 27.4342 17.8045 28.1562 17.8045 29.0436C17.8045 29.931 18.5087 30.6531 19.3742 30.6531C20.2396 30.6531 20.9439 29.931 20.9439 29.0436C20.9439 28.1562 20.2396 27.4342 19.3742 27.4342ZM28.304 32C26.7153 32 25.423 30.675 25.423 29.0436C25.423 27.4123 26.7153 26.0897 28.304 26.0897C29.8926 26.0897 31.1849 27.4147 31.1849 29.0436C31.1849 30.6726 29.8926 32 28.304 32ZM28.304 27.4342C27.4385 27.4342 26.7342 28.1562 26.7342 29.0436C26.7342 29.931 27.4385 30.6531 28.304 30.6531C29.1694 30.6531 29.8737 29.931 29.8737 29.0436C29.8713 28.1562 29.1671 27.4342 28.304 27.4342ZM30.5281 22.5353C30.1653 22.5353 29.8713 22.2338 29.8713 21.8618V17.3519C29.8713 17.2887 29.8808 17.2231 29.8974 17.1623C29.9258 17.0626 30.6253 14.7311 33.3166 14.6144C33.6794 14.6022 33.9853 14.8867 33.9995 15.2587C34.0137 15.6306 33.7339 15.9443 33.3711 15.9589C31.8488 16.0245 31.3058 17.1501 31.1849 17.4662V21.8594C31.1849 22.2338 30.8909 22.5353 30.5281 22.5353ZM23.2012 22.3627H16.6616C16.3035 22.3627 16.0119 22.0685 16.0047 21.7014C16.0024 21.6844 16.0024 21.6576 16.0024 21.6284C16.0024 18.1275 18.2929 15.001 21.5746 14.026C21.7524 13.975 21.9398 13.9993 22.0939 14.0965C22.2504 14.1938 22.3618 14.3518 22.3998 14.5342L23.8438 21.5531C23.8841 21.7524 23.8367 21.9591 23.711 22.1171C23.5853 22.2703 23.398 22.3627 23.2012 22.3627ZM17.3421 21.0158H22.3903L21.2687 15.5601C19.092 16.4889 17.565 18.604 17.3421 21.0158Z" fill="white"/>
+</g>
+<defs>
+<filter id="filter0_d_164_27806" x="0" y="0" width="50" height="50" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="3"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.313333 0 0 0 0 0.702444 0 0 0 0 1 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_164_27806"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_164_27806" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_164_27806" x1="44" y1="23" x2="6" y2="23" gradientUnits="userSpaceOnUse">
+<stop stop-color="#50B3FF"/>
+<stop offset="1" stop-color="#A3D4FF"/>
+</linearGradient>
+</defs>
+</svg>

+ 0 - 0
src/static/tabbar/layer.png → src/static/tabbar/layer.svg


+ 23 - 0
src/static/tabbar/macon.svg

@@ -0,0 +1,23 @@
+<svg width="51" height="50" viewBox="0 0 51 50" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_164_25197)">
+<rect x="6.83334" y="4" width="38" height="38" rx="19" fill="url(#paint0_linear_164_25197)" shape-rendering="crispEdges"/>
+<path d="M25.8333 21C27.4902 21 28.8333 19.6569 28.8333 18C28.8333 16.3431 27.4902 15 25.8333 15C24.1765 15 22.8333 16.3431 22.8333 18C22.8333 19.6569 24.1765 21 25.8333 21Z" fill="white" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M17.8333 30.4857V31H33.8333V30.4857C33.8333 28.5655 33.8333 27.6055 33.4458 26.872C33.1049 26.2269 32.561 25.7024 31.892 25.3737C31.1314 25 30.1357 25 28.1445 25H23.5222C21.5309 25 20.5353 25 19.7747 25.3737C19.1057 25.7024 18.5618 26.2269 18.2209 26.872C17.8333 27.6055 17.8333 28.5655 17.8333 30.4857Z" fill="white" stroke="white" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</g>
+<defs>
+<filter id="filter0_d_164_25197" x="0.833344" y="0" width="50" height="50" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="3"/>
+<feComposite in2="hardAlpha" operator="out"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0.313333 0 0 0 0 0.702444 0 0 0 0 1 0 0 0 0.5 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_164_25197"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_164_25197" result="shape"/>
+</filter>
+<linearGradient id="paint0_linear_164_25197" x1="44.8333" y1="23" x2="6.83334" y2="23" gradientUnits="userSpaceOnUse">
+<stop stop-color="#50B3FF"/>
+<stop offset="1" stop-color="#A3D4FF"/>
+</linearGradient>
+</defs>
+</svg>

BIN
src/static/tabbar/music.png


Разница между файлами не показана из-за своего большого размера
+ 1 - 0
src/static/tabbar/music.svg


BIN
src/static/tabbar/music2.png


BIN
src/static/tabbar/parenting2.png


BIN
src/static/tabbar/user.png


+ 4 - 0
src/static/tabbar/user.svg

@@ -0,0 +1,4 @@
+<svg width="21" height="20" viewBox="0 0 21 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.8333 8C12.4902 8 13.8333 6.65686 13.8333 5C13.8333 3.34315 12.4902 2 10.8333 2C9.17649 2 7.83334 3.34315 7.83334 5C7.83334 6.65686 9.17649 8 10.8333 8Z" stroke="#666666" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M2.83334 17.4857V18H18.8333V17.4857C18.8333 15.5655 18.8333 14.6055 18.4458 13.872C18.1049 13.2269 17.561 12.7024 16.892 12.3737C16.1314 12 15.1357 12 13.1445 12H8.52223C6.53094 12 5.5353 12 4.77472 12.3737C4.10569 12.7024 3.56176 13.2269 3.22088 13.872C2.83334 14.6055 2.83334 15.5655 2.83334 17.4857Z" stroke="#666666" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>

Некоторые файлы не были показаны из-за большого количества измененных файлов