From 25521bd2209567edb108438821f6b3a4669bee53 Mon Sep 17 00:00:00 2001 From: weiwei Date: Wed, 16 Jul 2025 10:34:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9C=8D=E5=8A=A1=E5=9B=BE?= =?UTF-8?q?=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pnpm-lock.yaml | 177 +++++++++++++++++++----- src/pages/tabbar/index.vue | 6 +- src/pages/tabbar/my.vue | 4 +- src/static/tabbar/integrated-select.png | Bin 0 -> 3923 bytes src/static/tabbar/integrated.png | Bin 0 -> 3849 bytes 5 files changed, 150 insertions(+), 37 deletions(-) create mode 100644 src/static/tabbar/integrated-select.png create mode 100644 src/static/tabbar/integrated.png diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 0b6dd02..f6b52f4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,10 +13,10 @@ importers: version: 3.0.0-4020920240930001(@dcloudio/types@3.4.14)(postcss@8.5.1)(rollup@4.34.2)(vue@3.5.13(typescript@4.9.5)) '@dcloudio/uni-app-harmony': specifier: 3.0.0-4020920240930001 - version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) '@dcloudio/uni-app-plus': specifier: 3.0.0-4020920240930001 - version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) '@dcloudio/uni-components': specifier: 3.0.0-4020920240930001 version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vue@3.5.13(typescript@4.9.5)) @@ -107,7 +107,7 @@ importers: version: 3.0.0-4020920240930001 '@dcloudio/vite-plugin-uni': specifier: 3.0.0-4020920240930001 - version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + version: 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) '@types/node': specifier: ^18.0.0 version: 18.19.75 @@ -117,6 +117,9 @@ importers: '@vue/tsconfig': specifier: ^0.1.3 version: 0.1.3(@types/node@18.19.75) + less: + specifier: ^4.3.0 + version: 4.3.0 sass: specifier: 1.71.1 version: 1.71.1 @@ -128,13 +131,13 @@ importers: version: 4.9.5 unocss: specifier: ^0.58.5 - version: 0.58.9(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0)) + version: 0.58.9(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0)) unocss-preset-weapp: specifier: ^0.58.6 version: 0.58.8(rollup@4.34.2) vite: specifier: 5.2.8 - version: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + version: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) vue-tsc: specifier: ^1.0.24 version: 1.8.27(typescript@4.9.5) @@ -2065,6 +2068,9 @@ packages: resolution: {integrity: sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==} engines: {node: '>= 0.6'} + copy-anything@2.0.6: + resolution: {integrity: sha512-1j20GZTsvKNkc4BY3NpMOM8tt///wY3FpIzozTOFO2ffuZcV61nojHXVKIy3WM+7ADCy5FVhdZYHYDdgTU0yJw==} + core-js-compat@3.40.0: resolution: {integrity: sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==} @@ -2245,6 +2251,10 @@ packages: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} + errno@0.1.8: + resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==} + hasBin: true + error-ex@1.3.2: resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==} @@ -2530,6 +2540,10 @@ packages: resolution: {integrity: sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==} engines: {node: '>=0.10.0'} + iconv-lite@0.6.3: + resolution: {integrity: sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==} + engines: {node: '>=0.10.0'} + icss-replace-symbols@1.1.0: resolution: {integrity: sha512-chIaY3Vh2mh2Q3RGXttaDIzeiPvaVXJ+C4DAh/w3c37SKZ/U6PGMmuicR2EQQp9bKG8zLMCl7I+PtIoOOPp8Gg==} @@ -2542,6 +2556,11 @@ packages: ieee754@1.2.1: resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==} + image-size@0.5.5: + resolution: {integrity: sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ==} + engines: {node: '>=0.10.0'} + hasBin: true + immutable@4.3.7: resolution: {integrity: sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==} @@ -2613,6 +2632,9 @@ packages: is-typedarray@1.0.0: resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==} + is-what@3.14.1: + resolution: {integrity: sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==} + isbinaryfile@5.0.4: resolution: {integrity: sha512-YKBKVkKhty7s8rxddb40oOkuP0NbaeXrQvLin6QMHL7Ypiy2RW9LwOVrVgZRyOrhQlayMd9t+D8yDy8MKFTSDQ==} engines: {node: '>= 18.0.0'} @@ -2852,6 +2874,11 @@ packages: resolution: {integrity: sha512-M6T051+5QCGLBQb8id3hdvIW8+zeFV2FyBGFS9IEK5H9Wt4MueD4bW1eWikpHgZp+5xR3l5c8pZUkQsIA0BFZg==} engines: {node: '>=8'} + less@4.3.0: + resolution: {integrity: sha512-X9RyH9fvemArzfdP8Pi3irr7lor2Ok4rOttDXBhlwDg+wKQsXOXgHWduAJE1EsF7JJx0w0bcO6BC6tCKKYnXKA==} + engines: {node: '>=14'} + hasBin: true + leven@3.1.0: resolution: {integrity: sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==} engines: {node: '>=6'} @@ -2919,6 +2946,10 @@ packages: magic-string@0.30.17: resolution: {integrity: sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==} + make-dir@2.1.0: + resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} + engines: {node: '>=6'} + make-dir@4.0.0: resolution: {integrity: sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==} engines: {node: '>=10'} @@ -3028,6 +3059,11 @@ packages: natural-compare@1.4.0: resolution: {integrity: sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==} + needle@3.3.1: + resolution: {integrity: sha512-6k0YULvhpw+RoLNiQCRKOl09Rv1dPLr8hHnVjHqdolKwDrdNyk+Hmrthi4lIGPPz3r39dLx0hsF5s40sZ3Us4Q==} + engines: {node: '>= 4.4.x'} + hasBin: true + negotiator@0.6.3: resolution: {integrity: sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==} engines: {node: '>= 0.6'} @@ -3121,6 +3157,10 @@ packages: resolution: {integrity: sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==} engines: {node: '>=8'} + parse-node-version@1.0.1: + resolution: {integrity: sha512-3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==} + engines: {node: '>= 0.10'} + parse5@6.0.1: resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==} @@ -3181,6 +3221,10 @@ packages: resolution: {integrity: sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==} engines: {node: '>=0.10.0'} + pify@4.0.1: + resolution: {integrity: sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==} + engines: {node: '>=6'} + pinia@2.3.1: resolution: {integrity: sha512-khUlZSwt9xXCaTbbxFYBKDc/bWAGWJjOgvxETwkTN7KRm66EeT1ZdZj6i2ceh9sP2Pzqsbc704r2yngBrxBVug==} peerDependencies: @@ -3291,6 +3335,9 @@ packages: resolution: {integrity: sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==} engines: {node: '>= 0.10'} + prr@1.0.1: + resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==} + psl@1.15.0: resolution: {integrity: sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==} @@ -3472,6 +3519,10 @@ packages: scule@1.3.0: resolution: {integrity: sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==} + semver@5.7.2: + resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==} + hasBin: true + semver@6.3.1: resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} hasBin: true @@ -3685,6 +3736,9 @@ packages: resolution: {integrity: sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==} engines: {node: '>=8'} + tslib@2.8.1: + resolution: {integrity: sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==} + type-detect@4.0.8: resolution: {integrity: sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==} engines: {node: '>=4'} @@ -4810,9 +4864,9 @@ snapshots: '@dcloudio/types@3.4.14': {} - '@dcloudio/uni-app-harmony@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': + '@dcloudio/uni-app-harmony@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': dependencies: - '@dcloudio/uni-app-vite': 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + '@dcloudio/uni-app-vite': 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) debug: 4.4.0 fs-extra: 10.1.0 licia: 1.46.0 @@ -4827,10 +4881,10 @@ snapshots: - vite - vue - '@dcloudio/uni-app-plus@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': + '@dcloudio/uni-app-plus@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': dependencies: '@dcloudio/uni-app-uts': 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vue@3.5.13(typescript@4.9.5)) - '@dcloudio/uni-app-vite': 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + '@dcloudio/uni-app-vite': 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) '@dcloudio/uni-app-vue': 3.0.0-4020920240930001 debug: 4.4.0 fs-extra: 10.1.0 @@ -4879,14 +4933,14 @@ snapshots: - ts-node - vue - '@dcloudio/uni-app-vite@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': + '@dcloudio/uni-app-vite@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': dependencies: '@dcloudio/uni-cli-shared': 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vue@3.5.13(typescript@4.9.5)) '@dcloudio/uni-i18n': 3.0.0-4020920240930001 '@dcloudio/uni-nvue-styler': 3.0.0-4020920240930001 '@dcloudio/uni-shared': 3.0.0-4020920240930001 '@rollup/pluginutils': 5.1.4(rollup@4.34.2) - '@vitejs/plugin-vue': 5.1.0(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + '@vitejs/plugin-vue': 5.1.0(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) '@vue/compiler-dom': 3.4.21 '@vue/compiler-sfc': 3.4.21 debug: 4.4.0 @@ -5367,7 +5421,7 @@ snapshots: - ts-node - vue - '@dcloudio/vite-plugin-uni@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': + '@dcloudio/vite-plugin-uni@3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': dependencies: '@babel/core': 7.26.7 '@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.26.7) @@ -5375,9 +5429,9 @@ snapshots: '@dcloudio/uni-cli-shared': 3.0.0-4020920240930001(postcss@8.5.1)(rollup@4.34.2)(vue@3.5.13(typescript@4.9.5)) '@dcloudio/uni-shared': 3.0.0-4020920240930001 '@rollup/pluginutils': 5.1.4(rollup@4.34.2) - '@vitejs/plugin-legacy': 5.3.2(terser@5.37.0)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0)) - '@vitejs/plugin-vue': 5.1.0(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) - '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + '@vitejs/plugin-legacy': 5.3.2(terser@5.37.0)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0)) + '@vitejs/plugin-vue': 5.1.0(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) + '@vitejs/plugin-vue-jsx': 3.1.0(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5)) '@vue/compiler-core': 3.4.21 '@vue/compiler-dom': 3.4.21 '@vue/compiler-sfc': 3.4.21 @@ -5394,7 +5448,7 @@ snapshots: picocolors: 1.1.1 terser: 5.37.0 unplugin-auto-import: 0.16.7(rollup@4.34.2) - vite: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + vite: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) transitivePeerDependencies: - '@nuxt/kit' - '@vueuse/core' @@ -6150,13 +6204,13 @@ snapshots: dependencies: '@types/yargs-parser': 21.0.3 - '@unocss/astro@0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))': + '@unocss/astro@0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))': dependencies: '@unocss/core': 0.58.9 '@unocss/reset': 0.58.9 - '@unocss/vite': 0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0)) + '@unocss/vite': 0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0)) optionalDependencies: - vite: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + vite: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) transitivePeerDependencies: - rollup @@ -6287,7 +6341,7 @@ snapshots: dependencies: '@unocss/core': 0.58.9 - '@unocss/vite@0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))': + '@unocss/vite@0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))': dependencies: '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.4(rollup@4.34.2) @@ -6299,11 +6353,11 @@ snapshots: chokidar: 3.6.0 fast-glob: 3.3.3 magic-string: 0.30.17 - vite: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + vite: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) transitivePeerDependencies: - rollup - '@vitejs/plugin-legacy@5.3.2(terser@5.37.0)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))': + '@vitejs/plugin-legacy@5.3.2(terser@5.37.0)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))': dependencies: '@babel/core': 7.26.7 '@babel/preset-env': 7.26.7(@babel/core@7.26.7) @@ -6314,23 +6368,23 @@ snapshots: regenerator-runtime: 0.14.1 systemjs: 6.15.1 terser: 5.37.0 - vite: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + vite: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue-jsx@3.1.0(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': + '@vitejs/plugin-vue-jsx@3.1.0(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': dependencies: '@babel/core': 7.26.7 '@babel/plugin-transform-typescript': 7.26.7(@babel/core@7.26.7) '@vue/babel-plugin-jsx': 1.2.5(@babel/core@7.26.7) - vite: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + vite: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) vue: 3.5.13(typescript@4.9.5) transitivePeerDependencies: - supports-color - '@vitejs/plugin-vue@5.1.0(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': + '@vitejs/plugin-vue@5.1.0(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0))(vue@3.5.13(typescript@4.9.5))': dependencies: - vite: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + vite: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) vue: 3.5.13(typescript@4.9.5) '@volar/language-core@1.11.1': @@ -6922,6 +6976,10 @@ snapshots: cookie@0.7.1: {} + copy-anything@2.0.6: + dependencies: + is-what: 3.14.1 + core-js-compat@3.40.0: dependencies: browserslist: 4.24.4 @@ -7050,6 +7108,11 @@ snapshots: entities@4.5.0: {} + errno@0.1.8: + dependencies: + prr: 1.0.1 + optional: true + error-ex@1.3.2: dependencies: is-arrayish: 0.2.1 @@ -7375,6 +7438,11 @@ snapshots: dependencies: safer-buffer: 2.1.2 + iconv-lite@0.6.3: + dependencies: + safer-buffer: 2.1.2 + optional: true + icss-replace-symbols@1.1.0: {} icss-utils@5.1.0(postcss@8.5.1): @@ -7383,6 +7451,9 @@ snapshots: ieee754@1.2.1: {} + image-size@0.5.5: + optional: true + immutable@4.3.7: {} import-local@3.2.0: @@ -7433,6 +7504,8 @@ snapshots: is-typedarray@1.0.0: {} + is-what@3.14.1: {} + isbinaryfile@5.0.4: {} isexe@2.0.0: {} @@ -7913,6 +7986,20 @@ snapshots: dependencies: invert-kv: 3.0.1 + less@4.3.0: + dependencies: + copy-anything: 2.0.6 + parse-node-version: 1.0.1 + tslib: 2.8.1 + optionalDependencies: + errno: 0.1.8 + graceful-fs: 4.2.11 + image-size: 0.5.5 + make-dir: 2.1.0 + mime: 1.6.0 + needle: 3.3.1 + source-map: 0.6.1 + leven@3.1.0: {} licia@1.46.0: {} @@ -7980,6 +8067,12 @@ snapshots: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 + make-dir@2.1.0: + dependencies: + pify: 4.0.1 + semver: 5.7.2 + optional: true + make-dir@4.0.0: dependencies: semver: 7.7.1 @@ -8062,6 +8155,12 @@ snapshots: natural-compare@1.4.0: {} + needle@3.3.1: + dependencies: + iconv-lite: 0.6.3 + sax: 1.4.1 + optional: true + negotiator@0.6.3: {} neo-async@2.6.2: {} @@ -8150,6 +8249,8 @@ snapshots: json-parse-even-better-errors: 2.3.1 lines-and-columns: 1.2.4 + parse-node-version@1.0.1: {} + parse5@6.0.1: {} parseurl@1.3.3: {} @@ -8188,6 +8289,9 @@ snapshots: pify@2.3.0: {} + pify@4.0.1: + optional: true + pinia@2.3.1(typescript@4.9.5)(vue@3.5.13(typescript@4.9.5)): dependencies: '@vue/devtools-api': 6.6.4 @@ -8301,6 +8405,9 @@ snapshots: forwarded: 0.2.0 ipaddr.js: 1.9.1 + prr@1.0.1: + optional: true + psl@1.15.0: dependencies: punycode: 2.3.1 @@ -8484,6 +8591,9 @@ snapshots: scule@1.3.0: {} + semver@5.7.2: + optional: true + semver@6.3.1: {} semver@7.7.1: {} @@ -8694,6 +8804,8 @@ snapshots: dependencies: punycode: 2.3.1 + tslib@2.8.1: {} + type-detect@4.0.8: {} type-fest@0.21.3: {} @@ -8764,9 +8876,9 @@ snapshots: transitivePeerDependencies: - rollup - unocss@0.58.9(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0)): + unocss@0.58.9(postcss@8.5.1)(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0)): dependencies: - '@unocss/astro': 0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0)) + '@unocss/astro': 0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0)) '@unocss/cli': 0.58.9(rollup@4.34.2) '@unocss/core': 0.58.9 '@unocss/extractor-arbitrary-variants': 0.58.9 @@ -8785,9 +8897,9 @@ snapshots: '@unocss/transformer-compile-class': 0.58.9 '@unocss/transformer-directives': 0.58.9 '@unocss/transformer-variant-group': 0.58.9 - '@unocss/vite': 0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0)) + '@unocss/vite': 0.58.9(rollup@4.34.2)(vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0)) optionalDependencies: - vite: 5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0) + vite: 5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0) transitivePeerDependencies: - postcss - rollup @@ -8869,7 +8981,7 @@ snapshots: vary@1.1.2: {} - vite@5.2.8(@types/node@18.19.75)(sass@1.71.1)(terser@5.37.0): + vite@5.2.8(@types/node@18.19.75)(less@4.3.0)(sass@1.71.1)(terser@5.37.0): dependencies: esbuild: 0.20.2 postcss: 8.5.1 @@ -8877,6 +8989,7 @@ snapshots: optionalDependencies: '@types/node': 18.19.75 fsevents: 2.3.3 + less: 4.3.0 sass: 1.71.1 terser: 5.37.0 diff --git a/src/pages/tabbar/index.vue b/src/pages/tabbar/index.vue index 01225c9..e4b04a9 100644 --- a/src/pages/tabbar/index.vue +++ b/src/pages/tabbar/index.vue @@ -1,6 +1,6 @@ diff --git a/src/pages/tabbar/my.vue b/src/pages/tabbar/my.vue index 11ea354..f1dece8 100644 --- a/src/pages/tabbar/my.vue +++ b/src/pages/tabbar/my.vue @@ -25,7 +25,7 @@ - + {{ v.text }} @@ -373,7 +373,7 @@ const onTabLogin = () => (isDevEnv() ? router.jump("/pages/user/login") : login. const onTabMenu = async (item: any) => { const isLogin = await hooks.useCheckLogin() if (isLogin) { - if (item.router == "/pages/tabbar/index") return uni.reLaunch({ url: item.router }) + if (item.router == "/pages/tabbar/index") return uni.switchTab({ url: item.router }) switch (item.text) { case "扫一扫": await scanCode.scan() diff --git a/src/static/tabbar/integrated-select.png b/src/static/tabbar/integrated-select.png new file mode 100644 index 0000000000000000000000000000000000000000..208c9151ba04ed3827791f089a34d77a3815497d GIT binary patch literal 3923 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 IG4mz<2T;WWHvj+t literal 0 HcmV?d00001