diff --git a/package.json b/package.json
index 2ce2407..02a8404 100644
--- a/package.json
+++ b/package.json
@@ -15,10 +15,10 @@
"postinstall": "simple-git-hooks"
},
"dependencies": {
- "@dcloudio/uni-app": "3.0.0-4000720240327001",
- "@dcloudio/uni-app-plus": "3.0.0-4000720240327001",
- "@dcloudio/uni-components": "3.0.0-4000720240327001",
- "@dcloudio/uni-mp-weixin": "3.0.0-4000720240327001",
+ "@dcloudio/uni-app": "3.0.0-4000820240401001",
+ "@dcloudio/uni-app-plus": "3.0.0-4000820240401001",
+ "@dcloudio/uni-components": "3.0.0-4000820240401001",
+ "@dcloudio/uni-mp-weixin": "3.0.0-4000820240401001",
"dayjs": "^1.11.10",
"pinia": "2.0.36",
"pinia-plugin-persistedstate": "^3.2.1",
@@ -30,10 +30,10 @@
"devDependencies": {
"@antfu/eslint-config": "1.1.0",
"@dcloudio/types": "^3.4.3",
- "@dcloudio/uni-automator": "3.0.0-4000720240327001",
- "@dcloudio/uni-cli-shared": "3.0.0-4000720240327001",
- "@dcloudio/uni-stacktracey": "3.0.0-4000720240327001",
- "@dcloudio/vite-plugin-uni": "3.0.0-4000720240327001",
+ "@dcloudio/uni-automator": "3.0.0-4000820240401001",
+ "@dcloudio/uni-cli-shared": "3.0.0-4000820240401001",
+ "@dcloudio/uni-stacktracey": "3.0.0-4000820240401001",
+ "@dcloudio/vite-plugin-uni": "3.0.0-4000820240401001",
"@types/node": "^20.8.10",
"@typescript-eslint/parser": "^6.10.0",
"@uni-helper/uni-app-types": "^0.5.9",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 15450a1..ed1caf1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6,17 +6,17 @@ settings:
dependencies:
'@dcloudio/uni-app':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001(@dcloudio/types@3.4.3)(postcss@8.4.38)(vue@3.4.21)
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001(@dcloudio/types@3.4.3)(postcss@8.4.38)(vue@3.4.21)
'@dcloudio/uni-app-plus':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21)
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21)
'@dcloudio/uni-components':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
'@dcloudio/uni-mp-weixin':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
dayjs:
specifier: ^1.11.10
version: 1.11.10
@@ -47,17 +47,17 @@ devDependencies:
specifier: ^3.4.3
version: 3.4.3
'@dcloudio/uni-automator':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001(jest-environment-node@27.5.1)(jest@27.0.4)(postcss@8.4.38)(vue@3.4.21)
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001(jest-environment-node@27.5.1)(jest@27.0.4)(postcss@8.4.38)(vue@3.4.21)
'@dcloudio/uni-cli-shared':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
'@dcloudio/uni-stacktracey':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001
'@dcloudio/vite-plugin-uni':
- specifier: 3.0.0-4000720240327001
- version: 3.0.0-4000720240327001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21)
+ specifier: 3.0.0-4000820240401001
+ version: 3.0.0-4000820240401001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21)
'@types/node':
specifier: ^20.8.10
version: 20.10.3
@@ -257,7 +257,7 @@ packages:
'@babel/helper-compilation-targets': 7.22.15
'@babel/helper-module-transforms': 7.23.3(@babel/core@7.23.5)
'@babel/helpers': 7.23.5
- '@babel/parser': 7.23.5
+ '@babel/parser': 7.24.1
'@babel/template': 7.22.15
'@babel/traverse': 7.23.5
'@babel/types': 7.23.5
@@ -2648,12 +2648,12 @@ packages:
/@dcloudio/types@3.4.3:
resolution: {integrity: sha512-WzQGX06z2+HU3HnOO+/DxX37jyUECSXCuI7GVjFXs10+ZExTbdouwQXZvH8hR7k/FjuXFjQKHV9fuvfexyXluw==}
- /@dcloudio/uni-app-plus@3.0.0-4000720240327001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21):
- resolution: {integrity: sha512-QD5JEHQ+vGQ3iN1kUA3p0rm40+ohrg4ymctHPYRit6VdIkJmGLuxOaTiBWf8j93/EdNSHfPpFrMxAPbB3c5AZg==}
+ /@dcloudio/uni-app-plus@3.0.0-4000820240401001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21):
+ resolution: {integrity: sha512-zYjE1nik7Uot0PbmdaLr5x1QgdibYo++WFysjrxH09jJGP6kBtuKKPLN3wAooKBMYU7aX99GYZt2nuZFJFE1kg==}
dependencies:
- '@dcloudio/uni-app-uts': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-app-vite': 3.0.0-4000720240327001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21)
- '@dcloudio/uni-app-vue': 3.0.0-4000720240327001
+ '@dcloudio/uni-app-uts': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-app-vite': 3.0.0-4000820240401001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21)
+ '@dcloudio/uni-app-vue': 3.0.0-4000820240401001
debug: 4.3.4
fs-extra: 10.1.0
licia: 1.39.1
@@ -2669,15 +2669,15 @@ packages:
- vue
dev: false
- /@dcloudio/uni-app-uts@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-ED/2sAsaMq0w4d8Rf4XpZhPNuhqagwAjZaQ/fgy6iaAjgDUNMBBFjRw5yW+cgqaEm16BOIwh6ubN8313ghqrvQ==}
+ /@dcloudio/uni-app-uts@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-6MPQAnDX/M1FFVMYmsP7yd5g8u8a1QO5GfvhT/QlMaCAS+Z1TQQhzBaYZWuCjF4Xu+fibEUQXrKUsphefcDFAw==}
dependencies:
- '@babel/parser': 7.23.5
+ '@babel/parser': 7.24.1
'@babel/types': 7.23.5
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
- '@dcloudio/uni-nvue-styler': 3.0.0-4000720240327001
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
+ '@dcloudio/uni-nvue-styler': 3.0.0-4000820240401001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@jridgewell/gen-mapping': 0.3.3
'@jridgewell/trace-mapping': 0.3.20
'@rollup/pluginutils': 4.2.1
@@ -2689,9 +2689,9 @@ packages:
es-module-lexer: 1.4.1
estree-walker: 2.0.2
fs-extra: 10.1.0
- magic-string: 0.30.5
+ magic-string: 0.30.8
picocolors: 1.0.0
- source-map-js: 1.0.2
+ source-map-js: 1.2.0
unplugin-auto-import: 0.16.7
transitivePeerDependencies:
- '@nuxt/kit'
@@ -2703,13 +2703,13 @@ packages:
- vue
dev: false
- /@dcloudio/uni-app-vite@3.0.0-4000720240327001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21):
- resolution: {integrity: sha512-up8h+8NwUSbbfelspTyHCuRUi66BJT8+elfWzGSNAHBo77PGyoEEg+n9Jbp55VuoqU5NiyGwARC1kfRFPVupBg==}
+ /@dcloudio/uni-app-vite@3.0.0-4000820240401001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21):
+ resolution: {integrity: sha512-w9HuZZTm4oVbsJ3/cLcOFiy8nDqNllEGtgj2coI+Bkn3YpSMHJm+NjLui0JGyn2AWy8mJOhvPiZGcWWBPVxfww==}
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
- '@dcloudio/uni-nvue-styler': 3.0.0-4000720240327001
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
+ '@dcloudio/uni-nvue-styler': 3.0.0-4000820240401001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@rollup/pluginutils': 4.2.1
'@vitejs/plugin-vue': 4.5.1(vite@4.5.3)(vue@3.4.21)
'@vue/compiler-dom': 3.3.11
@@ -2728,22 +2728,22 @@ packages:
- vue
dev: false
- /@dcloudio/uni-app-vue@3.0.0-4000720240327001:
- resolution: {integrity: sha512-N0/Gi4rhqbDvQGU9NOeKF38B5G1faaTuLUlItJR6FErHn2/oqnXPDAGoin48tX6q1ecy7r4k2fEpfIXmMIcMpA==}
+ /@dcloudio/uni-app-vue@3.0.0-4000820240401001:
+ resolution: {integrity: sha512-tJqtz03ZwTdsK4baAdVBhOHacWpTrbU7JXZTm/YY2Zy4lQQpM0yX+EAWLs41WyvSdif1h2LLtAbfgf7CFn3wZQ==}
dev: false
- /@dcloudio/uni-app@3.0.0-4000720240327001(@dcloudio/types@3.4.3)(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-H2kp3/RogQHLoZg3eVHECaSdseXiYFMLg9C5kv9IwCwJBcxShCfEglADJgVUAkc6HCqRZdMP5EdIQUIHlYykpA==}
+ /@dcloudio/uni-app@3.0.0-4000820240401001(@dcloudio/types@3.4.3)(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-7tpaE9WwkUHNzpaquTigSd34H42nCj+jshzw9DrJmSzyC1OtTYwiWXHEIVZm3iJLAGLPBLW+gkm//X5VnULGRw==}
peerDependencies:
'@dcloudio/types': ^3.4.8
dependencies:
'@dcloudio/types': 3.4.3
- '@dcloudio/uni-cloud': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-components': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
- '@dcloudio/uni-push': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
- '@dcloudio/uni-stat': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-cloud': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-components': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
+ '@dcloudio/uni-push': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
+ '@dcloudio/uni-stat': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
'@vue/shared': 3.3.11
transitivePeerDependencies:
- '@nuxt/kit'
@@ -2755,13 +2755,13 @@ packages:
- vue
dev: false
- /@dcloudio/uni-automator@3.0.0-4000720240327001(jest-environment-node@27.5.1)(jest@27.0.4)(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-HYFcxuUqerWWxhDF6IUYdZvvjr8J219IcBLE/kPcEZjqw88OiVIK12zk6hRXtKYoUgwkACzNBvf5wVbNpgDBSQ==}
+ /@dcloudio/uni-automator@3.0.0-4000820240401001(jest-environment-node@27.5.1)(jest@27.0.4)(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-0HSvm5iQz8H8loxJ6hZFAqkySITlpDMTnIWGyP4owBAaltJI5KljPu8rs0q6rtFx91fVsGPcOfhmipOQiUWO9g==}
peerDependencies:
jest: 27.0.4
jest-environment-node: 27.5.1
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
address: 1.2.2
cross-env: 7.0.3
debug: 4.3.4
@@ -2787,8 +2787,8 @@ packages:
- vue
dev: true
- /@dcloudio/uni-cli-shared@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-drgnFhSuCHOhE7xtJ3F6YkpGluoE1M1HMJHL9PhTm+ewEX+0BCXYvnpoIaKptRWbYFXZ/CqzgcHH2c/Wu38waQ==}
+ /@dcloudio/uni-cli-shared@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-zv7cL2zlhH0VNVnwEHCE+6XMLhHf1gnba+rlqTE15HdOmtn1fUWTOAExXYQKS38yf17VLFMepWqqqJFAH9GuGQ==}
engines: {node: ^14.18.0 || >=16.0.0}
dependencies:
'@ampproject/remapping': 2.2.1
@@ -2796,8 +2796,8 @@ packages:
'@babel/core': 7.23.5
'@babel/parser': 7.24.1
'@babel/types': 7.23.5
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@intlify/core-base': 9.1.9
'@intlify/shared': 9.1.9
'@intlify/vue-devtools': 9.1.9
@@ -2843,12 +2843,12 @@ packages:
- ts-node
- vue
- /@dcloudio/uni-cloud@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-LTD+8Xzv4FQZJWLrFGbecttzESzDiaABl1XoAOBlLKIgDAKK4bZKnNhwkcIl4XiOvYIB0cYbB1qqzeKBjWs45A==}
+ /@dcloudio/uni-cloud@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-uvk4BJP3Duuq5RWUXBvMe11urxuCpkhYc2FtjfkzqYe3w2FDDG5zQD7Nltr6rrlkQKn7Mnx5koHgbNbSAxF66g==}
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@vue/shared': 3.3.11
fast-glob: 3.3.2
transitivePeerDependencies:
@@ -2861,12 +2861,12 @@ packages:
- vue
dev: false
- /@dcloudio/uni-components@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-lMtM28Qp6DHpWaZ4pKJPePYlIcjB9tValOgvLByuQNwlHL+uxxh27dAILt0KfsGsMN2Ima2hFRvGAcRW+JCTRw==}
+ /@dcloudio/uni-components@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-8hV+86ax99BoLykVMVp1yPG5m5n4Jpv2IWPnfpDF2mb9HehP66jAi3RRgAz5H9+ZpoLFbDyGf4+8Jb+vIa55Pw==}
dependencies:
- '@dcloudio/uni-cloud': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-h5': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
+ '@dcloudio/uni-cloud': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-h5': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
transitivePeerDependencies:
- '@nuxt/kit'
- '@vueuse/core'
@@ -2877,11 +2877,11 @@ packages:
- vue
dev: false
- /@dcloudio/uni-h5-vite@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-PNIMiH4dAFMXNn6NG+YvGzWPkRd3zyYVm62H6YEotVCtNUBodLDySOXx3Zz5RdRM7JHKMQMH968ZCGo2NyxDXQ==}
+ /@dcloudio/uni-h5-vite@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-do6JWnrQjJJSOkdUfqG5wsuhFoYa9DxjXTzXudP6G0pjFB/dcUgjcMp9rIfJY/qBb8u37f05oTS09puBgtJ+Fw==}
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@rollup/pluginutils': 4.2.1
'@vue/compiler-dom': 3.3.11
'@vue/compiler-sfc': 3.3.11
@@ -2901,22 +2901,22 @@ packages:
- vue
dev: false
- /@dcloudio/uni-h5-vue@3.0.0-4000720240327001(vue@3.4.21):
- resolution: {integrity: sha512-i5VjGhcaM28mb78pedambeYxlHb3dBEFOfJMMPtdrnFHtVRFm1BIenocZy6o0HsgsJb85hlQenMYxt4o2W85Cg==}
+ /@dcloudio/uni-h5-vue@3.0.0-4000820240401001(vue@3.4.21):
+ resolution: {integrity: sha512-17+dd8FewneBJwmYbY8wzL9SUpXiZldlOxe0CjYYaczrzYyTThcO/kdh9df5lY22QEhncz2ozU65vd4xwptyXA==}
dependencies:
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@vue/server-renderer': 3.3.11(vue@3.4.21)
transitivePeerDependencies:
- vue
dev: false
- /@dcloudio/uni-h5@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-qWx1szp1eJGxsjMh5O+phUnBjxm5Eb49ueTbO1rvQqnoqw02PMpNItW2qz0JfULi3Szsva18lmxV2H2j7q9vyw==}
+ /@dcloudio/uni-h5@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-hIY/d0HmktLNgUohvEA2Z5rBZxZTmWtY/6uLaqdwPyfIQpAg2GYjURc1RkGlZfnUpGH9RE3Emqr4PWqqcKmRNQ==}
dependencies:
- '@dcloudio/uni-h5-vite': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-h5-vue': 3.0.0-4000720240327001(vue@3.4.21)
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-h5-vite': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-h5-vue': 3.0.0-4000820240401001(vue@3.4.21)
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@vue/server-renderer': 3.3.11(vue@3.4.21)
'@vue/shared': 3.3.11
debug: 4.3.4
@@ -2935,17 +2935,17 @@ packages:
- vue
dev: false
- /@dcloudio/uni-i18n@3.0.0-4000720240327001:
- resolution: {integrity: sha512-Mh7p+abklK3q4+IZ3M+O/XUy4tJrim+WMpsPnbKC7fuPl2uWb41eOOvyYam1gsqNOyiOpI9X7hJp8h/PQop68g==}
+ /@dcloudio/uni-i18n@3.0.0-4000820240401001:
+ resolution: {integrity: sha512-j1foVaqH/aHbxTHL08uh/OXe7E0yd2XgnPcwfjlsU4iwqJT6tzya1SSmWHfsZe3AnNiZmG49hmTTCP406uufvQ==}
- /@dcloudio/uni-mp-compiler@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-OsNyanrrW8+NdWKyWBE/xK5kBuCgowedXOwlBjjF762+fpozh5V65b8KPSuZKWI00wyfl7BdIF0kadFOc50TgA==}
+ /@dcloudio/uni-mp-compiler@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-UIHd5cWlb1KdAORJnSjtnb9rjC3NRDrEbPC/35I0GtnMl4nAex5BLZZfTPXGaJ5Rai7mqe/pyBWHHrvQpaf5IA==}
dependencies:
'@babel/generator': 7.23.5
- '@babel/parser': 7.23.5
+ '@babel/parser': 7.24.1
'@babel/types': 7.23.5
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@vue/compiler-core': 3.3.11
'@vue/compiler-dom': 3.3.11
'@vue/shared': 3.3.11
@@ -2960,14 +2960,14 @@ packages:
- vue
dev: false
- /@dcloudio/uni-mp-vite@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-ZYkL6ewz06JmkS+wRSQTUAXulwl2VV85j3sOl52+a2QusmSjkWqO70UdDMPtH36K+lTncB5l8DRxyt8BOd81fw==}
+ /@dcloudio/uni-mp-vite@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-/5BBf3e5iAahG05Pk9dJY1/JxbMeQZJqPKSi+BBkmDOB643Jy8aau+IfStGurHYrv9Y0ipW3LSJKnYzoy2STJQ==}
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-i18n': 3.0.0-4000720240327001
- '@dcloudio/uni-mp-compiler': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-mp-vue': 3.0.0-4000720240327001
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-i18n': 3.0.0-4000820240401001
+ '@dcloudio/uni-mp-compiler': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-mp-vue': 3.0.0-4000820240401001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@vue/compiler-sfc': 3.3.11
'@vue/shared': 3.3.11
debug: 4.3.4
@@ -2981,20 +2981,20 @@ packages:
- vue
dev: false
- /@dcloudio/uni-mp-vue@3.0.0-4000720240327001:
- resolution: {integrity: sha512-Y0ZM4zu9hh+Z9r5+tn1RCFgGKAYRy0xkqfPRogWr2st9axerO8VO49aB8etnMhiKexfCEfoqmzY4t2XPtricnA==}
+ /@dcloudio/uni-mp-vue@3.0.0-4000820240401001:
+ resolution: {integrity: sha512-DyabCrEt4BzUaJrMefYeHPo19aCxrtF3lst1dbsGqvxJJFuuq0bDy/dtEp7JF2tXKE6BomZrjdJ0s5ClDSUijA==}
dependencies:
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@vue/shared': 3.3.11
dev: false
- /@dcloudio/uni-mp-weixin@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-EJgJALb5KSJwidGvsoBMtEojMCvgsQSsKYTTYVWSNDFMEjZl39vI8RZptIFqdb+1S7chRGkVrUin4E/YT5uw7g==}
+ /@dcloudio/uni-mp-weixin@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-Hao7pbTgm4/YfwfdnyWuEGtKx8eOXGQZmQ9QJs7VVhDvWkEiNSOQRGr5LByCWUM/7Xg9bHrHoAR7Zvw3SdAFfg==}
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-mp-vite': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-mp-vue': 3.0.0-4000720240327001
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-mp-vite': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-mp-vue': 3.0.0-4000820240401001
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@vue/shared': 3.3.11
jimp: 0.10.3
licia: 1.39.1
@@ -3013,17 +3013,17 @@ packages:
- vue
dev: false
- /@dcloudio/uni-nvue-styler@3.0.0-4000720240327001:
- resolution: {integrity: sha512-WflANzPpf+pUs4cldH3+SM6Wf3CVJtpdCo9gwz5H5ATnXhwDhVVDUtpXY+46NAxS77nOiL+ek6MDnK+FJXE3Ww==}
+ /@dcloudio/uni-nvue-styler@3.0.0-4000820240401001:
+ resolution: {integrity: sha512-oCDSNuZL/gddmJr8fTD7Ajw5AIaPPufI3OaLPhVmbOBc0HxgevahvTTb0tA17HyNpXojGa1Id9QPEK6kntdglw==}
dependencies:
parse-css-font: 4.0.0
- postcss: 8.4.32
+ postcss: 8.4.38
dev: false
- /@dcloudio/uni-push@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-5041im7OTq9JeKTdXgjsIWZKnbCYX5PfWxz4StyPnXJWw1mBm4Wvcr/HdvMXoNCjfQeFP93yR3KLkQSzhWH66Q==}
+ /@dcloudio/uni-push@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-BaZBB9lJmysP6ex9h/nviYGIykeqGYDdle8+0Adiop5zpAYp+lI60IYCvObzEy7XeGNhrS2GzQvimr4CXTzcnQ==}
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
transitivePeerDependencies:
- '@nuxt/kit'
- '@vueuse/core'
@@ -3034,20 +3034,20 @@ packages:
- vue
dev: false
- /@dcloudio/uni-shared@3.0.0-4000720240327001:
- resolution: {integrity: sha512-Pku+eZtTR8qCa1p+qkBTGwgsbl9ZwWM7iru2AaRDavjb0r9NX4nePVSxv5cLUD8o+O4aRNzFX1DFWY+zgjvttQ==}
+ /@dcloudio/uni-shared@3.0.0-4000820240401001:
+ resolution: {integrity: sha512-rjMU8zuiqDrw0OjHvfPjIEKrU+tw3h1d3AGLs2fvHu813i9onzjs39UOF48rDld9gAS1n841htfrlmqqmAJ5OA==}
dependencies:
'@vue/shared': 3.3.11
- /@dcloudio/uni-stacktracey@3.0.0-4000720240327001:
- resolution: {integrity: sha512-dpcyf6w2GsVMsj6VhIZp/9y08iYRdztJGBpDtBIXpe307e1XLux372ok4X/w8n23DLw3wo34SRJTqiWIMDDpfg==}
+ /@dcloudio/uni-stacktracey@3.0.0-4000820240401001:
+ resolution: {integrity: sha512-07rLpzyz1Mm3o/2SJCmTZH+78jzrYA3Iy0Z1b0szn1NE0BCwMBSpvTmVf7UHWqvLDbVsCb7zI8pqnaWXIwaJsw==}
dev: true
- /@dcloudio/uni-stat@3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21):
- resolution: {integrity: sha512-gtIolvo/VP1Kt9BI2/T4xhkSXTdOROuxr1v6Sj1cqHF65MoHMaLemab1PSTPU53o0hIdWepya2/TOv8IMWN8+w==}
+ /@dcloudio/uni-stat@3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21):
+ resolution: {integrity: sha512-A1EvLjZUgHkWT88CPfBj7PZont7Gv+naw4hA/TB3EbEu77rKpMTMdtTMgnTOV5rS3HQ/lvKr0ETCNRCsLKdNnQ==}
dependencies:
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
debug: 4.3.4
transitivePeerDependencies:
- '@nuxt/kit'
@@ -3059,8 +3059,8 @@ packages:
- vue
dev: false
- /@dcloudio/vite-plugin-uni@3.0.0-4000720240327001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21):
- resolution: {integrity: sha512-lqgVa6H85AP0Beg9QNp8TwCNiVjRXpBhFiBDgQP7p8QN6UQZ37+K7liZgeL8sfHebqwZ4azRgb74LXAZoVlglw==}
+ /@dcloudio/vite-plugin-uni@3.0.0-4000820240401001(postcss@8.4.38)(vite@4.5.3)(vue@3.4.21):
+ resolution: {integrity: sha512-EHL2FHU5VtFEYwLVroRMthQEEd/s6mLQ4Zd4EOKQYPtCU8rE3RXtYpL1va/U+rT6bE0UttaW6UiqY4kYaA0ZlQ==}
engines: {node: ^14.18.0 || >=16.0.0}
hasBin: true
peerDependencies:
@@ -3069,8 +3069,8 @@ packages:
'@babel/core': 7.23.5
'@babel/plugin-syntax-import-meta': 7.10.4(@babel/core@7.23.5)
'@babel/plugin-transform-typescript': 7.23.5(@babel/core@7.23.5)
- '@dcloudio/uni-cli-shared': 3.0.0-4000720240327001(postcss@8.4.38)(vue@3.4.21)
- '@dcloudio/uni-shared': 3.0.0-4000720240327001
+ '@dcloudio/uni-cli-shared': 3.0.0-4000820240401001(postcss@8.4.38)(vue@3.4.21)
+ '@dcloudio/uni-shared': 3.0.0-4000820240401001
'@rollup/pluginutils': 4.2.1
'@vitejs/plugin-legacy': 4.1.1(terser@5.24.0)(vite@4.5.3)
'@vitejs/plugin-vue': 4.5.1(vite@4.5.3)(vue@3.4.21)
@@ -3584,7 +3584,7 @@ packages:
engines: {node: '>= 16'}
dependencies:
'@intlify/shared': 9.9.0
- source-map-js: 1.0.2
+ source-map-js: 1.2.0
dev: false
/@intlify/message-resolver@9.1.9:
@@ -5351,7 +5351,7 @@ packages:
engines: {node: '>=14'}
dependencies:
'@unocss/core': 0.57.7
- magic-string: 0.30.5
+ magic-string: 0.30.8
dev: true
/@unocss/scope@0.57.7:
@@ -5506,18 +5506,18 @@ packages:
/@vue/compiler-core@3.3.11:
resolution: {integrity: sha512-h97/TGWBilnLuRaj58sxNrsUU66fwdRKLOLQ9N/5iNDfp+DZhYH9Obhe0bXxhedl8fjAgpRANpiZfbgWyruQ0w==}
dependencies:
- '@babel/parser': 7.23.5
+ '@babel/parser': 7.24.1
'@vue/shared': 3.3.11
estree-walker: 2.0.2
- source-map-js: 1.0.2
+ source-map-js: 1.2.0
/@vue/compiler-core@3.3.9:
resolution: {integrity: sha512-+/Lf68Vr/nFBA6ol4xOtJrW+BQWv3QWKfRwGSm70jtXwfhZNF4R/eRgyVJYoxFRhdCTk/F6g99BP0ffPgZihfQ==}
dependencies:
- '@babel/parser': 7.23.5
+ '@babel/parser': 7.24.1
'@vue/shared': 3.3.9
estree-walker: 2.0.2
- source-map-js: 1.0.2
+ source-map-js: 1.2.0
dev: true
/@vue/compiler-core@3.4.21:
@@ -5527,7 +5527,7 @@ packages:
'@vue/shared': 3.4.21
entities: 4.5.0
estree-walker: 2.0.2
- source-map-js: 1.0.2
+ source-map-js: 1.2.0
/@vue/compiler-dom@3.3.11:
resolution: {integrity: sha512-zoAiUIqSKqAJ81WhfPXYmFGwDRuO+loqLxvXmfUdR5fOitPoUiIeFI9cTTyv9MU5O1+ZZglJVTusWzy+wfk5hw==}
@@ -5559,8 +5559,8 @@ packages:
'@vue/shared': 3.3.11
estree-walker: 2.0.2
magic-string: 0.30.8
- postcss: 8.4.32
- source-map-js: 1.0.2
+ postcss: 8.4.38
+ source-map-js: 1.2.0
/@vue/compiler-sfc@3.4.21:
resolution: {integrity: sha512-me7epoTxYlY+2CUM7hy9PCDdpMPfIwrOvAXud2Upk10g4YLv9UBW7kL798TvMeDhPthkZ0CONNrK2GoeI1ODiQ==}
@@ -12702,6 +12702,7 @@ packages:
nanoid: 3.3.7
picocolors: 1.0.0
source-map-js: 1.0.2
+ dev: true
/postcss@8.4.38:
resolution: {integrity: sha512-Wglpdk03BSfXkHoQa3b/oulrotAkwrlLDRSOb9D0bN86FdRyE9lppSp33aHNPgBa0JKCoB+drFLZkQoRRYae5A==}
diff --git a/src/api/goods/types.ts b/src/api/goods/types.ts
index 6d456d5..98c8f72 100644
--- a/src/api/goods/types.ts
+++ b/src/api/goods/types.ts
@@ -65,3 +65,76 @@ export interface StockBean {
stockId: string;
count: number;
}
+
+export interface OrderBean {
+ allowIntegral: boolean;
+ bizId: string;
+ classify: number;
+ companyId: string;
+ consignTime: string;
+ consumerId: string;
+ consumerName: string;
+ coupon: string;
+ couponIds: string;
+ couponsStatus: number;
+ createTime: string;
+ creatorId: number;
+ creatorName: string;
+ device: string;
+ discount: number;
+ discountPrice: number;
+ finishTime: string;
+ freePrice: number;
+ goodsNum: number;
+ id: string;
+ integral: number;
+ itemNum: number;
+ marketingPrice: number;
+ marketingText: string;
+ modifierIds: string;
+ needPaid: number;
+ ogList: any[];
+ orderGoods: GoodsBean[];
+ changeStockNum: number;
+ consumePrice: number;
+ discountOriginPrice: number;
+ goodsCode: string;
+ goodsId: string;
+ goodsName: string;
+ goodsPriceModify: string;
+ goodsTypeName: string;
+ images: string;
+ offset: string;
+ orderId: string;
+ orderNo: string;
+ originPrice: number;
+ originStockNum: number;
+ priceModify: [];
+ produceIntegral: number;
+ salePrice: number;
+ stockId: string;
+ stockStock: StockBean[];
+ payStatus: number;
+ payTypeIds: string;
+ printed: string;
+ produceIntegralNumber: number;
+ profit: string;
+ reducePrice: number;
+ relatedId: string;
+ remark: string;
+ replacementOrder: string;
+ saleNum: number;
+ salers: [];
+ status: number;
+ storeId: string;
+ storeName: string;
+ storeOrder: string;
+ totalPrice: number;
+ transactionPrice: number;
+ type: number;
+ typeName: string;
+ updateTime: string;
+ updated: boolean;
+ useGold: number;
+ wholePrice: number;
+}
diff --git a/src/api/groupbuy/types.ts b/src/api/groupbuy/types.ts
index 5c41128..c1e3cd9 100644
--- a/src/api/groupbuy/types.ts
+++ b/src/api/groupbuy/types.ts
@@ -1,4 +1,4 @@
-import { GoodsBean, StockBean } from '@/api/goods/types';
+import { GoodsBean } from '@/api/goods/types';
import { CouponBean } from '@/api/user/types';
export interface GroupBuyBean {
@@ -35,76 +35,3 @@ export interface RecordBean {
groupId: string;
memberImage: string;
}
-
-export interface OrderBean {
- allowIntegral: boolean;
- bizId: string;
- classify: number;
- companyId: string;
- consignTime: string;
- consumerId: string;
- consumerName: string;
- coupon: string;
- couponIds: string;
- couponsStatus: number;
- createTime: string;
- creatorId: number;
- creatorName: string;
- device: string;
- discount: number;
- discountPrice: number;
- finishTime: string;
- freePrice: number;
- goodsNum: number;
- id: string;
- integral: number;
- itemNum: number;
- marketingPrice: number;
- marketingText: string;
- modifierIds: string;
- needPaid: number;
- ogList: any[];
- orderGoods: GoodsBean[];
- changeStockNum: number;
- consumePrice: number;
- discountOriginPrice: number;
- goodsCode: string;
- goodsId: string;
- goodsName: string;
- goodsPriceModify: string;
- goodsTypeName: string;
- images: string;
- offset: string;
- orderId: string;
- orderNo: string;
- originPrice: number;
- originStockNum: number;
- priceModify: [];
- produceIntegral: number;
- salePrice: number;
- stockId: string;
- stockStock: StockBean[];
- payStatus: number;
- payTypeIds: string;
- printed: string;
- produceIntegralNumber: number;
- profit: string;
- reducePrice: number;
- relatedId: string;
- remark: string;
- replacementOrder: string;
- saleNum: number;
- salers: [];
- status: number;
- storeId: string;
- storeName: string;
- storeOrder: string;
- totalPrice: number;
- transactionPrice: number;
- type: number;
- typeName: string;
- updateTime: string;
- updated: boolean;
- useGold: number;
- wholePrice: number;
-}
diff --git a/src/components/payment-dialog.vue b/src/components/payment-dialog.vue
index d137249..8f8c4dc 100644
--- a/src/components/payment-dialog.vue
+++ b/src/components/payment-dialog.vue
@@ -14,7 +14,7 @@
- 余额(剩余¥100)
+ 余额(剩余¥{{ userInfo.balance }})
@@ -23,11 +23,16 @@
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index c1387c5..be0864f 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -107,7 +107,7 @@ onShow(async () => {
getCompanyList(userInfo.value.maOpenId).then(res => {
const companyList = res.map((res: { company: any }) => res.company);
const userList = res.map((res: { user: any }) => res.user);
- if(!getCompanyId()) {
+ // if(!getCompanyId()) {
uni.showActionSheet({
itemList: companyList.map((res: { companyName: string }) => res.companyName),
success: (res) => {
@@ -116,7 +116,7 @@ onShow(async () => {
userStore.fetchTerminal();
}
});
- }
+ // }
});
} else {
await userStore.getProfile();
diff --git a/src/pages/mall/subs/goods/detail.vue b/src/pages/mall/subs/goods/detail.vue
index 29354f6..4e789b3 100644
--- a/src/pages/mall/subs/goods/detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -98,7 +98,7 @@ import { assetsUrl } from '@/utils/assets';
import SkuDialog from '@/components/sku-dialog.vue';
import { goPath, showToast } from '@/utils';
import { getGoodsDetail, getGoodsList } from '@/api/goods';
-import { GoodsBean, StockBean } from '@/api/goods/types';
+import { GoodsBean } from '@/api/goods/types';
import useShoppingCartStore from '@/store/modules/shoppingcart';
const shoppingCartStore = useShoppingCartStore();
@@ -158,8 +158,12 @@ const addShoppingCart = () => {
};
const placeOrder = () => {
- showSkuDialog((e: StockBean) => {
- goPath('/pages/mall/subs/order/order-confirm');
+ showSkuDialog((e: GoodsBean) => {
+ const orderBean = {
+ totalPrice: e.price * e.checkedStock.count,
+ orderGoods: [e]
+ };
+ goPath(`/pages/mall/subs/order/order-confirm?orderBean=${encodeURIComponent(JSON.stringify(orderBean))}`);
});
};
diff --git a/src/pages/mall/subs/order/order-confirm.vue b/src/pages/mall/subs/order/order-confirm.vue
index 3b5ee6b..790775f 100644
--- a/src/pages/mall/subs/order/order-confirm.vue
+++ b/src/pages/mall/subs/order/order-confirm.vue
@@ -1,102 +1,116 @@
-
-
-
-
- 到店
-
-
-
- 邮寄
-
-
-
-
-
- 默认
- 黄先生
- 155****6532
-
-
-
-
-
-
- 湖南省 长沙市 详细地址详细地址详细地址
-
-
-
-
-
+
+
-
-
-
- 女童夏装套装洋气装短袖阔腿裤子夏装套装
-
-
- 2356235654
-
-
-
- 紫色,120cm x1
+
+
+ 到店
+
+
+
+ 邮寄
+
+
+
+
+
+ 默认
+ 黄先生
+ 155****6532
+
+
+
+
+
+
+ 湖南省 长沙市 详细地址详细地址详细地址
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+ {{ item.code }}
+
+
+
+ {{ item.checkedStock.colorName }},{{ item.checkedStock.sizeName }} x{{ item.checkedStock.count }}
+
+ ¥{{ item.price }}
+
+
+
+
+
+
+
+
+
+
+ 商品总价
+ ¥{{ orderBean?.totalPrice || 0 }}
+
+
+ 运费
+ ¥8
+
+
+ 优惠券
+ 已选最大优惠
+
+ -¥{{ checkedCoupon?.reduce || 0 }}
+
+
+
+
+
+
+
+ 共1件商品 合计:
+ ¥{{ orderBean?.totalPrice || 0 }}
- 23.20元
-
-
-
-
-
-
- 商品总价
- ¥29.90
-
-
- 运费
- ¥8
-
-
- 优惠券
- 已选最大优惠
-
- -¥{{ checkedCoupon?.reduce || 0 }}
+
+ 支付方式
+ {{ paymentType === 0 ? '微信支付' : '余额' }}
-
-
-
-
- 共1件商品 合计:
- ¥29.90
-
-
+
+
+ 合计
+ ¥{{ orderBean?.totalPrice || 0 }}
+
+ 确认订单
+
-
-
- 支付方式
- {{ paymentType === 0 ? '微信支付' : '余额' }}
-
-
-
-
-
- 合计
- ¥29.90
- 确认订单
-
-
+
paymentType=args' />
-
+