refactor(pages-config): 添加新页面并更新Tabbar配置

pages.config.ts

@@ -39,6 +39,15 @@ export default defineUniPages({
         pagePath: 'pages/about/about',
         // text: '关于',
       },
+      {
+        pagePath: 'pages/publish/index',
+      },
+      {
+        pagePath: 'pages/messages/index',
+      },
+      {
+        pagePath: 'pages/mine/index',
+      },
     ],
   },
   condition: {
@@ -46,6 +55,7 @@ export default defineUniPages({
     list: [
       { name: '设计游学', path: 'pages/index/study-tour/index' },
       { name: '登录', path: 'pages/login/index' },
+      { name: '我的', path: 'pages/mine/index' },
     ],
   },
 })

src/assets/svgs/agent.svg

@@ -0,0 +1,27 @@
+<svg width="27" height="27" viewBox="0 0 27 27" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame" clip-path="url(#clip0_460_11256)">
+<path id="Vector" d="M24.2644 12.2502C24.1522 6.26276 19.5107 1.42627 13.8112 1.42627H12.9742C7.27469 1.42627 2.63323 6.26276 2.52107 12.2494C1.51995 12.8294 0.836914 13.9 0.836914 15.138V16.8122C0.836914 18.6587 2.33859 20.1604 4.18513 20.1604C6.03167 20.1604 7.53334 18.6587 7.53334 16.8122V15.138C7.53206 14.2562 7.18315 13.4105 6.56229 12.7843C5.94142 12.1581 5.0987 11.802 4.21694 11.7932C4.54422 6.94245 8.34194 3.10038 12.9742 3.10038H13.8112C18.4443 3.10038 22.2412 6.94245 22.5685 11.7932C21.6867 11.802 20.844 12.1581 20.2232 12.7843C19.6023 13.4105 19.2534 14.2562 19.2521 15.138V16.8122C19.2521 18.3239 20.2649 19.5895 21.6427 20.0038C20.3993 21.6406 18.6237 22.7922 16.6221 23.26C16.4839 22.8455 16.219 22.485 15.8649 22.2292C15.5107 21.9734 15.0852 21.8354 14.6483 21.8345C14.0933 21.8345 13.561 22.0549 13.1686 22.4474C12.7761 22.8398 12.5557 23.3721 12.5557 23.9271C12.5557 24.4821 12.7761 25.0144 13.1686 25.4068C13.561 25.7993 14.0933 26.0197 14.6483 26.0197C15.0048 26.0193 15.3552 25.9274 15.666 25.7528C15.9768 25.5783 16.2377 25.3269 16.4237 25.0228C17.9322 24.7589 19.3649 24.169 20.622 23.2944C21.879 22.4197 22.9301 21.2813 23.7019 19.9586C25.006 19.5016 25.9485 18.2711 25.9485 16.8122V15.138C25.9485 13.9 25.2655 12.8294 24.2644 12.2502ZM5.85924 15.138V16.8122C5.85924 17.7354 5.1084 18.4863 4.18513 18.4863C3.26186 18.4863 2.51102 17.7354 2.51102 16.8122V15.138C2.51102 14.2148 3.26186 13.4639 4.18513 13.4639C5.1084 13.4639 5.85924 14.2148 5.85924 15.138ZM24.2744 16.8122C24.2744 17.7095 23.5629 18.4385 22.6756 18.4787L22.6103 18.4478C22.6045 18.4611 22.5953 18.472 22.5894 18.4846C22.1476 18.4817 21.7248 18.3043 21.4133 17.991C21.1017 17.6777 20.9266 17.254 20.9262 16.8122V15.138C20.9262 14.2148 21.677 13.4639 22.6003 13.4639C23.5236 13.4639 24.2744 14.2148 24.2744 15.138V16.8122Z" fill="#333333"/>
+<g id="Mask group">
+<mask id="mask0_460_11256" style="mask-type:alpha" maskUnits="userSpaceOnUse" x="11" y="19" width="14" height="9">
+<path id="Rectangle 1120" d="M11.332 19.6465L24.7249 20.1616L23.6947 27.8882H11.332V19.6465Z" fill="#D9D9D9"/>
+</mask>
+<g mask="url(#mask0_460_11256)">
+<g id="Vector_2">
+<path d="M24.2644 12.2522C24.1522 6.26472 19.5107 1.42822 13.8112 1.42822H12.9742C7.27469 1.42822 2.63323 6.26472 2.52107 12.2513C1.51995 12.8314 0.836914 13.902 0.836914 15.14V16.8141C0.836914 18.6606 2.33859 20.1623 4.18513 20.1623C6.03167 20.1623 7.53334 18.6606 7.53334 16.8141V15.14C7.53206 14.2582 7.18315 13.4125 6.56229 12.7863C5.94142 12.1601 5.0987 11.8039 4.21694 11.7951C4.54422 6.94441 8.34194 3.10233 12.9742 3.10233H13.8112C18.4443 3.10233 22.2412 6.94441 22.5685 11.7951C21.6867 11.8039 20.844 12.1601 20.2232 12.7863C19.6023 13.4125 19.2534 14.2582 19.2521 15.14V16.8141C19.2521 18.3258 20.2649 19.5914 21.6427 20.0058C20.3993 21.6425 18.6237 22.7941 16.6221 23.2619C16.4839 22.8475 16.219 22.4869 15.8649 22.2312C15.5107 21.9754 15.0852 21.8373 14.6483 21.8364C14.0933 21.8364 13.561 22.0569 13.1686 22.4493C12.7761 22.8418 12.5557 23.3741 12.5557 23.9291C12.5557 24.4841 12.7761 25.0163 13.1686 25.4088C13.561 25.8012 14.0933 26.0217 14.6483 26.0217C15.0048 26.0212 15.3552 25.9293 15.666 25.7548C15.9768 25.5802 16.2377 25.3289 16.4237 25.0248C17.9322 24.7609 19.3649 24.171 20.622 23.2963C21.879 22.4217 22.9301 21.2833 23.7019 19.9606C25.006 19.5036 25.9485 18.2731 25.9485 16.8141V15.14C25.9485 13.902 25.2655 12.8314 24.2644 12.2522ZM5.85924 15.14V16.8141C5.85924 17.7374 5.1084 18.4882 4.18513 18.4882C3.26186 18.4882 2.51102 17.7374 2.51102 16.8141V15.14C2.51102 14.2167 3.26186 13.4659 4.18513 13.4659C5.1084 13.4659 5.85924 14.2167 5.85924 15.14ZM24.2744 16.8141C24.2744 17.7114 23.5629 18.4405 22.6756 18.4807L22.6103 18.4497C22.6045 18.4631 22.5953 18.474 22.5894 18.4865C22.1476 18.4837 21.7248 18.3062 21.4133 17.993C21.1017 17.6797 20.9266 17.2559 20.9262 16.8141V15.14C20.9262 14.2167 21.677 13.4659 22.6003 13.4659C23.5236 13.4659 24.2744 14.2167 24.2744 15.14V16.8141Z" fill="black" fill-opacity="0.85"/>
+<path d="M24.2644 12.2522C24.1522 6.26472 19.5107 1.42822 13.8112 1.42822H12.9742C7.27469 1.42822 2.63323 6.26472 2.52107 12.2513C1.51995 12.8314 0.836914 13.902 0.836914 15.14V16.8141C0.836914 18.6606 2.33859 20.1623 4.18513 20.1623C6.03167 20.1623 7.53334 18.6606 7.53334 16.8141V15.14C7.53206 14.2582 7.18315 13.4125 6.56229 12.7863C5.94142 12.1601 5.0987 11.8039 4.21694 11.7951C4.54422 6.94441 8.34194 3.10233 12.9742 3.10233H13.8112C18.4443 3.10233 22.2412 6.94441 22.5685 11.7951C21.6867 11.8039 20.844 12.1601 20.2232 12.7863C19.6023 13.4125 19.2534 14.2582 19.2521 15.14V16.8141C19.2521 18.3258 20.2649 19.5914 21.6427 20.0058C20.3993 21.6425 18.6237 22.7941 16.6221 23.2619C16.4839 22.8475 16.219 22.4869 15.8649 22.2312C15.5107 21.9754 15.0852 21.8373 14.6483 21.8364C14.0933 21.8364 13.561 22.0569 13.1686 22.4493C12.7761 22.8418 12.5557 23.3741 12.5557 23.9291C12.5557 24.4841 12.7761 25.0163 13.1686 25.4088C13.561 25.8012 14.0933 26.0217 14.6483 26.0217C15.0048 26.0212 15.3552 25.9293 15.666 25.7548C15.9768 25.5802 16.2377 25.3289 16.4237 25.0248C17.9322 24.7609 19.3649 24.171 20.622 23.2963C21.879 22.4217 22.9301 21.2833 23.7019 19.9606C25.006 19.5036 25.9485 18.2731 25.9485 16.8141V15.14C25.9485 13.902 25.2655 12.8314 24.2644 12.2522ZM5.85924 15.14V16.8141C5.85924 17.7374 5.1084 18.4882 4.18513 18.4882C3.26186 18.4882 2.51102 17.7374 2.51102 16.8141V15.14C2.51102 14.2167 3.26186 13.4659 4.18513 13.4659C5.1084 13.4659 5.85924 14.2167 5.85924 15.14ZM24.2744 16.8141C24.2744 17.7114 23.5629 18.4405 22.6756 18.4807L22.6103 18.4497C22.6045 18.4631 22.5953 18.474 22.5894 18.4865C22.1476 18.4837 21.7248 18.3062 21.4133 17.993C21.1017 17.6797 20.9266 17.2559 20.9262 16.8141V15.14C20.9262 14.2167 21.677 13.4659 22.6003 13.4659C23.5236 13.4659 24.2744 14.2167 24.2744 15.14V16.8141Z" fill="black" fill-opacity="0.65"/>
+<path d="M24.2644 12.2522C24.1522 6.26472 19.5107 1.42822 13.8112 1.42822H12.9742C7.27469 1.42822 2.63323 6.26472 2.52107 12.2513C1.51995 12.8314 0.836914 13.902 0.836914 15.14V16.8141C0.836914 18.6606 2.33859 20.1623 4.18513 20.1623C6.03167 20.1623 7.53334 18.6606 7.53334 16.8141V15.14C7.53206 14.2582 7.18315 13.4125 6.56229 12.7863C5.94142 12.1601 5.0987 11.8039 4.21694 11.7951C4.54422 6.94441 8.34194 3.10233 12.9742 3.10233H13.8112C18.4443 3.10233 22.2412 6.94441 22.5685 11.7951C21.6867 11.8039 20.844 12.1601 20.2232 12.7863C19.6023 13.4125 19.2534 14.2582 19.2521 15.14V16.8141C19.2521 18.3258 20.2649 19.5914 21.6427 20.0058C20.3993 21.6425 18.6237 22.7941 16.6221 23.2619C16.4839 22.8475 16.219 22.4869 15.8649 22.2312C15.5107 21.9754 15.0852 21.8373 14.6483 21.8364C14.0933 21.8364 13.561 22.0569 13.1686 22.4493C12.7761 22.8418 12.5557 23.3741 12.5557 23.9291C12.5557 24.4841 12.7761 25.0163 13.1686 25.4088C13.561 25.8012 14.0933 26.0217 14.6483 26.0217C15.0048 26.0212 15.3552 25.9293 15.666 25.7548C15.9768 25.5802 16.2377 25.3289 16.4237 25.0248C17.9322 24.7609 19.3649 24.171 20.622 23.2963C21.879 22.4217 22.9301 21.2833 23.7019 19.9606C25.006 19.5036 25.9485 18.2731 25.9485 16.8141V15.14C25.9485 13.902 25.2655 12.8314 24.2644 12.2522ZM5.85924 15.14V16.8141C5.85924 17.7374 5.1084 18.4882 4.18513 18.4882C3.26186 18.4882 2.51102 17.7374 2.51102 16.8141V15.14C2.51102 14.2167 3.26186 13.4659 4.18513 13.4659C5.1084 13.4659 5.85924 14.2167 5.85924 15.14ZM24.2744 16.8141C24.2744 17.7114 23.5629 18.4405 22.6756 18.4807L22.6103 18.4497C22.6045 18.4631 22.5953 18.474 22.5894 18.4865C22.1476 18.4837 21.7248 18.3062 21.4133 17.993C21.1017 17.6797 20.9266 17.2559 20.9262 16.8141V15.14C20.9262 14.2167 21.677 13.4659 22.6003 13.4659C23.5236 13.4659 24.2744 14.2167 24.2744 15.14V16.8141Z" fill="black" fill-opacity="0.45"/>
+</g>
+</g>
+</g>
+<g id="Ellipse 31">
+<path d="M16.6073 15.0713C16.6073 16.6579 16.1934 17.4672 15.5359 17.8766C14.9672 18.2306 14.2162 18.2856 13.393 18.2856C12.5698 18.2856 11.8188 18.2306 11.2501 17.8766C10.5926 17.4672 10.1787 16.6579 10.1787 15.0713" stroke="black" stroke-opacity="0.85" stroke-width="1.60714"/>
+<path d="M16.6073 15.0713C16.6073 16.6579 16.1934 17.4672 15.5359 17.8766C14.9672 18.2306 14.2162 18.2856 13.393 18.2856C12.5698 18.2856 11.8188 18.2306 11.2501 17.8766C10.5926 17.4672 10.1787 16.6579 10.1787 15.0713" stroke="black" stroke-opacity="0.65" stroke-width="1.60714"/>
+<path d="M16.6073 15.0713C16.6073 16.6579 16.1934 17.4672 15.5359 17.8766C14.9672 18.2306 14.2162 18.2856 13.393 18.2856C12.5698 18.2856 11.8188 18.2306 11.2501 17.8766C10.5926 17.4672 10.1787 16.6579 10.1787 15.0713" stroke="black" stroke-opacity="0.45" stroke-width="1.60714"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_460_11256">
+<rect width="26.7857" height="26.7857" fill="white" transform="translate(0 0.0712891)"/>
+</clipPath>
+</defs>
+</svg>

src/assets/svgs/coupon.svg

@@ -0,0 +1,24 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame" clip-path="url(#clip0_460_11244)">
+<g id="Vector">
+<path d="M18.1345 1.61696C17.3488 0.241959 15.4827 -0.249112 14.1077 0.536602L10.1791 2.79553L9.49163 2.40267C8.01841 1.61696 6.25056 2.00982 5.46484 3.48303L2.02734 9.4741H22.6523L18.1345 1.61696ZM15.0898 2.30446C15.5809 2.00982 16.1702 2.20624 16.4648 2.69732L19.7059 8.39375L12.1434 4.07232L15.0898 2.30446ZM4.28627 8.49196L6.74163 4.26874C7.13449 3.58124 8.01841 3.2866 8.70591 3.77767L10.6702 4.95624L17.0541 8.49196H4.28627Z" fill="black" fill-opacity="0.85"/>
+<path d="M18.1345 1.61696C17.3488 0.241959 15.4827 -0.249112 14.1077 0.536602L10.1791 2.79553L9.49163 2.40267C8.01841 1.61696 6.25056 2.00982 5.46484 3.48303L2.02734 9.4741H22.6523L18.1345 1.61696ZM15.0898 2.30446C15.5809 2.00982 16.1702 2.20624 16.4648 2.69732L19.7059 8.39375L12.1434 4.07232L15.0898 2.30446ZM4.28627 8.49196L6.74163 4.26874C7.13449 3.58124 8.01841 3.2866 8.70591 3.77767L10.6702 4.95624L17.0541 8.49196H4.28627Z" fill="black" fill-opacity="0.65"/>
+<path d="M18.1345 1.61696C17.3488 0.241959 15.4827 -0.249112 14.1077 0.536602L10.1791 2.79553L9.49163 2.40267C8.01841 1.61696 6.25056 2.00982 5.46484 3.48303L2.02734 9.4741H22.6523L18.1345 1.61696ZM15.0898 2.30446C15.5809 2.00982 16.1702 2.20624 16.4648 2.69732L19.7059 8.39375L12.1434 4.07232L15.0898 2.30446ZM4.28627 8.49196L6.74163 4.26874C7.13449 3.58124 8.01841 3.2866 8.70591 3.77767L10.6702 4.95624L17.0541 8.49196H4.28627Z" fill="black" fill-opacity="0.45"/>
+</g>
+<g id="Vector_2">
+<path d="M9.10714 12.9111H14.1071C14.6964 12.9111 15.0893 13.304 15.0893 13.8933C15.0893 14.4826 14.6964 14.8754 14.1071 14.8754H9.10714C8.51786 14.8754 8.125 14.4826 8.125 13.8933C8.125 13.304 8.51786 12.9111 9.10714 12.9111ZM9.10714 16.7415H14.1071C14.6964 16.7415 15.0893 17.2326 15.0893 17.7236C15.0893 18.2147 14.5982 18.7058 14.1071 18.7058H9.10714C8.51786 18.7058 8.125 18.2147 8.125 17.7236C8.125 17.2326 8.61607 16.7415 9.10714 16.7415Z" fill="black" fill-opacity="0.85"/>
+<path d="M9.10714 12.9111H14.1071C14.6964 12.9111 15.0893 13.304 15.0893 13.8933C15.0893 14.4826 14.6964 14.8754 14.1071 14.8754H9.10714C8.51786 14.8754 8.125 14.4826 8.125 13.8933C8.125 13.304 8.51786 12.9111 9.10714 12.9111ZM9.10714 16.7415H14.1071C14.6964 16.7415 15.0893 17.2326 15.0893 17.7236C15.0893 18.2147 14.5982 18.7058 14.1071 18.7058H9.10714C8.51786 18.7058 8.125 18.2147 8.125 17.7236C8.125 17.2326 8.61607 16.7415 9.10714 16.7415Z" fill="black" fill-opacity="0.65"/>
+<path d="M9.10714 12.9111H14.1071C14.6964 12.9111 15.0893 13.304 15.0893 13.8933C15.0893 14.4826 14.6964 14.8754 14.1071 14.8754H9.10714C8.51786 14.8754 8.125 14.4826 8.125 13.8933C8.125 13.304 8.51786 12.9111 9.10714 12.9111ZM9.10714 16.7415H14.1071C14.6964 16.7415 15.0893 17.2326 15.0893 17.7236C15.0893 18.2147 14.5982 18.7058 14.1071 18.7058H9.10714C8.51786 18.7058 8.125 18.2147 8.125 17.7236C8.125 17.2326 8.61607 16.7415 9.10714 16.7415Z" fill="black" fill-opacity="0.45"/>
+</g>
+<g id="Vector_3">
+<path d="M21.1789 15.8576C21.1789 14.7773 21.6699 13.7951 22.4556 13.2058V10.9469C22.4556 10.1612 21.7681 9.4737 20.9824 9.4737H3.30385C2.51814 9.4737 1.83064 10.1612 1.83064 10.9469V12.9112C2.81278 13.5005 3.50028 14.5808 3.50028 15.8576C3.50028 17.1344 2.81278 18.2148 1.83064 18.8041V20.7683C1.83064 21.5541 2.51814 22.2416 3.30385 22.2416H20.9824C21.7681 22.2416 22.4556 21.5541 22.4556 20.7683V18.5094C21.6699 17.9201 21.1789 16.938 21.1789 15.8576ZM23.9289 20.7683C23.9289 22.438 22.6521 23.7148 20.9824 23.7148H3.30385C1.63421 23.7148 0.357422 22.438 0.357422 20.7683V17.8219C1.24135 17.6255 2.02706 16.8398 2.02706 15.8576C2.02706 14.8755 1.33956 14.0898 0.357422 13.8933V10.9469C0.357422 9.27727 1.63421 8.00049 3.30385 8.00049H20.9824C22.6521 8.00049 23.9289 9.27727 23.9289 10.9469V13.9916C23.1431 14.2862 22.6521 14.9737 22.6521 15.8576C22.6521 16.7416 23.2414 17.4291 23.9289 17.7237V20.7683Z" fill="black" fill-opacity="0.85"/>
+<path d="M21.1789 15.8576C21.1789 14.7773 21.6699 13.7951 22.4556 13.2058V10.9469C22.4556 10.1612 21.7681 9.4737 20.9824 9.4737H3.30385C2.51814 9.4737 1.83064 10.1612 1.83064 10.9469V12.9112C2.81278 13.5005 3.50028 14.5808 3.50028 15.8576C3.50028 17.1344 2.81278 18.2148 1.83064 18.8041V20.7683C1.83064 21.5541 2.51814 22.2416 3.30385 22.2416H20.9824C21.7681 22.2416 22.4556 21.5541 22.4556 20.7683V18.5094C21.6699 17.9201 21.1789 16.938 21.1789 15.8576ZM23.9289 20.7683C23.9289 22.438 22.6521 23.7148 20.9824 23.7148H3.30385C1.63421 23.7148 0.357422 22.438 0.357422 20.7683V17.8219C1.24135 17.6255 2.02706 16.8398 2.02706 15.8576C2.02706 14.8755 1.33956 14.0898 0.357422 13.8933V10.9469C0.357422 9.27727 1.63421 8.00049 3.30385 8.00049H20.9824C22.6521 8.00049 23.9289 9.27727 23.9289 10.9469V13.9916C23.1431 14.2862 22.6521 14.9737 22.6521 15.8576C22.6521 16.7416 23.2414 17.4291 23.9289 17.7237V20.7683Z" fill="black" fill-opacity="0.65"/>
+<path d="M21.1789 15.8576C21.1789 14.7773 21.6699 13.7951 22.4556 13.2058V10.9469C22.4556 10.1612 21.7681 9.4737 20.9824 9.4737H3.30385C2.51814 9.4737 1.83064 10.1612 1.83064 10.9469V12.9112C2.81278 13.5005 3.50028 14.5808 3.50028 15.8576C3.50028 17.1344 2.81278 18.2148 1.83064 18.8041V20.7683C1.83064 21.5541 2.51814 22.2416 3.30385 22.2416H20.9824C21.7681 22.2416 22.4556 21.5541 22.4556 20.7683V18.5094C21.6699 17.9201 21.1789 16.938 21.1789 15.8576ZM23.9289 20.7683C23.9289 22.438 22.6521 23.7148 20.9824 23.7148H3.30385C1.63421 23.7148 0.357422 22.438 0.357422 20.7683V17.8219C1.24135 17.6255 2.02706 16.8398 2.02706 15.8576C2.02706 14.8755 1.33956 14.0898 0.357422 13.8933V10.9469C0.357422 9.27727 1.63421 8.00049 3.30385 8.00049H20.9824C22.6521 8.00049 23.9289 9.27727 23.9289 10.9469V13.9916C23.1431 14.2862 22.6521 14.9737 22.6521 15.8576C22.6521 16.7416 23.2414 17.4291 23.9289 17.7237V20.7683Z" fill="black" fill-opacity="0.45"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_460_11244">
+<rect width="23.5714" height="23.5714" fill="white" transform="translate(0.357422 0.143555)"/>
+</clipPath>
+</defs>
+</svg>

src/assets/svgs/integral.svg

@@ -0,0 +1,14 @@
+<svg width="28" height="27" viewBox="0 0 28 27" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame">
+<g id="Vector">
+<path d="M22.7506 2.30322C23.1946 2.30322 23.6204 2.4796 23.9343 2.79356C24.2483 3.10751 24.4247 3.53333 24.4247 3.97733V22.9505C24.4247 23.3945 24.2483 23.8204 23.9343 24.1343C23.6204 24.4483 23.1946 24.6247 22.7506 24.6247H7.12556C6.68156 24.6247 6.25574 24.4483 5.94179 24.1343C5.62783 23.8204 5.45145 23.3945 5.45145 22.9505V19.6023H4.6144C4.3924 19.6023 4.17949 19.5141 4.02251 19.3572C3.86553 19.2002 3.77734 18.9873 3.77734 18.7653C3.77734 18.5433 3.86553 18.3304 4.02251 18.1734C4.17949 18.0164 4.3924 17.9282 4.6144 17.9282H5.45145V14.58H4.6144C4.3924 14.58 4.17949 14.4918 4.02251 14.3348C3.86553 14.1779 3.77734 13.965 3.77734 13.743C3.77734 13.521 3.86553 13.308 4.02251 13.1511C4.17949 12.9941 4.3924 12.9059 4.6144 12.9059H5.45145V9.55769H4.6144C4.3924 9.55769 4.17949 9.4695 4.02251 9.31252C3.86553 9.15554 3.77734 8.94263 3.77734 8.72063C3.77734 8.49863 3.86553 8.28573 4.02251 8.12875C4.17949 7.97177 4.3924 7.88358 4.6144 7.88358H5.45145V3.97733C5.45145 3.53333 5.62783 3.10751 5.94179 2.79356C6.25574 2.4796 6.68156 2.30322 7.12556 2.30322H22.7506ZM22.1925 3.97733H7.68359C7.54691 3.97735 7.41499 4.02753 7.31285 4.11835C7.21071 4.20918 7.14546 4.33433 7.12946 4.47008L7.12556 4.53537V22.3925C7.12558 22.5292 7.17576 22.6611 7.26658 22.7633C7.35741 22.8654 7.48256 22.9306 7.6183 22.9466L7.68359 22.9505H22.1925C22.3292 22.9505 22.4611 22.9003 22.5633 22.8095C22.6654 22.7187 22.7307 22.5935 22.7467 22.4578L22.7506 22.3925V4.53537C22.7506 4.46208 22.7361 4.38952 22.7081 4.32181C22.68 4.25411 22.6389 4.19259 22.5871 4.14077C22.5353 4.08896 22.4738 4.04785 22.4061 4.01981C22.3384 3.99176 22.2658 3.97733 22.1925 3.97733Z" fill="black" fill-opacity="0.85"/>
+<path d="M22.7506 2.30322C23.1946 2.30322 23.6204 2.4796 23.9343 2.79356C24.2483 3.10751 24.4247 3.53333 24.4247 3.97733V22.9505C24.4247 23.3945 24.2483 23.8204 23.9343 24.1343C23.6204 24.4483 23.1946 24.6247 22.7506 24.6247H7.12556C6.68156 24.6247 6.25574 24.4483 5.94179 24.1343C5.62783 23.8204 5.45145 23.3945 5.45145 22.9505V19.6023H4.6144C4.3924 19.6023 4.17949 19.5141 4.02251 19.3572C3.86553 19.2002 3.77734 18.9873 3.77734 18.7653C3.77734 18.5433 3.86553 18.3304 4.02251 18.1734C4.17949 18.0164 4.3924 17.9282 4.6144 17.9282H5.45145V14.58H4.6144C4.3924 14.58 4.17949 14.4918 4.02251 14.3348C3.86553 14.1779 3.77734 13.965 3.77734 13.743C3.77734 13.521 3.86553 13.308 4.02251 13.1511C4.17949 12.9941 4.3924 12.9059 4.6144 12.9059H5.45145V9.55769H4.6144C4.3924 9.55769 4.17949 9.4695 4.02251 9.31252C3.86553 9.15554 3.77734 8.94263 3.77734 8.72063C3.77734 8.49863 3.86553 8.28573 4.02251 8.12875C4.17949 7.97177 4.3924 7.88358 4.6144 7.88358H5.45145V3.97733C5.45145 3.53333 5.62783 3.10751 5.94179 2.79356C6.25574 2.4796 6.68156 2.30322 7.12556 2.30322H22.7506ZM22.1925 3.97733H7.68359C7.54691 3.97735 7.41499 4.02753 7.31285 4.11835C7.21071 4.20918 7.14546 4.33433 7.12946 4.47008L7.12556 4.53537V22.3925C7.12558 22.5292 7.17576 22.6611 7.26658 22.7633C7.35741 22.8654 7.48256 22.9306 7.6183 22.9466L7.68359 22.9505H22.1925C22.3292 22.9505 22.4611 22.9003 22.5633 22.8095C22.6654 22.7187 22.7307 22.5935 22.7467 22.4578L22.7506 22.3925V4.53537C22.7506 4.46208 22.7361 4.38952 22.7081 4.32181C22.68 4.25411 22.6389 4.19259 22.5871 4.14077C22.5353 4.08896 22.4738 4.04785 22.4061 4.01981C22.3384 3.99176 22.2658 3.97733 22.1925 3.97733Z" fill="black" fill-opacity="0.65"/>
+<path d="M22.7506 2.30322C23.1946 2.30322 23.6204 2.4796 23.9343 2.79356C24.2483 3.10751 24.4247 3.53333 24.4247 3.97733V22.9505C24.4247 23.3945 24.2483 23.8204 23.9343 24.1343C23.6204 24.4483 23.1946 24.6247 22.7506 24.6247H7.12556C6.68156 24.6247 6.25574 24.4483 5.94179 24.1343C5.62783 23.8204 5.45145 23.3945 5.45145 22.9505V19.6023H4.6144C4.3924 19.6023 4.17949 19.5141 4.02251 19.3572C3.86553 19.2002 3.77734 18.9873 3.77734 18.7653C3.77734 18.5433 3.86553 18.3304 4.02251 18.1734C4.17949 18.0164 4.3924 17.9282 4.6144 17.9282H5.45145V14.58H4.6144C4.3924 14.58 4.17949 14.4918 4.02251 14.3348C3.86553 14.1779 3.77734 13.965 3.77734 13.743C3.77734 13.521 3.86553 13.308 4.02251 13.1511C4.17949 12.9941 4.3924 12.9059 4.6144 12.9059H5.45145V9.55769H4.6144C4.3924 9.55769 4.17949 9.4695 4.02251 9.31252C3.86553 9.15554 3.77734 8.94263 3.77734 8.72063C3.77734 8.49863 3.86553 8.28573 4.02251 8.12875C4.17949 7.97177 4.3924 7.88358 4.6144 7.88358H5.45145V3.97733C5.45145 3.53333 5.62783 3.10751 5.94179 2.79356C6.25574 2.4796 6.68156 2.30322 7.12556 2.30322H22.7506ZM22.1925 3.97733H7.68359C7.54691 3.97735 7.41499 4.02753 7.31285 4.11835C7.21071 4.20918 7.14546 4.33433 7.12946 4.47008L7.12556 4.53537V22.3925C7.12558 22.5292 7.17576 22.6611 7.26658 22.7633C7.35741 22.8654 7.48256 22.9306 7.6183 22.9466L7.68359 22.9505H22.1925C22.3292 22.9505 22.4611 22.9003 22.5633 22.8095C22.6654 22.7187 22.7307 22.5935 22.7467 22.4578L22.7506 22.3925V4.53537C22.7506 4.46208 22.7361 4.38952 22.7081 4.32181C22.68 4.25411 22.6389 4.19259 22.5871 4.14077C22.5353 4.08896 22.4738 4.04785 22.4061 4.01981C22.3384 3.99176 22.2658 3.97733 22.1925 3.97733Z" fill="black" fill-opacity="0.45"/>
+</g>
+<g id="Vector_2">
+<path d="M17.968 8.85741C18.0999 8.9944 18.1739 9.18018 18.1739 9.37389C18.1739 9.56759 18.0999 9.75337 17.968 9.89036L16.3677 11.5525H17.9395C18.1259 11.5525 18.3048 11.6295 18.4366 11.7665C18.5685 11.9035 18.6426 12.0893 18.6426 12.283C18.6426 12.4768 18.5685 12.6626 18.4366 12.7996C18.3048 12.9366 18.1259 13.0136 17.9395 13.0136H15.5648V14.4746H17.9395C18.1259 14.4746 18.3048 14.5516 18.4366 14.6885C18.5685 14.8255 18.6426 15.0114 18.6426 15.2051C18.6426 15.3988 18.5685 15.5847 18.4366 15.7217C18.3048 15.8587 18.1259 15.9356 17.9395 15.9356H15.5648V18.6268C15.5648 18.8206 15.4907 19.0064 15.3588 19.1434C15.227 19.2804 15.0481 19.3574 14.8616 19.3574C14.6752 19.3574 14.4963 19.2804 14.3645 19.1434C14.2326 19.0064 14.1585 18.8206 14.1585 18.6268V15.9356H11.8457C11.6592 15.9356 11.4804 15.8587 11.3485 15.7217C11.2167 15.5847 11.1426 15.3988 11.1426 15.2051C11.1426 15.0114 11.2167 14.8255 11.3485 14.6885C11.4804 14.5516 11.6592 14.4746 11.8457 14.4746H14.1585V13.0136H11.8457C11.6592 13.0136 11.4804 12.9366 11.3485 12.7996C11.2167 12.6626 11.1426 12.4768 11.1426 12.283C11.1426 12.0893 11.2167 11.9035 11.3485 11.7665C11.4804 11.6295 11.6592 11.5525 11.8457 11.5525H13.432L11.8321 9.89036C11.7002 9.75338 11.6261 9.56758 11.626 9.37382C11.626 9.18005 11.7 8.99421 11.8319 8.85717C11.9637 8.72013 12.1426 8.64311 12.3291 8.64307C12.5155 8.64302 12.6944 8.71995 12.8263 8.85693L14.8996 11.0115L16.9738 8.85741C17.1057 8.72046 17.2845 8.64353 17.4709 8.64353C17.6574 8.64353 17.8362 8.72046 17.968 8.85741Z" fill="black" fill-opacity="0.85"/>
+<path d="M17.968 8.85741C18.0999 8.9944 18.1739 9.18018 18.1739 9.37389C18.1739 9.56759 18.0999 9.75337 17.968 9.89036L16.3677 11.5525H17.9395C18.1259 11.5525 18.3048 11.6295 18.4366 11.7665C18.5685 11.9035 18.6426 12.0893 18.6426 12.283C18.6426 12.4768 18.5685 12.6626 18.4366 12.7996C18.3048 12.9366 18.1259 13.0136 17.9395 13.0136H15.5648V14.4746H17.9395C18.1259 14.4746 18.3048 14.5516 18.4366 14.6885C18.5685 14.8255 18.6426 15.0114 18.6426 15.2051C18.6426 15.3988 18.5685 15.5847 18.4366 15.7217C18.3048 15.8587 18.1259 15.9356 17.9395 15.9356H15.5648V18.6268C15.5648 18.8206 15.4907 19.0064 15.3588 19.1434C15.227 19.2804 15.0481 19.3574 14.8616 19.3574C14.6752 19.3574 14.4963 19.2804 14.3645 19.1434C14.2326 19.0064 14.1585 18.8206 14.1585 18.6268V15.9356H11.8457C11.6592 15.9356 11.4804 15.8587 11.3485 15.7217C11.2167 15.5847 11.1426 15.3988 11.1426 15.2051C11.1426 15.0114 11.2167 14.8255 11.3485 14.6885C11.4804 14.5516 11.6592 14.4746 11.8457 14.4746H14.1585V13.0136H11.8457C11.6592 13.0136 11.4804 12.9366 11.3485 12.7996C11.2167 12.6626 11.1426 12.4768 11.1426 12.283C11.1426 12.0893 11.2167 11.9035 11.3485 11.7665C11.4804 11.6295 11.6592 11.5525 11.8457 11.5525H13.432L11.8321 9.89036C11.7002 9.75338 11.6261 9.56758 11.626 9.37382C11.626 9.18005 11.7 8.99421 11.8319 8.85717C11.9637 8.72013 12.1426 8.64311 12.3291 8.64307C12.5155 8.64302 12.6944 8.71995 12.8263 8.85693L14.8996 11.0115L16.9738 8.85741C17.1057 8.72046 17.2845 8.64353 17.4709 8.64353C17.6574 8.64353 17.8362 8.72046 17.968 8.85741Z" fill="black" fill-opacity="0.65"/>
+<path d="M17.968 8.85741C18.0999 8.9944 18.1739 9.18018 18.1739 9.37389C18.1739 9.56759 18.0999 9.75337 17.968 9.89036L16.3677 11.5525H17.9395C18.1259 11.5525 18.3048 11.6295 18.4366 11.7665C18.5685 11.9035 18.6426 12.0893 18.6426 12.283C18.6426 12.4768 18.5685 12.6626 18.4366 12.7996C18.3048 12.9366 18.1259 13.0136 17.9395 13.0136H15.5648V14.4746H17.9395C18.1259 14.4746 18.3048 14.5516 18.4366 14.6885C18.5685 14.8255 18.6426 15.0114 18.6426 15.2051C18.6426 15.3988 18.5685 15.5847 18.4366 15.7217C18.3048 15.8587 18.1259 15.9356 17.9395 15.9356H15.5648V18.6268C15.5648 18.8206 15.4907 19.0064 15.3588 19.1434C15.227 19.2804 15.0481 19.3574 14.8616 19.3574C14.6752 19.3574 14.4963 19.2804 14.3645 19.1434C14.2326 19.0064 14.1585 18.8206 14.1585 18.6268V15.9356H11.8457C11.6592 15.9356 11.4804 15.8587 11.3485 15.7217C11.2167 15.5847 11.1426 15.3988 11.1426 15.2051C11.1426 15.0114 11.2167 14.8255 11.3485 14.6885C11.4804 14.5516 11.6592 14.4746 11.8457 14.4746H14.1585V13.0136H11.8457C11.6592 13.0136 11.4804 12.9366 11.3485 12.7996C11.2167 12.6626 11.1426 12.4768 11.1426 12.283C11.1426 12.0893 11.2167 11.9035 11.3485 11.7665C11.4804 11.6295 11.6592 11.5525 11.8457 11.5525H13.432L11.8321 9.89036C11.7002 9.75338 11.6261 9.56758 11.626 9.37382C11.626 9.18005 11.7 8.99421 11.8319 8.85717C11.9637 8.72013 12.1426 8.64311 12.3291 8.64307C12.5155 8.64302 12.6944 8.71995 12.8263 8.85693L14.8996 11.0115L16.9738 8.85741C17.1057 8.72046 17.2845 8.64353 17.4709 8.64353C17.6574 8.64353 17.8362 8.72046 17.968 8.85741Z" fill="black" fill-opacity="0.45"/>
+</g>
+</g>
+</svg>

src/assets/svgs/order.svg

@@ -0,0 +1,19 @@
+<svg width="25" height="25" viewBox="0 0 25 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame" clip-path="url(#clip0_460_11251)">
+<g id="Vector">
+<path d="M21.0396 20.5987V7.57445C21.0396 6.66024 20.2984 5.91908 19.3842 5.91908C17.8723 5.91908 16.661 5.14492 15.8139 4.52328C15.5257 4.30828 15.241 4.08853 14.96 3.86411C14.8379 3.7679 14.7153 3.67226 14.5923 3.57719C14.2831 3.32825 13.9558 3.10259 13.6132 2.90208C13.4345 2.80304 13.1259 2.6926 12.6 2.6926C11.8645 2.6926 11.4239 2.84176 11.1655 2.98292C10.8695 3.14457 10.5473 3.36659 10.1602 3.65461L9.81638 3.91193C9.53174 4.12595 9.21295 4.36732 8.91127 4.57795C8.0483 5.18135 6.83012 5.91908 5.34781 5.91908C4.44724 5.91908 3.71748 6.64884 3.71748 7.55053V20.5976C3.71748 21.0505 3.8974 21.4849 4.21767 21.8052C4.53793 22.1254 4.9723 22.3054 5.42522 22.3054H19.3319C19.7848 22.3054 20.2192 22.1254 20.5394 21.8052C20.8597 21.4849 21.0396 21.0505 21.0396 20.5976V20.5987ZM22.7473 7.57445V20.5987C22.7473 21.5046 22.3875 22.3733 21.747 23.0139C21.1064 23.6544 20.2377 24.0142 19.3319 24.0142H5.4252C4.51936 24.0142 3.65064 23.6544 3.01012 23.0138C2.3696 22.3733 2.00977 21.5046 2.00977 20.5987V7.55053C2.00977 6.66512 2.36142 5.81595 2.98739 5.18976C3.61337 4.56358 4.46242 4.21164 5.34783 4.21134C6.58308 4.21134 7.68059 3.38367 8.75646 2.57192C9.28699 2.17229 9.81298 1.77497 10.3469 1.4835C10.8968 1.18409 11.6277 0.984863 12.6 0.984863C13.3764 0.984863 13.9776 1.15109 14.4409 1.40839C14.9897 1.71235 15.5202 2.13132 16.0542 2.5537C17.0993 3.37797 18.1547 4.21134 19.3843 4.21134C19.8259 4.21134 20.2632 4.29833 20.6713 4.46734C21.0793 4.63635 21.45 4.88407 21.7623 5.19637C22.0746 5.50866 22.3224 5.87941 22.4914 6.28744C22.6604 6.69547 22.7473 7.1328 22.7473 7.57445Z" fill="black" fill-opacity="0.85"/>
+<path d="M21.0396 20.5987V7.57445C21.0396 6.66024 20.2984 5.91908 19.3842 5.91908C17.8723 5.91908 16.661 5.14492 15.8139 4.52328C15.5257 4.30828 15.241 4.08853 14.96 3.86411C14.8379 3.7679 14.7153 3.67226 14.5923 3.57719C14.2831 3.32825 13.9558 3.10259 13.6132 2.90208C13.4345 2.80304 13.1259 2.6926 12.6 2.6926C11.8645 2.6926 11.4239 2.84176 11.1655 2.98292C10.8695 3.14457 10.5473 3.36659 10.1602 3.65461L9.81638 3.91193C9.53174 4.12595 9.21295 4.36732 8.91127 4.57795C8.0483 5.18135 6.83012 5.91908 5.34781 5.91908C4.44724 5.91908 3.71748 6.64884 3.71748 7.55053V20.5976C3.71748 21.0505 3.8974 21.4849 4.21767 21.8052C4.53793 22.1254 4.9723 22.3054 5.42522 22.3054H19.3319C19.7848 22.3054 20.2192 22.1254 20.5394 21.8052C20.8597 21.4849 21.0396 21.0505 21.0396 20.5976V20.5987ZM22.7473 7.57445V20.5987C22.7473 21.5046 22.3875 22.3733 21.747 23.0139C21.1064 23.6544 20.2377 24.0142 19.3319 24.0142H5.4252C4.51936 24.0142 3.65064 23.6544 3.01012 23.0138C2.3696 22.3733 2.00977 21.5046 2.00977 20.5987V7.55053C2.00977 6.66512 2.36142 5.81595 2.98739 5.18976C3.61337 4.56358 4.46242 4.21164 5.34783 4.21134C6.58308 4.21134 7.68059 3.38367 8.75646 2.57192C9.28699 2.17229 9.81298 1.77497 10.3469 1.4835C10.8968 1.18409 11.6277 0.984863 12.6 0.984863C13.3764 0.984863 13.9776 1.15109 14.4409 1.40839C14.9897 1.71235 15.5202 2.13132 16.0542 2.5537C17.0993 3.37797 18.1547 4.21134 19.3843 4.21134C19.8259 4.21134 20.2632 4.29833 20.6713 4.46734C21.0793 4.63635 21.45 4.88407 21.7623 5.19637C22.0746 5.50866 22.3224 5.87941 22.4914 6.28744C22.6604 6.69547 22.7473 7.1328 22.7473 7.57445Z" fill="black" fill-opacity="0.65"/>
+<path d="M21.0396 20.5987V7.57445C21.0396 6.66024 20.2984 5.91908 19.3842 5.91908C17.8723 5.91908 16.661 5.14492 15.8139 4.52328C15.5257 4.30828 15.241 4.08853 14.96 3.86411C14.8379 3.7679 14.7153 3.67226 14.5923 3.57719C14.2831 3.32825 13.9558 3.10259 13.6132 2.90208C13.4345 2.80304 13.1259 2.6926 12.6 2.6926C11.8645 2.6926 11.4239 2.84176 11.1655 2.98292C10.8695 3.14457 10.5473 3.36659 10.1602 3.65461L9.81638 3.91193C9.53174 4.12595 9.21295 4.36732 8.91127 4.57795C8.0483 5.18135 6.83012 5.91908 5.34781 5.91908C4.44724 5.91908 3.71748 6.64884 3.71748 7.55053V20.5976C3.71748 21.0505 3.8974 21.4849 4.21767 21.8052C4.53793 22.1254 4.9723 22.3054 5.42522 22.3054H19.3319C19.7848 22.3054 20.2192 22.1254 20.5394 21.8052C20.8597 21.4849 21.0396 21.0505 21.0396 20.5976V20.5987ZM22.7473 7.57445V20.5987C22.7473 21.5046 22.3875 22.3733 21.747 23.0139C21.1064 23.6544 20.2377 24.0142 19.3319 24.0142H5.4252C4.51936 24.0142 3.65064 23.6544 3.01012 23.0138C2.3696 22.3733 2.00977 21.5046 2.00977 20.5987V7.55053C2.00977 6.66512 2.36142 5.81595 2.98739 5.18976C3.61337 4.56358 4.46242 4.21164 5.34783 4.21134C6.58308 4.21134 7.68059 3.38367 8.75646 2.57192C9.28699 2.17229 9.81298 1.77497 10.3469 1.4835C10.8968 1.18409 11.6277 0.984863 12.6 0.984863C13.3764 0.984863 13.9776 1.15109 14.4409 1.40839C14.9897 1.71235 15.5202 2.13132 16.0542 2.5537C17.0993 3.37797 18.1547 4.21134 19.3843 4.21134C19.8259 4.21134 20.2632 4.29833 20.6713 4.46734C21.0793 4.63635 21.45 4.88407 21.7623 5.19637C22.0746 5.50866 22.3224 5.87941 22.4914 6.28744C22.6604 6.69547 22.7473 7.1328 22.7473 7.57445Z" fill="black" fill-opacity="0.45"/>
+</g>
+<g id="Vector_2">
+<path d="M6.24319 8.95446C6.24319 8.728 6.33315 8.51081 6.49328 8.35068C6.65341 8.19055 6.8706 8.10059 7.09706 8.10059H17.6577C17.8841 8.10059 18.1013 8.19055 18.2615 8.35068C18.4216 8.51081 18.5116 8.728 18.5116 8.95446C18.5116 9.18092 18.4216 9.3981 18.2615 9.55823C18.1013 9.71836 17.8841 9.80833 17.6577 9.80833H7.09706C6.98492 9.80833 6.87389 9.78624 6.77029 9.74333C6.66669 9.70043 6.57256 9.63753 6.49327 9.55824C6.41397 9.47895 6.35108 9.38482 6.30816 9.28122C6.26525 9.17763 6.24316 9.06659 6.24316 8.95446H6.24319ZM6.24319 13.2489C6.24318 13.1367 6.26527 13.0257 6.30818 12.9221C6.35109 12.8185 6.41398 12.7244 6.49327 12.6451C6.57256 12.5658 6.66669 12.5029 6.77029 12.46C6.87389 12.417 6.98492 12.395 7.09706 12.395H12.2134C12.4399 12.395 12.6571 12.4849 12.8172 12.6451C12.9773 12.8052 13.0673 13.0224 13.0673 13.2488C13.0673 13.4753 12.9773 13.6925 12.8172 13.8526C12.6571 14.0128 12.4399 14.1027 12.2134 14.1027H7.09706C6.98492 14.1027 6.87388 14.0806 6.77028 14.0377C6.66668 13.9948 6.57255 13.9319 6.49326 13.8526C6.41396 13.7733 6.35107 13.6792 6.30816 13.5756C6.26525 13.472 6.24316 13.361 6.24316 13.2488L6.24319 13.2489ZM18.1802 12.6443C18.3406 12.8039 18.431 13.0207 18.4317 13.247C18.4323 13.4733 18.3431 13.6905 18.1837 13.8511L11.9037 20.1606C11.539 20.5273 11.0459 20.7378 10.5288 20.7476C10.0117 20.7574 9.511 20.5657 9.13266 20.213L6.59384 17.8472C6.51184 17.7707 6.44571 17.6787 6.39924 17.5766C6.35278 17.4745 6.32687 17.3642 6.32301 17.2521C6.31522 17.0257 6.39769 16.8055 6.55229 16.6398C6.70688 16.4742 6.92094 16.3768 7.14736 16.369C7.37379 16.3612 7.59403 16.4437 7.75965 16.5983L10.2985 18.9641C10.3526 19.0145 10.4242 19.0418 10.4982 19.0404C10.5721 19.0389 10.6426 19.0086 10.6947 18.9561L16.9746 12.6466C17.1344 12.4864 17.3512 12.3961 17.5775 12.3957C17.8038 12.3953 18.021 12.4847 18.1814 12.6443H18.1802Z" fill="black" fill-opacity="0.85"/>
+<path d="M6.24319 8.95446C6.24319 8.728 6.33315 8.51081 6.49328 8.35068C6.65341 8.19055 6.8706 8.10059 7.09706 8.10059H17.6577C17.8841 8.10059 18.1013 8.19055 18.2615 8.35068C18.4216 8.51081 18.5116 8.728 18.5116 8.95446C18.5116 9.18092 18.4216 9.3981 18.2615 9.55823C18.1013 9.71836 17.8841 9.80833 17.6577 9.80833H7.09706C6.98492 9.80833 6.87389 9.78624 6.77029 9.74333C6.66669 9.70043 6.57256 9.63753 6.49327 9.55824C6.41397 9.47895 6.35108 9.38482 6.30816 9.28122C6.26525 9.17763 6.24316 9.06659 6.24316 8.95446H6.24319ZM6.24319 13.2489C6.24318 13.1367 6.26527 13.0257 6.30818 12.9221C6.35109 12.8185 6.41398 12.7244 6.49327 12.6451C6.57256 12.5658 6.66669 12.5029 6.77029 12.46C6.87389 12.417 6.98492 12.395 7.09706 12.395H12.2134C12.4399 12.395 12.6571 12.4849 12.8172 12.6451C12.9773 12.8052 13.0673 13.0224 13.0673 13.2488C13.0673 13.4753 12.9773 13.6925 12.8172 13.8526C12.6571 14.0128 12.4399 14.1027 12.2134 14.1027H7.09706C6.98492 14.1027 6.87388 14.0806 6.77028 14.0377C6.66668 13.9948 6.57255 13.9319 6.49326 13.8526C6.41396 13.7733 6.35107 13.6792 6.30816 13.5756C6.26525 13.472 6.24316 13.361 6.24316 13.2488L6.24319 13.2489ZM18.1802 12.6443C18.3406 12.8039 18.431 13.0207 18.4317 13.247C18.4323 13.4733 18.3431 13.6905 18.1837 13.8511L11.9037 20.1606C11.539 20.5273 11.0459 20.7378 10.5288 20.7476C10.0117 20.7574 9.511 20.5657 9.13266 20.213L6.59384 17.8472C6.51184 17.7707 6.44571 17.6787 6.39924 17.5766C6.35278 17.4745 6.32687 17.3642 6.32301 17.2521C6.31522 17.0257 6.39769 16.8055 6.55229 16.6398C6.70688 16.4742 6.92094 16.3768 7.14736 16.369C7.37379 16.3612 7.59403 16.4437 7.75965 16.5983L10.2985 18.9641C10.3526 19.0145 10.4242 19.0418 10.4982 19.0404C10.5721 19.0389 10.6426 19.0086 10.6947 18.9561L16.9746 12.6466C17.1344 12.4864 17.3512 12.3961 17.5775 12.3957C17.8038 12.3953 18.021 12.4847 18.1814 12.6443H18.1802Z" fill="black" fill-opacity="0.65"/>
+<path d="M6.24319 8.95446C6.24319 8.728 6.33315 8.51081 6.49328 8.35068C6.65341 8.19055 6.8706 8.10059 7.09706 8.10059H17.6577C17.8841 8.10059 18.1013 8.19055 18.2615 8.35068C18.4216 8.51081 18.5116 8.728 18.5116 8.95446C18.5116 9.18092 18.4216 9.3981 18.2615 9.55823C18.1013 9.71836 17.8841 9.80833 17.6577 9.80833H7.09706C6.98492 9.80833 6.87389 9.78624 6.77029 9.74333C6.66669 9.70043 6.57256 9.63753 6.49327 9.55824C6.41397 9.47895 6.35108 9.38482 6.30816 9.28122C6.26525 9.17763 6.24316 9.06659 6.24316 8.95446H6.24319ZM6.24319 13.2489C6.24318 13.1367 6.26527 13.0257 6.30818 12.9221C6.35109 12.8185 6.41398 12.7244 6.49327 12.6451C6.57256 12.5658 6.66669 12.5029 6.77029 12.46C6.87389 12.417 6.98492 12.395 7.09706 12.395H12.2134C12.4399 12.395 12.6571 12.4849 12.8172 12.6451C12.9773 12.8052 13.0673 13.0224 13.0673 13.2488C13.0673 13.4753 12.9773 13.6925 12.8172 13.8526C12.6571 14.0128 12.4399 14.1027 12.2134 14.1027H7.09706C6.98492 14.1027 6.87388 14.0806 6.77028 14.0377C6.66668 13.9948 6.57255 13.9319 6.49326 13.8526C6.41396 13.7733 6.35107 13.6792 6.30816 13.5756C6.26525 13.472 6.24316 13.361 6.24316 13.2488L6.24319 13.2489ZM18.1802 12.6443C18.3406 12.8039 18.431 13.0207 18.4317 13.247C18.4323 13.4733 18.3431 13.6905 18.1837 13.8511L11.9037 20.1606C11.539 20.5273 11.0459 20.7378 10.5288 20.7476C10.0117 20.7574 9.511 20.5657 9.13266 20.213L6.59384 17.8472C6.51184 17.7707 6.44571 17.6787 6.39924 17.5766C6.35278 17.4745 6.32687 17.3642 6.32301 17.2521C6.31522 17.0257 6.39769 16.8055 6.55229 16.6398C6.70688 16.4742 6.92094 16.3768 7.14736 16.369C7.37379 16.3612 7.59403 16.4437 7.75965 16.5983L10.2985 18.9641C10.3526 19.0145 10.4242 19.0418 10.4982 19.0404C10.5721 19.0389 10.6426 19.0086 10.6947 18.9561L16.9746 12.6466C17.1344 12.4864 17.3512 12.3961 17.5775 12.3957C17.8038 12.3953 18.021 12.4847 18.1814 12.6443H18.1802Z" fill="black" fill-opacity="0.45"/>
+</g>
+</g>
+<defs>
+<clipPath id="clip0_460_11251">
+<rect width="25" height="25" fill="white" transform="translate(0 -0.000488281)"/>
+</clipPath>
+</defs>
+</svg>

src/assets/svgs/setting.svg

@@ -0,0 +1,10 @@
+<svg width="29" height="29" viewBox="0 0 29 29" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="Frame">
+<path id="Vector" d="M19.8392 3.33789H9.72001C9.39065 3.33784 9.06715 3.42494 8.78234 3.59034C8.49752 3.75573 8.26154 3.99354 8.09834 4.27962L3.03921 13.1463C2.87848 13.4281 2.79395 13.7468 2.79395 14.0712C2.79395 14.3956 2.87848 14.7144 3.03921 14.9962L8.09834 23.8628C8.26154 24.1489 8.49752 24.3867 8.78234 24.5521C9.06715 24.7175 9.39065 24.8046 9.72001 24.8046H19.8392C20.1681 24.8045 20.4912 24.7176 20.7758 24.5526C21.0603 24.3875 21.2962 24.1502 21.4595 23.8647L26.5307 14.998C26.6922 14.7158 26.7771 14.3963 26.7771 14.0712C26.7771 13.7461 26.6922 13.4266 26.5307 13.1444L21.4595 4.27776C21.2962 3.9923 21.0604 3.75504 20.776 3.59C20.4915 3.42495 20.1685 3.33798 19.8397 3.33789H19.8392ZM9.72001 5.20456H19.8392L24.9105 14.0712L19.8392 22.9379H9.72001L4.66041 14.0712L9.72001 5.20456Z" fill="#333333"/>
+<g id="Vector_2">
+<path d="M14.7859 9.87109C14.2344 9.87109 13.6882 9.97973 13.1787 10.1908C12.6691 10.4019 12.2061 10.7112 11.8161 11.1012C11.4261 11.4913 11.1167 11.9543 10.9056 12.4638C10.6946 12.9734 10.5859 13.5195 10.5859 14.0711C10.5859 14.6226 10.6946 15.1688 10.9056 15.6784C11.1167 16.1879 11.4261 16.6509 11.8161 17.0409C12.2061 17.4309 12.6691 17.7403 13.1787 17.9514C13.6882 18.1625 14.2344 18.2711 14.7859 18.2711C15.8998 18.2711 16.9681 17.8286 17.7558 17.0409C18.5434 16.2533 18.9859 15.185 18.9859 14.0711C18.9859 12.9572 18.5434 11.8889 17.7558 11.1012C16.9681 10.3136 15.8998 9.87109 14.7859 9.87109ZM14.7859 11.7378C15.0924 11.7378 15.3958 11.7981 15.6789 11.9154C15.962 12.0326 16.2192 12.2045 16.4359 12.4212C16.6525 12.6378 16.8244 12.8951 16.9417 13.1782C17.0589 13.4613 17.1193 13.7647 17.1193 14.0711C17.1193 14.3775 17.0589 14.6809 16.9417 14.964C16.8244 15.2471 16.6525 15.5043 16.4359 15.721C16.2192 15.9377 15.962 16.1096 15.6789 16.2268C15.3958 16.3441 15.0924 16.4044 14.7859 16.4044C14.1671 16.4044 13.5736 16.1586 13.136 15.721C12.6984 15.2834 12.4526 14.6899 12.4526 14.0711C12.4526 13.4523 12.6984 12.8588 13.136 12.4212C13.5736 11.9836 14.1671 11.7378 14.7859 11.7378Z" fill="black" fill-opacity="0.85"/>
+<path d="M14.7859 9.87109C14.2344 9.87109 13.6882 9.97973 13.1787 10.1908C12.6691 10.4019 12.2061 10.7112 11.8161 11.1012C11.4261 11.4913 11.1167 11.9543 10.9056 12.4638C10.6946 12.9734 10.5859 13.5195 10.5859 14.0711C10.5859 14.6226 10.6946 15.1688 10.9056 15.6784C11.1167 16.1879 11.4261 16.6509 11.8161 17.0409C12.2061 17.4309 12.6691 17.7403 13.1787 17.9514C13.6882 18.1625 14.2344 18.2711 14.7859 18.2711C15.8998 18.2711 16.9681 17.8286 17.7558 17.0409C18.5434 16.2533 18.9859 15.185 18.9859 14.0711C18.9859 12.9572 18.5434 11.8889 17.7558 11.1012C16.9681 10.3136 15.8998 9.87109 14.7859 9.87109ZM14.7859 11.7378C15.0924 11.7378 15.3958 11.7981 15.6789 11.9154C15.962 12.0326 16.2192 12.2045 16.4359 12.4212C16.6525 12.6378 16.8244 12.8951 16.9417 13.1782C17.0589 13.4613 17.1193 13.7647 17.1193 14.0711C17.1193 14.3775 17.0589 14.6809 16.9417 14.964C16.8244 15.2471 16.6525 15.5043 16.4359 15.721C16.2192 15.9377 15.962 16.1096 15.6789 16.2268C15.3958 16.3441 15.0924 16.4044 14.7859 16.4044C14.1671 16.4044 13.5736 16.1586 13.136 15.721C12.6984 15.2834 12.4526 14.6899 12.4526 14.0711C12.4526 13.4523 12.6984 12.8588 13.136 12.4212C13.5736 11.9836 14.1671 11.7378 14.7859 11.7378Z" fill="black" fill-opacity="0.65"/>
+<path d="M14.7859 9.87109C14.2344 9.87109 13.6882 9.97973 13.1787 10.1908C12.6691 10.4019 12.2061 10.7112 11.8161 11.1012C11.4261 11.4913 11.1167 11.9543 10.9056 12.4638C10.6946 12.9734 10.5859 13.5195 10.5859 14.0711C10.5859 14.6226 10.6946 15.1688 10.9056 15.6784C11.1167 16.1879 11.4261 16.6509 11.8161 17.0409C12.2061 17.4309 12.6691 17.7403 13.1787 17.9514C13.6882 18.1625 14.2344 18.2711 14.7859 18.2711C15.8998 18.2711 16.9681 17.8286 17.7558 17.0409C18.5434 16.2533 18.9859 15.185 18.9859 14.0711C18.9859 12.9572 18.5434 11.8889 17.7558 11.1012C16.9681 10.3136 15.8998 9.87109 14.7859 9.87109ZM14.7859 11.7378C15.0924 11.7378 15.3958 11.7981 15.6789 11.9154C15.962 12.0326 16.2192 12.2045 16.4359 12.4212C16.6525 12.6378 16.8244 12.8951 16.9417 13.1782C17.0589 13.4613 17.1193 13.7647 17.1193 14.0711C17.1193 14.3775 17.0589 14.6809 16.9417 14.964C16.8244 15.2471 16.6525 15.5043 16.4359 15.721C16.2192 15.9377 15.962 16.1096 15.6789 16.2268C15.3958 16.3441 15.0924 16.4044 14.7859 16.4044C14.1671 16.4044 13.5736 16.1586 13.136 15.721C12.6984 15.2834 12.4526 14.6899 12.4526 14.0711C12.4526 13.4523 12.6984 12.8588 13.136 12.4212C13.5736 11.9836 14.1671 11.7378 14.7859 11.7378Z" fill="black" fill-opacity="0.45"/>
+</g>
+</g>
+</svg>

src/components/card-menu.vue

@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import Card from '@/components/card.vue'
+
+defineProps({
+  customClass: {
+    type: String,
+    default: '',
+  },
+  items: {
+    type: Array as PropType<
+      {
+        title: string
+        desc: string
+        icon: string
+        class: string
+        colStart?: number
+        colEnd?: number
+        rowStart?: number
+        rowEnd?: number
+        iconSize?: number
+      }[]
+    >,
+    default: () => [],
+  },
+})
+</script>
+<template>
+  <view class="my-6 grid grid-gap-2.5" :class="customClass">
+    <template v-for="it of items" :key="it.title">
+      <card
+        :custom-class="
+          [
+            it.class,
+            'flex flex-col justify-between items-center',
+            it.colStart ? `col-start-${it.colStart}` : '',
+            it.colEnd ? `col-end-${it.colEnd}` : '',
+            it.rowStart ? `row-start-${it.rowStart}` : '',
+            it.rowEnd ? `row-end-${it.rowEnd}` : '',
+          ].join(' ')
+        "
+      >
+        <div class="my-3.5 flex flex-col justify-start h-full">
+          <div class="text-black/80 text-base font-normal font-['PingFang SC'] leading-[10.18px]">
+            {{ it.title }}
+          </div>
+          <div class="mt-1 text-black/40 text-xs font-normal font-['PingFang SC'] leading-normal">
+            {{ it.desc }}
+          </div>
+        </div>
+        <view class="flex-1 w-full flex items-end justify-end">
+          <wd-img :src="it.icon" :width="it.iconSize ?? 24" :height="it.iconSize ?? 24"></wd-img>
+        </view>
+      </card>
+    </template>
+  </view>
+</template>

src/components/card.vue

@@ -1,7 +1,7 @@
 <script lang="ts" setup>
 defineProps({
   customClass: {
-    type: String || Array,
+    type: String || (Array as PropType<string | string[]>),
     default: () => '',
   },
 })

src/components/start-menu-button.vue

@@ -0,0 +1,39 @@
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+const menuBtnClientRect = ref<UniNamespace.GetMenuButtonBoundingClientRectRes>({
+  width: 0,
+  height: 0,
+  top: 0,
+  right: 0,
+  bottom: 0,
+  left: 0,
+})
+const startMenuBtnStyle = ref({
+  width: '0px',
+  height: '0px',
+  marginLeft: '0px',
+})
+// 获取小程序胶囊距离
+onMounted(async () => {
+  const { windowHeight, windowWidth } = await uni.getSystemInfo()
+  //   console.log(windowHeight, windowWidth)
+  // #ifdef MP-WEIXIN
+  menuBtnClientRect.value = await uni.getMenuButtonBoundingClientRect()
+  //   console.log(menuBtnClientRect.value)
+  startMenuBtnStyle.value = {
+    width: menuBtnClientRect.value.width + 'px',
+    height: menuBtnClientRect.value.height + 'px',
+    marginLeft: `${windowWidth - menuBtnClientRect.value.right}px`,
+  }
+  //   console.log(startMenuBtnStyle.value)
+  // #endif
+})
+</script>
+<template>
+  <div>
+    <div :style="{ height: menuBtnClientRect.top + 'px' }"></div>
+    <div class="bg-red rounded-full flex items-center px-3 box-border" :style="startMenuBtnStyle">
+      扫一扫
+    </div>
+  </div>
+</template>

src/components/tabbar-evo.vue

@@ -0,0 +1,66 @@
+<script lang="ts" setup>
+import { onMounted, ref } from 'vue'
+const props = defineProps({
+  items: {
+    type: Array as PropType<
+      {
+        title: string
+        icon: string
+        iconPath: string
+        path: string
+        hiddenTitle?: boolean
+      }[]
+    >,
+    default: () => [],
+  },
+  fixed: {
+    type: Boolean,
+    default: false,
+  },
+  safeAreaInsetBottom: {
+    type: Boolean,
+    default: false,
+  },
+})
+const safeAreaInsets = ref({ bottom: 0 })
+const tabbar = ref<HTMLElement | undefined>()
+
+onMounted(async () => {
+  if (props.safeAreaInsetBottom) {
+    // uniapp 获取safeAreaInsetBottom
+    const res = await uni.getSystemInfoSync()
+    safeAreaInsets.value = res.safeAreaInsets
+    // 获取到tabbar的dom计算过的margin
+    if (tabbar.value) {
+      tabbar.value.style.marginBottom = `${safeAreaInsets.value.bottom + 14}px`
+    }
+  }
+})
+</script>
+<template>
+  <div>
+    <!-- <wd-tabbar fixed shape="round" safeAreaInsetBottom>
+      <template v-for="it of items" :key="it.id">
+        <wd-tabbar-item :title="it.title" :icon="it.icon">
+          <template #icon v-if="it.iconPath">
+            <wd-img round height="40rpx" width="40rpx" :src="it.iconPath"></wd-img>
+          </template>
+        </wd-tabbar-item>
+      </template>
+    </wd-tabbar> -->
+    <div>
+      <div
+        ref="tabbar"
+        :class="[fixed ? 'fixed bottom-0 left-0 right-0' : '']"
+        class="m-3.5 h-[60px] bg-white/70 rounded-[60px] border border-white backdrop-blur-[25px] flex items-center justify-around"
+      >
+        <template v-for="({ iconPath, title, hiddenTitle }, i) in items" :key="i">
+          <div class="flex flex-col items-center justify-center">
+            <wd-img round height="40rpx" width="40rpx" :src="iconPath"></wd-img>
+            <span v-if="!hiddenTitle">{{ title }}</span>
+          </div>
+        </template>
+      </div>
+    </div>
+  </div>
+</template>

src/core/libs/pngs.ts

@@ -1,3 +1,9 @@
 import scheduleCardBg from '@/assets/pngs/schedule-card-bg.png'
+import studyTourItemBg from '@/assets/pngs/study-tour-item-bg.png'
+import scheduleBg from '@/assets/pngs/schedule-bg.png'
+import vipBg from '@/assets/pngs/vip-bg.png'
+import treaty from '@/assets/pngs/treaty.png'
+import settled from '@/assets/pngs/settled.png'
+import designer from '@/assets/pngs/designer.png'
 
-export { scheduleCardBg }
+export { scheduleCardBg, studyTourItemBg, scheduleBg, vipBg, treaty, settled, designer }

src/core/libs/svgs.ts

@@ -8,4 +8,25 @@ import camera from '@/assets/svgs/camera.svg'
 import scheduleCardBg from '@/assets/svgs/schedule-card-bg.svg'
 import map from '@/assets/svgs/map.svg'
 import thumbsUp from '@/assets/svgs/thumbs-up.svg'
-export { polygon16, frame, peoples, right, wechat, award, camera, scheduleCardBg, map, thumbsUp }
+import integral from '@/assets/svgs/integral.svg'
+import coupon from '@/assets/svgs/coupon.svg'
+import order from '@/assets/svgs/order.svg'
+import agent from '@/assets/svgs/agent.svg'
+import setting from '@/assets/svgs/setting.svg'
+export {
+  polygon16,
+  frame,
+  peoples,
+  right,
+  wechat,
+  award,
+  camera,
+  scheduleCardBg,
+  map,
+  thumbsUp,
+  integral,
+  coupon,
+  order,
+  agent,
+  setting,
+}

src/layouts/tabbar.vue

@@ -1,5 +1,7 @@
 <script setup lang="ts">
+import TabbarEvo from '@/components/tabbar-evo.vue'
 import type { ConfigProviderThemeVars } from 'wot-design-uni'
+// import TabbarEvo from 'ano-ui/components/TabbarEvo/TabbarEvo.vue'
 
 const themeVars: ConfigProviderThemeVars = {
   // colorTheme: 'red',
@@ -7,7 +9,7 @@ const themeVars: ConfigProviderThemeVars = {
   // buttonPrimaryColor: '#07c160',
 }
 const items = [
-  { title: '首页', icon: 'home', iconPath: '/static/tabbar/home.svg', path: '/pages/index/index' },
+  { title: '首页', icon: 'home', iconPath: '/static/tabbar/home.svg', path: '/pages/home/index' },
   {
     title: '材料',
     icon: 'home',
@@ -19,6 +21,7 @@ const items = [
     icon: 'home',
     iconPath: '/static/tabbar/publish.svg',
     path: '/pages/publish/index',
+    hiddenTitle: true,
   },
   {
     title: '消息',
@@ -35,15 +38,8 @@ const items = [
     <view class="bg-[#f6f6f6] pb-20">
       <slot />
     </view>
-    <wd-tabbar fixed shape="round" safeAreaInsetBottom>
-      <template v-for="it of items" :key="it.id">
-        <wd-tabbar-item :title="it.title" :icon="it.icon">
-          <template #icon v-if="it.iconPath">
-            <wd-img round height="40rpx" width="40rpx" :src="it.iconPath"></wd-img>
-          </template>
-        </wd-tabbar-item>
-      </template>
-    </wd-tabbar>
+
+    <TabbarEvo :items="items" fixed safeAreaInsetBottom />
     <wd-toast />
     <wd-message-box />
   </wd-config-provider>

src/pages.json

@@ -29,6 +29,15 @@
       },
       {
         "pagePath": "pages/about/about"
+      },
+      {
+        "pagePath": "pages/publish/index"
+      },
+      {
+        "pagePath": "pages/messages/index"
+      },
+      {
+        "pagePath": "pages/mine/index"
       }
     ]
   },
@@ -42,6 +51,10 @@
       {
         "name": "登录",
         "path": "pages/login/index"
+      },
+      {
+        "name": "我的",
+        "path": "pages/mine/index"
       }
     ]
   },
@@ -83,8 +96,10 @@
     {
       "path": "pages/mine/index",
       "type": "page",
+      "layout": "tabbar",
       "style": {
-        "navigationBarTitleText": "材料"
+        "navigationBarTitleText": "我的",
+        "navigationStyle": "custom"
       }
     },
     {

src/pages/home/study-tour/components/study-tour-card.vue

@@ -0,0 +1,89 @@
+<script lang="ts" setup>
+import TiltedButton from '@/components/tilted-button.vue'
+import { studyTourItemBg } from '@/core/libs/pngs'
+defineProps({
+  customClass: {
+    type: String,
+    default: () => '',
+  },
+})
+const toDetail = () => {
+  uni.navigateTo({
+    url: '/pages/home/study-tour/detail',
+  })
+}
+</script>
+<template>
+  <view class="relative w-full box-border" :class="customClass" @click="toDetail">
+    <view class="relative h-full mx--2.5 mb--6 mt--1 box-border">
+      <wd-img :width="'100%'" :height="'100%'" :src="studyTourItemBg" mode="widthFix"></wd-img>
+    </view>
+    <view class="absolute left-0 right-0 top-1 bottom-6 z-1 p-3.5">
+      <view class="w-full h-full flex flex-col justify-between">
+        <div>1</div>
+        <div class="w-[321px] h-[88px] relative">
+          <div class="w-[94px] h-3 left-[185px] top-[64px] absolute">
+            <div
+              class="left-0 top-0 absolute text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+            >
+              07.15 08.10
+            </div>
+          </div>
+          <wd-img
+            custom-class="w-[110px] h-[88px] left-0 top-0 absolute rounded-[10px] overflow-hidden vertical-bottom"
+            src="https://via.placeholder.com/110x88"
+            mode="scaleToFill"
+          />
+          <div
+            class="w-[202px] left-[119px] top-0 absolute text-black text-base font-normal font-['PingFang SC'] leading-relaxed"
+          >
+            活动预告 | 日本研学·东京艺术大学设计游学
+          </div>
+          <div
+            class="left-[119px] top-[64px] absolute text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+          >
+            游学时间：
+          </div>
+        </div>
+        <view class="flex items-center justify-between mb-1.5">
+          <view
+            class="flex items-center text-black/40 text-sm font-normal font-['PingFang SC'] leading-[34px]"
+          >
+            距结束还剩
+            <view
+              class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
+            >
+              <view
+                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+              >
+                05
+              </view>
+            </view>
+            天
+            <div
+              class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
+            >
+              <div
+                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+              >
+                05
+              </div>
+            </div>
+            时
+            <div
+              class="w-4 h-4 bg-black/90 rounded flex-col justify-center items-center gap-2.5 inline-flex mx-1.5"
+            >
+              <div
+                class="text-white text-[10px] font-normal font-['PingFang SC'] leading-[10.18px]"
+              >
+                05
+              </div>
+            </div>
+            分
+          </view>
+          <tilted-button>立即报名</tilted-button>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>

src/pages/home/study-tour/detail.vue

@@ -0,0 +1,12 @@
+<route lang="yaml">
+style:
+  navigationBarTitleText: 游学计划
+  navigationBarBackgroundColor: '#fff'
+  navigationStyle: 'custom'
+</route>
+<script setup lang="ts"></script>
+<template>
+  <div>
+    <div class="asp"></div>
+  </div>
+</template>

src/pages/home/study-tour/index.vue

@@ -11,11 +11,15 @@ import SectionHeading from '@/components/section-heading.vue'
 import TiltedButton from '@/components/tilted-button.vue'
 import { frame, peoples, polygon16 } from '@/core/libs/svgs'
 import ClassItem from '../components/class-item.vue'
+
+const toList = () => {
+  uni.navigateTo({ url: '/pages/home/study-tour/list' })
+}
 </script>
 <template>
   <view class="px-3.5">
     <view class="my-6">
-      <card class=""></card>
+      <card class="" @click="toList">查看全部</card>
     </view>
     <card custom-class="my-6 p-0!">
       <view class="relative">

src/pages/home/study-tour/list.vue

@@ -0,0 +1,29 @@
+<route lang="yaml">
+style:
+  navigationBarTitleText: 游学计划
+  navigationBarBackgroundColor: '#fff'
+</route>
+<script setup lang="ts">
+import SectionHeading from '@/components/section-heading.vue'
+import { studyTourItemBg } from '@/core/libs/pngs'
+import { getStudyTours } from '@/core/libs/requests'
+import dayjs from 'dayjs'
+import StudyTourCard from './components/study-tour-card.vue'
+
+const { data, run } = useRequest(() => getStudyTours())
+const title = computed(() => `${dayjs().year()}年游学计划`)
+onMounted(() => run())
+</script>
+<template>
+  <div class="px-3.5">
+    <SectionHeading custom-class="py-6" :title="title"></SectionHeading>
+    <div
+      class="mx-3.5 text-justify text-black/40 text-sm font-normal font-['PingFang SC'] leading-relaxed"
+    >
+      *我们为您精心打造了一个独特且极具价值的游学项目。这个项目的核心旨在全方位提升
+    </div>
+    <template v-for="(it, index) in data" :key="index">
+      <StudyTourCard custom-class="my-6"></StudyTourCard>
+    </template>
+  </div>
+</template>

src/pages/mine/index.vue

@@ -1,11 +1,154 @@
 <route lang="json5">
-{ style: { navigationBarTitleText: '材料' } }
+{ layout: 'tabbar', style: { navigationBarTitleText: '我的', navigationStyle: 'custom' } }
 </route>
 
-<script setup lang="ts"></script>
+<script setup lang="ts">
+import { onMounted, ref } from 'vue'
+import Card from '@/components/card.vue'
+import CardMenu from '@/components/card-menu.vue'
+import SectionHeading from '@/components/section-heading.vue'
+import StartMenuButton from '@/components/start-menu-button.vue'
+import { designer, settled, treaty, vipBg } from '@/core/libs/pngs'
+import { integral, coupon, order, agent, setting, wechat, award, camera } from '@/core/libs/svgs'
+
+const menus = ref([
+  { title: '积分明细', icon: integral },
+  { title: '优惠券包', icon: coupon },
+  { title: '我的订单', icon: order },
+  { title: '专属客服', icon: agent },
+  { title: '个人设置', icon: setting },
+])
+const pieces = ref([
+  {
+    title: '设计师成长计划',
+    desc: '赋能设计共同成长',
+    icon: designer,
+    class: 'items-start! pb-0 pr-0 col-start-1 row-start-1 row-end-3',
+    iconSize: 102,
+  },
+  {
+    title: '材料商入驻',
+    desc: '提供优质材料商',
+    icon: settled,
+    class: 'flex-row! pb-0 pr-0 col-start-2 row-start-1',
+    iconSize: 68,
+  },
+  {
+    title: '筑巢荟公约',
+    desc: '共同遵守平台公约',
+    icon: treaty,
+    class: 'col-start-2 row-start-2 flex-row! pb-0',
+    iconSize: 44,
+  },
+])
+</script>
 
 <template>
-  <view></view>
+  <view>
+    <div class="bg-black/30 backdrop-blur-[60px] aspect-[1.15/1]">
+      <StartMenuButton />
+      <div class="my-6.5 px-3.5 flex">
+        <img
+          class="w-[72px] h-[72px] rounded-full border border-white"
+          src="https://via.placeholder.com/72x72"
+        />
+        <div class="ms-3.5 ml-3.5">
+          <div class="text-white text-xl font-normal font-['PingFang SC'] leading-normal">
+            用户SEI142
+          </div>
+          <div
+            class="mt-2 w-[63px] h-[26px] bg-black/10 rounded-[20px] border border-white/60 flex items-center justify-center"
+          >
+            <div
+              class="text-center text-white text-xs font-normal font-['PingFang SC'] leading-normal"
+            >
+              未认证
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="px-3.5 flex items-center">
+        <div class="flex items-center">
+          <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal mr-1">
+            36
+          </div>
+          <div
+            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang SC'] leading-normal"
+          >
+            分享
+          </div>
+        </div>
+
+        <div class="h-4 w-[2px] mx-4 bg-[#e9e7e4]"></div>
+
+        <div class="flex items-center">
+          <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal mr-1">
+            36
+          </div>
+          <div
+            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang SC'] leading-normal"
+          >
+            分享
+          </div>
+        </div>
+
+        <div class="h-4 w-[2px] mx-4 bg-[#e9e7e4]"></div>
+
+        <div class="flex items-center">
+          <div class="text-white text-base font-normal font-['PingFang SC'] leading-normal mr-1">
+            36
+          </div>
+          <div
+            class="text-center text-[#e9e7e4] text-xs font-normal font-['PingFang SC'] leading-normal"
+          >
+            分享
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="relative top--18">
+      <div class="mx-3.5 box-border absolute left-0 right-0 top-0">
+        <wd-img :src="vipBg" width="100%" mode="widthFix"></wd-img>
+      </div>
+      <div class="mx-3.5 box-border absolute left-0 right-0 top-0 p-3.5">
+        <div class="flex items-center">
+          <div
+            class="text-center text-[#faeac6] text-sm font-normal font-['PingFang SC'] leading-normal"
+          >
+            查看会员等级权益
+          </div>
+          <div class="flex-1"></div>
+          <div
+            class="w-[83px] h-[29px] bg-gradient-to-l from-[#ffdab6] to-[#ffebd5] rounded-[30px] flex items-center justify-center"
+          >
+            <div
+              class="text-[#9e5934] text-[13px] font-normal font-['PingFang SC'] leading-relaxed"
+            >
+              去认证
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <view class="bg-neutral-100 relative bottom-4 rounded-t-2xl py-1 px-3.5">
+      <div class="flex justify-around my-6">
+        <template v-for="({ title, icon }, i) in menus" :key="i">
+          <div class="flex flex-col items-center">
+            <div class="relative flex-col justify-start items-start inline-flex">
+              <wd-img :src="icon" width="24" height="24" custom-class="vertical-bottom"></wd-img>
+            </div>
+            <div
+              class="mt-2 text-black/90 text-[12.86px] font-normal font-['PingFang SC'] leading-relaxed"
+            >
+              {{ title }}
+            </div>
+          </div>
+        </template>
+      </div>
+      <SectionHeading title="和筑巢荟一起共同成长"></SectionHeading>
+      <CardMenu :items="pieces" custom-class="grid-cols-2" />
+    </view>
+  </view>
 </template>
 
 <style scoped lang="scss"></style>

src/style/index.scss

@@ -22,7 +22,7 @@ page {
 /* ifdef(MP-WEIXIN) */
 // 微信小程序填充最小高度
 /* stylelint-disable-next-line selector-type-no-unknown */
-layout-default-uni,
+// layout-default-uni,
 .wot-theme-light {
   display: flex;
   flex-direction: column;

src/types/uni-pages.d.ts

@@ -25,7 +25,7 @@ interface NavigateToOptions {
 interface RedirectToOptions extends NavigateToOptions {}
 
 interface SwitchTabOptions {
-  url: "/pages/home/index" | "/pages/about/about"
+  url: "/pages/home/index" | "/pages/about/about" | "/pages/publish/index" | "/pages/messages/index" | "/pages/mine/index"
 }
 
 type ReLaunchOptions = NavigateToOptions | SwitchTabOptions;

yalc.lock

@@ -2,7 +2,13 @@
   "version": "v1",
   "packages": {
     "@pandora/ui": {
-      "signature": "3bad5eee532e41648235669f006de1c3"
+      "signature": "956ce6f38ff3f9c54fe4046b7612d5e0"
+    },
+    "pandora": {
+      "signature": "c098aa18f768e18d62a730b2b239cc1f"
+    },
+    "ano-ui": {
+      "signature": "9552fa14db80cef9c0fd390732515772"
     }
   }
 }