XinLingKeJi/jdt-user
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test'
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
YuanHuakk
2024-03-28 16:29:55 +08:00
parent d9735b60f0 65d6737902
commit 74ca20ca01
14 changed files with 440 additions and 414 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
package.json
View File

@@ -61,22 +61,22 @@
"dependencies": {
"@babel/runtime": "^7.23.5",
"@nutui/icons-vue-taro": "^0.0.9",
"@nutui/nutui-taro": "^4.3.1",
"@nutui/nutui-taro": "^4.3.3",
"@qiun/vue-ucharts": "2.5.0-20230101",
"@tarojs/components": "3.6.24",
"@tarojs/helper": "3.6.24",
"@tarojs/plugin-framework-vue3": "3.6.24",
"@tarojs/plugin-html": "3.6.24",
"@tarojs/plugin-platform-alipay": "3.6.24",
"@tarojs/plugin-platform-h5": "3.6.24",
"@tarojs/plugin-platform-jd": "3.6.24",
"@tarojs/plugin-platform-qq": "3.6.24",
"@tarojs/plugin-platform-swan": "3.6.24",
"@tarojs/plugin-platform-tt": "3.6.24",
"@tarojs/plugin-platform-weapp": "3.6.24",
"@tarojs/runtime": "3.6.24",
"@tarojs/shared": "3.6.24",
"@tarojs/taro": "3.6.24",
"@tarojs/components": "3.6.25",
"@tarojs/helper": "3.6.25",
"@tarojs/plugin-framework-vue3": "3.6.25",
"@tarojs/plugin-html": "3.6.25",
"@tarojs/plugin-platform-alipay": "3.6.25",
"@tarojs/plugin-platform-h5": "3.6.25",
"@tarojs/plugin-platform-jd": "3.6.25",
"@tarojs/plugin-platform-qq": "3.6.25",
"@tarojs/plugin-platform-swan": "3.6.25",
"@tarojs/plugin-platform-tt": "3.6.25",
"@tarojs/plugin-platform-weapp": "3.6.25",
"@tarojs/runtime": "3.6.25",
"@tarojs/shared": "3.6.25",
"@tarojs/taro": "3.6.25",
"dayjs": "^1.11.10",
"pinia": "^2.1.7",
"vue": "^3.3.9"
@@ -85,22 +85,22 @@
"@babel/core": "^7.23.5",
"@commitlint/cli": "^18.4.3",
"@commitlint/config-conventional": "^18.4.3",
"@tarojs/cli": "3.6.24",
"@tarojs/plugin-mini-ci": "3.6.24",
"@tarojs/taro-loader": "3.6.24",
"@tarojs/webpack5-runner": "3.6.24",
"@tarojs/cli": "3.6.25",
"@tarojs/plugin-mini-ci": "3.6.25",
"@tarojs/taro-loader": "3.6.25",
"@tarojs/webpack5-runner": "3.6.25",
"@types/node": "^18.19.1",
"@types/webpack-env": "^1.18.4",
"@typescript-eslint/eslint-plugin": "^6.13.1",
"@typescript-eslint/parser": "^6.13.1",
"@vue/babel-plugin-jsx": "^1.1.5",
"@vue/compiler-sfc": "^3.3.9",
"babel-preset-taro": "3.6.24",
"babel-preset-taro": "3.6.25",
"commitizen": "^4.3.0",
"css-loader": "3.4.2",
"cz-customizable": "^7.0.0",
"eslint": "^8.55.0",
"eslint-config-taro": "3.6.24",
"eslint-config-taro": "3.6.25",
"eslint-plugin-vue": "^9.19.2",
"husky": "^8.0.3",
"lint-staged": "^15.1.0",

464
pnpm-lock.yaml generated
View File

@@ -12,53 +12,53 @@ dependencies:
specifier: ^0.0.9
version: 0.0.9
'@nutui/nutui-taro':
specifier: ^4.3.1
version: 4.3.1(unplugin-vue-components@0.23.0)(vue@3.3.9)
specifier: ^4.3.3
version: 4.3.3(unplugin-vue-components@0.23.0)(vue@3.3.9)
'@qiun/vue-ucharts':
specifier: 2.5.0-20230101
version: 2.5.0-20230101
'@tarojs/components':
specifier: 3.6.24
version: 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
specifier: 3.6.25
version: 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/helper':
specifier: 3.6.24
version: 3.6.24
specifier: 3.6.25
version: 3.6.25
'@tarojs/plugin-framework-vue3':
specifier: 3.6.24
version: 3.6.24(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)(vue@3.3.9)
specifier: 3.6.25
version: 3.6.25(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)(vue@3.3.9)
'@tarojs/plugin-html':
specifier: 3.6.24
version: 3.6.24(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-alipay':
specifier: 3.6.24
version: 3.6.24(@tarojs/components@3.6.24)(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/components@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-h5':
specifier: 3.6.24
version: 3.6.24(@tarojs/helper@3.6.24)(@tarojs/taro@3.6.24)(postcss@8.4.32)(vue@3.3.9)
specifier: 3.6.25
version: 3.6.25(@tarojs/helper@3.6.25)(@tarojs/taro@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/plugin-platform-jd':
specifier: 3.6.24
version: 3.6.24(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-qq':
specifier: 3.6.24
version: 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-swan':
specifier: 3.6.24
version: 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-tt':
specifier: 3.6.24
version: 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-weapp':
specifier: 3.6.24
version: 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/runtime':
specifier: 3.6.24
version: 3.6.24(@tarojs/shared@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/shared':
specifier: 3.6.24
version: 3.6.24
specifier: 3.6.25
version: 3.6.25
'@tarojs/taro':
specifier: 3.6.24
version: 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
specifier: 3.6.25
version: 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
dayjs:
specifier: ^1.11.10
version: 1.11.10
@@ -80,17 +80,17 @@ devDependencies:
specifier: ^18.4.3
version: 18.4.3
'@tarojs/cli':
specifier: 3.6.24
version: 3.6.24(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/taro@3.6.25)
'@tarojs/plugin-mini-ci':
specifier: 3.6.24
version: 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
specifier: 3.6.25
version: 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/taro-loader':
specifier: 3.6.24
version: 3.6.24(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
specifier: 3.6.25
version: 3.6.25(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/webpack5-runner':
specifier: 3.6.24
version: 3.6.24(@babel/core@7.23.5)(@swc/core@1.3.96)(@tarojs/components@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)(@vue/compiler-sfc@3.3.9)(postcss@8.4.32)(typescript@4.9.5)(vue@3.3.9)(webpack@5.89.0)
specifier: 3.6.25
version: 3.6.25(@babel/core@7.23.5)(@swc/core@1.3.96)(@tarojs/components@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)(@vue/compiler-sfc@3.3.9)(postcss@8.4.32)(typescript@4.9.5)(vue@3.3.9)(webpack@5.89.0)
'@types/node':
specifier: ^18.19.1
version: 18.19.1
@@ -110,8 +110,8 @@ devDependencies:
specifier: ^3.3.9
version: 3.3.9
babel-preset-taro:
specifier: 3.6.24
version: 3.6.24(@babel/core@7.23.5)
specifier: 3.6.25
version: 3.6.25(@babel/core@7.23.5)
commitizen:
specifier: ^4.3.0
version: 4.3.0(typescript@4.9.5)
@@ -125,8 +125,8 @@ devDependencies:
specifier: ^8.55.0
version: 8.55.0
eslint-config-taro:
specifier: 3.6.24
version: 3.6.24(@babel/core@7.23.5)(eslint@8.55.0)(typescript@4.9.5)
specifier: 3.6.25
version: 3.6.25(@babel/core@7.23.5)(eslint@8.55.0)(typescript@4.9.5)
eslint-plugin-vue:
specifier: ^9.19.2
version: 9.19.2(eslint@8.55.0)
@@ -4047,8 +4047,8 @@ packages:
resolution: {integrity: sha512-10VYAtFC+o1X0anGs+y2PgF1NWMeLFz2JVMRw4BWLg6wbtVbYy9wukLxyGhZC6Yf6t39DcwaGVda8paV7K6/Ew==}
dev: false
/@nutui/nutui-taro@4.3.1(unplugin-vue-components@0.23.0)(vue@3.3.9):
resolution: {integrity: sha512-pDi9nYmZiuh+0w8IFFBsWFsW7pS8TpSnN/IVAYBMNRVHEMiGmCGtkYO+vxZe28Nd6YPU6ydDO9C4qVGV11oOPA==}
/@nutui/nutui-taro@4.3.3(unplugin-vue-components@0.23.0)(vue@3.3.9):
resolution: {integrity: sha512-uMUsIFHcjlqMJ8K7GeUlhykcDrBpyOtLBl/yD9jx8EvSEtzdriuSzB8DBNkFCHadKKAxWWid8kyLaVM8O5kNFw==}
peerDependencies:
unplugin-vue-components: '>=0.25.1'
vue: ^3.0.0
@@ -4304,15 +4304,15 @@ packages:
defer-to-connect: 1.1.3
dev: true
/@tarojs/api@3.6.24:
resolution: {integrity: sha512-q7/fkhHyL+z2p/GAZB5jsSgUHHGfkD7ORL12ZBC9ocaLPEgTjzie2S5a4hJ4gDX6z+J9DA/Ief/D6kaehk0yMQ==}
/@tarojs/api@3.6.25:
resolution: {integrity: sha512-ZVSQauFgsCDGNWNJmoLeUMLjuUSeipwrbI7XQOFFco7u+RxGF8Wbf49OziKOtTYKTpZ+SQ9CH5U7Oqo1NG42gQ==}
dependencies:
'@babel/runtime': 7.23.5
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/shared': 3.6.25
/@tarojs/binding-darwin-arm64@3.6.24:
resolution: {integrity: sha512-GfUOwc9Y+U5Jf0UhVw7BKAZh9a2YVoStTpGO3KrRU1+P3CtxVRU0WS0HeXVJ9bO4BJ1H/Y4WAwnjNkMXaWap0A==}
/@tarojs/binding-darwin-arm64@3.6.25:
resolution: {integrity: sha512-XN5zRCMVfrS7ufgpzo1RUiYAX7wLUK3dyKQxYAYtF1g8uFUN1J3fCbHZSKRxijUl65xoboqfBn0zZBD3VM+WiA==}
engines: {node: '>= 16'}
cpu: [arm64]
os: [darwin]
@@ -4320,8 +4320,8 @@ packages:
dev: true
optional: true
/@tarojs/binding-darwin-x64@3.6.24:
resolution: {integrity: sha512-QXB/yU/bJ968JyYv/Ai7zG0X2S1Bw81UbGMohPc/oA7/9hAf/NcXV06Eah95FIy0EOUvJpOIf8ip/f6qlrIdjw==}
/@tarojs/binding-darwin-x64@3.6.25:
resolution: {integrity: sha512-Kzrz9eS+/kOcGhFISac1+7oSG95lpXAjKNx501EmTeRS7vRmSSXzDamYUUJnToKD5AnIEAeHanVn4vua90KtHQ==}
engines: {node: '>= 16'}
cpu: [x64]
os: [darwin]
@@ -4329,8 +4329,8 @@ packages:
dev: true
optional: true
/@tarojs/binding-linux-x64-gnu@3.6.24:
resolution: {integrity: sha512-SRmYP+2SXT6AWSmfzi4IUUpAcDLSbZAbhSF6F+xdebbzwki73sGONRw2wcINKmvYW3DhDYClfxxNYefwV+uHYQ==}
/@tarojs/binding-linux-x64-gnu@3.6.25:
resolution: {integrity: sha512-NANi6QvhMn68VNKRuHiE9LaWoSeW4gATiZYnoceqSX7EeYEeBLx8XjKuQHXWDZWp9vayqaS9fR5w20wO+Xjc4w==}
engines: {node: '>= 16'}
cpu: [x64]
os: [linux]
@@ -4339,8 +4339,8 @@ packages:
dev: true
optional: true
/@tarojs/binding-win32-x64-msvc@3.6.24:
resolution: {integrity: sha512-Ta05Hfb6XRwPsrLDh9ipQ7H0+UsUdvL+ARFCalmCYV6aaPyoZ6e7ck4e3HoDY/ONW6YnPxIMSqfjChle/WrYVg==}
/@tarojs/binding-win32-x64-msvc@3.6.25:
resolution: {integrity: sha512-oWtn8C+5zy0bLaIgXhLnBodpOhZdF5eVvZDt0T84EefqCRIuowxX4DffUbG9veXib7wCsMrscpfUwLcsvAWk1w==}
engines: {node: '>= 16'}
cpu: [x64]
os: [win32]
@@ -4348,28 +4348,28 @@ packages:
dev: true
optional: true
/@tarojs/binding@3.6.24:
resolution: {integrity: sha512-+Yj8qhjPQH1eHWCpBxDXm3yjiUsEzPTQePvavdym9J7iHmZFDKmbkn5bPk50bY05zAjjIA4c0twIOHjMR8EHmA==}
/@tarojs/binding@3.6.25:
resolution: {integrity: sha512-LD01R7a/u9gm1Sbs7yc2Kp6y96CMaC0CaSZf7Mq4dthXWB8MuvPp0Upg1JnhOqZ6E5UACzsYZ0ByQ9cpBZpwgg==}
requiresBuild: true
dependencies:
'@napi-rs/triples': 1.2.0
optionalDependencies:
'@tarojs/binding-darwin-arm64': 3.6.24
'@tarojs/binding-darwin-x64': 3.6.24
'@tarojs/binding-linux-x64-gnu': 3.6.24
'@tarojs/binding-win32-x64-msvc': 3.6.24
'@tarojs/binding-darwin-arm64': 3.6.25
'@tarojs/binding-darwin-x64': 3.6.25
'@tarojs/binding-linux-x64-gnu': 3.6.25
'@tarojs/binding-win32-x64-msvc': 3.6.25
dev: true
/@tarojs/cli@3.6.24(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-2l+C1+qGLrADOBvalDIw3349bDV+wW5w+mFHyVAd/cogSEQnI6KBUlDO9D+VKv1MaJORDuV/vHf3Jex1ukABeA==}
/@tarojs/cli@3.6.25(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-4QDq6wuUxXR1nAfjlL1wiMltGlnm09xH6sPJUAE3cW7vWoUdrfYsfCCCxVW8nE0aCRlUQFHgimWNwZgkQQhFtA==}
engines: {node: '>=16'}
hasBin: true
dependencies:
'@tarojs/binding': 3.6.24
'@tarojs/helper': 3.6.24
'@tarojs/binding': 3.6.25
'@tarojs/helper': 3.6.25
'@tarojs/plugin-doctor': 0.0.11
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
adm-zip: 0.4.16
cli-highlight: 2.1.11
download-git-repo: 2.0.0
@@ -4392,12 +4392,12 @@ packages:
- supports-color
dev: true
/@tarojs/components-advanced@3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)(vue@3.3.9):
resolution: {integrity: sha512-BVESjKo8sfw+l1NevD3s7A07yW6NlT7O99qRotI+CQ3bf45J6jpbO61yOTGQDAf9iVofYFlcKve6hTq3mM+rdw==}
/@tarojs/components-advanced@3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)(vue@3.3.9):
resolution: {integrity: sha512-HsjwIEN+b5EEPO8zHmhtQqSkcY6QT8g90VkpgiQliPiogVhnNIHEYFWD+gKP7wY2HPODk5phDbQ+nW3rSkrTvg==}
peerDependencies:
'@tarojs/runtime': ~3.6.24
'@tarojs/shared': ~3.6.24
'@tarojs/taro': ~3.6.24
'@tarojs/runtime': ~3.6.25
'@tarojs/shared': ~3.6.25
'@tarojs/taro': ~3.6.25
react: '>=17'
vue: '*'
peerDependenciesMeta:
@@ -4406,10 +4406,10 @@ packages:
vue:
optional: true
dependencies:
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/shared': 3.6.25
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
classnames: 2.3.2
csstype: 3.1.2
memoize-one: 6.0.0
@@ -4423,12 +4423,12 @@ packages:
- '@types/webpack'
- '@types/webpack-dev-server'
/@tarojs/components-react@3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-ulndln9avJsAitX4h94uAzc++QJC4BcRNbbXTMO3WSIb8Hw8R6qHlgKFC/BIZOL1uXbqeSj7x5EvzmCoc9AKOg==}
/@tarojs/components-react@3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-UbjKJ4dtTFP/tg1CkQm/KeH5KXNILCLEOkWkRWQAExmqbRF7hVmRQTeA1ZQhikH+OoXTQSDM19uQHLDl1ynqrQ==}
dependencies:
'@babel/runtime': 7.23.5
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
classnames: 2.3.2
swiper: 6.8.0
tslib: 2.6.2
@@ -4443,8 +4443,8 @@ packages:
- vue
dev: false
/@tarojs/components@3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-M9CqpyftMzE1eO1g9ydN+73TPC4ezsAJaK+4wyi4EWXJsC9KG/zMJW1HmVvHty+GAsZGa6dtvNTjAmNnst/Y1g==}
/@tarojs/components@3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-/b2tpUjQ7G9iiwwOHQTxbubQCNhs5ip4N3QunfHdapSCRstERg8yomyR5APc0GihEtWuSaxHMIIpdFUF1nYvVg==}
peerDependencies:
'@types/react': '*'
'@types/react-native': '*'
@@ -4458,8 +4458,8 @@ packages:
optional: true
dependencies:
'@stencil/core': 2.22.3
'@tarojs/components-advanced': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)(vue@3.3.9)
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/components-advanced': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)(vue@3.3.9)
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
classnames: 2.3.2
hls.js: 1.4.12
resolve-pathname: 3.0.0
@@ -4475,8 +4475,8 @@ packages:
- postcss
- react
/@tarojs/helper@3.6.24:
resolution: {integrity: sha512-yVRupJn6Qm5GHLcuxZ88OxySdczYmU+vdoUijEV40JdQbPfzkysE3D2aedNyoccArfeE70uKMPXDvQH2ZkLQYA==}
/@tarojs/helper@3.6.25:
resolution: {integrity: sha512-QsDGeFUwnGY5uvuTf8QqzUCQWBmu9CEXCfUAEB8b6s0+YJDqOm5u9lV/qVYni+jdJcaYUE1vsJk/65lXNP4OAg==}
dependencies:
'@babel/core': 7.23.5
'@babel/parser': 7.23.5
@@ -4633,18 +4633,18 @@ packages:
- supports-color
dev: true
/@tarojs/plugin-framework-vue3@3.6.24(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)(vue@3.3.9):
resolution: {integrity: sha512-eD7xfKY1xhzUQFi9Ri21HdlxpNql4EPpchfv1SjPn2PQj+EaK4oW/muMs1WhbSrljSqGZS4atGKXmRAq/OqHvg==}
/@tarojs/plugin-framework-vue3@3.6.25(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)(vue@3.3.9):
resolution: {integrity: sha512-zSU9FGcLHfVMjGDXsUs1SkKFfyGj7f3tOS/2jLv2uRErscYRGSeJx2v2bei3HstiSZKolYiaofy3GkqbVb4hGA==}
peerDependencies:
'@tarojs/runtime': ~3.6.24
'@tarojs/shared': ~3.6.24
'@tarojs/runtime': ~3.6.25
'@tarojs/shared': ~3.6.25
vue: ^3.0.0
dependencies:
'@tarojs/helper': 3.6.24
'@tarojs/runner-utils': 3.6.24
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/helper': 3.6.25
'@tarojs/runner-utils': 3.6.25
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
lodash: 4.17.21
vue: 3.3.9(typescript@4.9.5)
transitivePeerDependencies:
@@ -4653,24 +4653,24 @@ packages:
- supports-color
dev: false
/@tarojs/plugin-html@3.6.24(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-KkDOxcE2743+9Vk3RFD1bdYSSvb0cCg27Pr7jM1SgQSmAL/wBXryaEGQr9IV8n1sI4yqvfSOsndaeYBCbeRzgQ==}
/@tarojs/plugin-html@3.6.25(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-vur9HNKjABMtdMfW5VYSCj1NomLCWaOQZvLtCFEUTYsIXADWYkbSFT37CK3FwZUJFWkiMtaWN25JL0t9YQqoDA==}
dependencies:
'@babel/generator': 7.23.5
'@babel/parser': 7.23.5
'@babel/traverse': 7.23.5
'@babel/types': 7.23.5
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
transitivePeerDependencies:
- '@swc/helpers'
- '@tarojs/taro'
- supports-color
dev: false
/@tarojs/plugin-mini-ci@3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-JNmwO/dY996TClVQVRUTTKwxLxpQjUbXaUq5o0h/B1URdtBVjrlwpz1W+G5BU9MvT9d732A+RN49O+xwRiJu8Q==}
/@tarojs/plugin-mini-ci@3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-Xpgyl14fyQeZccGAF/xWLWATddFQXemPY5u7Ecy6eI8hyOXDKr1dWzA0e+yMkuJHFMgL9d0Vh0k1GMqPM0Jbzg==}
peerDependencies:
dingtalk-miniapp-opensdk: ^1.0.7
jd-miniprogram-ci: ^1.0.2
@@ -4686,7 +4686,7 @@ packages:
tt-ide-cli:
optional: true
dependencies:
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
jimp: 0.22.10
jsqr: 1.4.0
minimist: 1.2.8
@@ -4701,30 +4701,30 @@ packages:
- supports-color
dev: true
/@tarojs/plugin-platform-alipay@3.6.24(@tarojs/components@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-ckSbEAKGk5jWGmN9F46RLAR7O74REvEXIDjcjm7pYEJF4wFfhWcUIVuzIM/anewGFwIhiT8PxGAFqWis0mTZHQ==}
/@tarojs/plugin-platform-alipay@3.6.25(@tarojs/components@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-1wdNB9az6cjMkQ+jVxFGKjq178ixZ2fLhrc0ADAV0o85VBd4Pc6mvWu7Cpt6YXfFXt/4AbD753SqNUsrHj0/rA==}
peerDependencies:
'@tarojs/components': ~3.6.24
'@tarojs/components': ~3.6.25
dependencies:
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
transitivePeerDependencies:
- '@swc/helpers'
- '@tarojs/taro'
- supports-color
/@tarojs/plugin-platform-h5@3.6.24(@tarojs/helper@3.6.24)(@tarojs/taro@3.6.24)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-8oIURIpre+iAAxwn5JqGPjwU7XgbsLGUEqtjAvC6j2LJt9DrmjmP5eWUtAu9wJlWTPxb94ooLMQfh/y/17vPhA==}
/@tarojs/plugin-platform-h5@3.6.25(@tarojs/helper@3.6.25)(@tarojs/taro@3.6.25)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-LVXz5DAIWyX7gdi4D1TTNYU/j6cKXatCKibfD5oAK9Otpp9LwFknLV4JDBsFbcPq9D+sUsyrv3AapWBasIDBpA==}
dependencies:
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/components-react': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/router': 3.6.24(@tarojs/runtime@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/taro-h5': 3.6.24(@tarojs/components@3.6.24)(@tarojs/taro@3.6.24)
babel-plugin-transform-taroapi: 3.6.24
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/components-react': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/router': 3.6.25(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
'@tarojs/taro-h5': 3.6.25(@tarojs/components@3.6.25)(@tarojs/taro@3.6.25)
babel-plugin-transform-taroapi: 3.6.25
change-case: 4.1.2
lodash-es: 4.17.21
resolve: 1.22.8
@@ -4742,80 +4742,82 @@ packages:
- vue
dev: false
/@tarojs/plugin-platform-jd@3.6.24(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-Iyk7sAvIHE5y2IRM+5LhpvTtisbKyLP/iiQBmqGVCRMFFbrKdrzGGTDwn7xLVStkt/U/rZylcVr88bgI3SHPvg==}
/@tarojs/plugin-platform-jd@3.6.25(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-OgahJce8tqBg2kQYJ/xvrV6ydx24TX4afWOJlMZLdwDNTqDkhDnM9qGNkxcwGaWQhlfmNXStgEbRn4L1iWPjdw==}
dependencies:
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
transitivePeerDependencies:
- '@swc/helpers'
- '@tarojs/taro'
- supports-color
/@tarojs/plugin-platform-qq@3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-XDj9Ov8mjTqmEmF6eRPTGK1ByY48l3sQRLbr8upVmnrY2GhblstHcYL/v5Y9OQ5B4nSIH1bb9RUH0HmkF+h9bw==}
/@tarojs/plugin-platform-qq@3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-2xaO9A+kyoMS01s8ckOigEinOnkjv+w1bdlWS5Y47OL+gxMmDimkh3JKJuopZ65F7HYzHPWBgQV7hgVGJBiMKA==}
peerDependencies:
'@tarojs/shared': ~3.6.24
'@tarojs/shared': ~3.6.25
dependencies:
'@tarojs/plugin-platform-weapp': 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/plugin-platform-weapp': 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
transitivePeerDependencies:
- '@swc/helpers'
- '@tarojs/components'
- '@tarojs/taro'
- supports-color
/@tarojs/plugin-platform-swan@3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-/6z5IWK/+LGjMpcUKjPYOJVgcJ1SDLKijRI47PIfJe5sBDWgu/fJ6Xcy7skK4yCoiiT2XBUK6/CCLk5993A4mQ==}
/@tarojs/plugin-platform-swan@3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-Zv9neDeW4EQ+3FHFWiEzJ5vlvIQLBpXzNBitzDqj0pLYOsH2wFY/NuAubL4CGCubY+xFWpWFBucAVcCn+rJE9g==}
peerDependencies:
'@tarojs/components': ~3.6.24
'@tarojs/shared': ~3.6.24
'@tarojs/components': ~3.6.25
'@tarojs/shared': ~3.6.25
dependencies:
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
transitivePeerDependencies:
- '@swc/helpers'
- '@tarojs/taro'
- supports-color
/@tarojs/plugin-platform-tt@3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-Vayd9shaNguVekN1hqaqiH8pkYSJjbZvBvuzYcaBbqca34ZO19cUw/FI+eEC4SSTGYj058VeKcY5wqxUsxSqug==}
/@tarojs/plugin-platform-tt@3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-A6O5cL5o8H9FOfnQMDVxpUekIe9jGRurb9rn8n4lJxBFT0kA8sbFAsajaYPURSF4fHnHEckkikWBNlGPwMLCbQ==}
peerDependencies:
'@tarojs/components': ~3.6.24
'@tarojs/shared': ~3.6.24
'@tarojs/components': ~3.6.25
'@tarojs/shared': ~3.6.25
dependencies:
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
transitivePeerDependencies:
- '@swc/helpers'
- '@tarojs/taro'
- supports-color
/@tarojs/plugin-platform-weapp@3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-+5u/Xx5EnZ9jxZs5p+Ycv360Ryew40SG+USKq1lLRo/JRT20b+VmFzGKoh0h6kS55Oe2bOwbKYBMQJEH3LqPww==}
/@tarojs/plugin-platform-weapp@3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-c4iXbMWPOOCx8EOeyqVQwIl5QhMHmNKXC8jS1XESaYY5L3IHbTMY/8nd57GzOoY20tCwOZ/x+Vk13CACbeE6AA==}
peerDependencies:
'@tarojs/components': ~3.6.24
'@tarojs/shared': ~3.6.24
'@tarojs/components': ~3.6.25
'@tarojs/shared': ~3.6.25
dependencies:
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/service': 3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/shared': 3.6.25
transitivePeerDependencies:
- '@swc/helpers'
- '@tarojs/taro'
- supports-color
/@tarojs/router@3.6.24(@tarojs/runtime@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-xgLbis5FftnpL35XYz2FFPK+1YaczReeQ6d1U3H1BlYFb6LjgGKHHqPoUC3qzb2aKPHY4HL9o2OEFn3MgFlj3g==}
/@tarojs/router@3.6.25(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-p2231MK1CMKu2+xVVjtMbBEldgsKAChUmYNHIUNKOINLux/N2PLPAoDK3UDdn0nxSq/GH9/wLG1qsDjOBwOEyg==}
peerDependencies:
'@tarojs/runtime': 3.6.24
'@tarojs/taro': 3.6.24
'@tarojs/runtime': 3.6.25
'@tarojs/shared': 3.6.25
'@tarojs/taro': 3.6.25
dependencies:
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/shared': 3.6.25
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
dingtalk-jsapi: 2.15.4
history: 5.3.0
mobile-detect: 1.4.5
@@ -4824,33 +4826,33 @@ packages:
universal-router: 8.3.0
dev: false
/@tarojs/runner-utils@3.6.24:
resolution: {integrity: sha512-XqSHJfG/vuv2GLieQ2TwDrE2omOgAxxbmEvqV5GzyJhSQSiFoORgkm0WbOw+VJJdSv1vBPrfpIlcl687+gqZUg==}
/@tarojs/runner-utils@3.6.25:
resolution: {integrity: sha512-TrKtUFy/2Q72u6MlY5oRV1Q9xqHSJPDhZj6dMctUHGBEsrWxfBKCExODSkark83bPALDo5MaLza1Fbmv6ANqjw==}
dependencies:
'@tarojs/helper': 3.6.24
'@tarojs/helper': 3.6.25
scss-bundle: 3.1.2
transitivePeerDependencies:
- '@swc/helpers'
- supports-color
/@tarojs/runtime@3.6.24(@tarojs/shared@3.6.24):
resolution: {integrity: sha512-9jBzIOHm27Q5EOQZ85UH/D1YjQKvOQ/3GR63pNdB5GC42uv1bpK6QJx6yNYR0KfqxeWVMxrFQBajiNR3mnJT5g==}
/@tarojs/runtime@3.6.25(@tarojs/shared@3.6.25):
resolution: {integrity: sha512-zfcEnEHQ5s5GIOIgTtk5glHMCG22rtCvAH01tx9LyIoFOLKKp9bF/2Gr4l75PAKf+4hfbXM6R4Qk6i+Jpj3zrg==}
peerDependencies:
'@tarojs/shared': ~3.6.24
'@tarojs/shared': ~3.6.25
dependencies:
'@tarojs/shared': 3.6.24
'@tarojs/shared': 3.6.25
lodash-es: 4.17.21
tslib: 2.6.2
/@tarojs/service@3.6.24(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-PlmGRlloKPyDfvmorK6NgGYm37hc6bN696A7T31L3Bu2O/GHFRPbSMohJcohIQIeXj2JfRfVLuvR01RucSXLpg==}
/@tarojs/service@3.6.25(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-USKCu2G5KeQZ86Fj3QMM1usMh9gOZiyz7y7iJFuacYjdPvNfiQewAJPHs/CznvdpDdaIWvg7oV17ywDsgtZl6A==}
peerDependencies:
'@tarojs/shared': ~3.6.24
'@tarojs/taro': ~3.6.24
'@tarojs/shared': ~3.6.25
'@tarojs/taro': ~3.6.25
dependencies:
'@tarojs/helper': 3.6.24
'@tarojs/shared': 3.6.24
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/helper': 3.6.25
'@tarojs/shared': 3.6.25
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
joi: 17.11.0
lodash: 4.17.21
ora: 5.4.1
@@ -4861,19 +4863,19 @@ packages:
- '@swc/helpers'
- supports-color
/@tarojs/shared@3.6.24:
resolution: {integrity: sha512-LOL3IKNW9AcXQ6FkW6VuaJT4OVISnvqw46wP1QxYQkrCRPo5JTdu3Q3d19mj9gSAIT2hLSb+HLB9sdq3Rf2rGg==}
/@tarojs/shared@3.6.25:
resolution: {integrity: sha512-hu2iyN+iqK+LObeDglZjmM+WKuIT5Jc8RBrw+aQwG9h4cJwjjr0Ci0UbbIQiBqiFlsfUWhtrlnmz5m6ym49HMA==}
/@tarojs/taro-h5@3.6.24(@tarojs/components@3.6.24)(@tarojs/taro@3.6.24):
resolution: {integrity: sha512-gOGix+ODg26Ct+2DRjWHD7t0I2mI6TeTnTcFdAH0A7lhOqpSDvLvdBxmU70tdOwaelZJwKMuoU/OhWb0VaALGA==}
/@tarojs/taro-h5@3.6.25(@tarojs/components@3.6.25)(@tarojs/taro@3.6.25):
resolution: {integrity: sha512-FrhFc6MSyD2s8E/aAomNmkrJwCy+Mb16aV2jw60qhdKbqX5wbZB110m/kiBZ+s+urKCnOSzsfdHwx9moVyGS8w==}
peerDependencies:
'@tarojs/components': ~3.6.24
'@tarojs/components': ~3.6.25
dependencies:
'@tarojs/api': 3.6.24
'@tarojs/components': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/router': 3.6.24(@tarojs/runtime@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/api': 3.6.25
'@tarojs/components': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/router': 3.6.25(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/shared': 3.6.25
abortcontroller-polyfill: 1.7.5
base64-js: 1.5.1
ics: 3.5.0
@@ -4888,11 +4890,11 @@ packages:
- '@tarojs/taro'
dev: false
/@tarojs/taro-loader@3.6.24(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-4qehZPGiJt2IbdZXlbe0FgPDM7QNEPWSPt8xQzrtewvvA9yJsP6efL/ssfi3Lia3XQo2sJ2/hiSIVCOeysIt1g==}
/@tarojs/taro-loader@3.6.25(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-zOOtGb+Gfqd5aQ12iXjT/52fYq6Gl9m32zLP2cjV61SsZdYgn/SBTe5e+xxNVv/3f/lx4D8Oqu95q/3exwiwCg==}
dependencies:
'@tarojs/helper': 3.6.24
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/helper': 3.6.25
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
loader-utils: 1.4.2
transitivePeerDependencies:
- '@swc/helpers'
@@ -4905,11 +4907,11 @@ packages:
- vue
dev: true
/@tarojs/taro@3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-DFgDQhSboP1ws8ZFUurhHhWgIs6qrlS5v66sbeYJR3qS2vONtObtpwRhkfuNybc1NCMnJGG8/yVPkddrv43Ncg==}
/@tarojs/taro@3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9):
resolution: {integrity: sha512-hEnKOHdNy32J95BTB+in3sLxxnp88aQj0a75d66F/gUzhieM5Q9ldtPvcMxJFwwxaprkBGzr81x7kBcPoU2DjA==}
peerDependencies:
'@tarojs/helper': ~3.6.24
'@tarojs/runtime': ~3.6.24
'@tarojs/helper': ~3.6.25
'@tarojs/runtime': ~3.6.25
'@types/react': '*'
'@types/webpack': '*'
'@types/webpack-dev-server': '*'
@@ -4927,20 +4929,20 @@ packages:
vue:
optional: true
dependencies:
'@tarojs/api': 3.6.24
'@tarojs/helper': 3.6.24
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/api': 3.6.25
'@tarojs/helper': 3.6.25
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
postcss: 8.4.32
vue: 3.3.9(typescript@4.9.5)
/@tarojs/webpack5-prebundle@3.6.24(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)(webpack@5.89.0):
resolution: {integrity: sha512-5OiaARL6XZ7Y6ebr8Rv5G98GM7kKKtS8svC0cdBcua+gmvbCzEyN6Dz1GXh6sjxqMSwz/4HZqSswLk1lbxbNOw==}
/@tarojs/webpack5-prebundle@3.6.25(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)(webpack@5.89.0):
resolution: {integrity: sha512-zou4Gm99i5zeSdQUigAQ8gBS1CVu+6+ELCJO5Zov6rimmNeV/Fi4KLX8HuF+S2Isxey059alOoRxj+xmfUDD7A==}
peerDependencies:
webpack: ^5.78.0
dependencies:
'@tarojs/helper': 3.6.24
'@tarojs/shared': 3.6.24
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/helper': 3.6.25
'@tarojs/shared': 3.6.25
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
enhanced-resolve: 5.15.0
es-module-lexer: 0.10.5
lodash: 4.17.21
@@ -4958,29 +4960,29 @@ packages:
- vue
dev: true
/@tarojs/webpack5-runner@3.6.24(@babel/core@7.23.5)(@swc/core@1.3.96)(@tarojs/components@3.6.24)(@tarojs/runtime@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)(@vue/compiler-sfc@3.3.9)(postcss@8.4.32)(typescript@4.9.5)(vue@3.3.9)(webpack@5.89.0):
resolution: {integrity: sha512-dvyPsxWB7oI03JvsapUeEKNZbOvb8HeBI8d8ZOn4jo755cq22oN+1VKsmBTsVDvklYDScExQfCVSxWuKwlYvyA==}
/@tarojs/webpack5-runner@3.6.25(@babel/core@7.23.5)(@swc/core@1.3.96)(@tarojs/components@3.6.25)(@tarojs/runtime@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)(@vue/compiler-sfc@3.3.9)(postcss@8.4.32)(typescript@4.9.5)(vue@3.3.9)(webpack@5.89.0):
resolution: {integrity: sha512-/vqMPGKM//w1xksukeiErA2LvEB90F8iGGrc4NJzONk6SlljfX00v/EHc63q1PxVy6W6Jl3Ft53LPWjCzOjbZA==}
peerDependencies:
'@tarojs/runtime': ~3.6.24
'@tarojs/shared': ~3.6.24
'@tarojs/taro': ~3.6.24
'@tarojs/runtime': ~3.6.25
'@tarojs/shared': ~3.6.25
'@tarojs/taro': ~3.6.25
postcss: ^8.4.18
webpack: ^5.78.0
dependencies:
'@parcel/css': 1.14.0
'@tarojs/helper': 3.6.24
'@tarojs/plugin-platform-alipay': 3.6.24(@tarojs/components@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/plugin-platform-jd': 3.6.24(@tarojs/taro@3.6.24)
'@tarojs/plugin-platform-qq': 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/plugin-platform-swan': 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/plugin-platform-tt': 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/plugin-platform-weapp': 3.6.24(@tarojs/components@3.6.24)(@tarojs/shared@3.6.24)(@tarojs/taro@3.6.24)
'@tarojs/runner-utils': 3.6.24
'@tarojs/runtime': 3.6.24(@tarojs/shared@3.6.24)
'@tarojs/shared': 3.6.24
'@tarojs/taro': 3.6.24(@tarojs/helper@3.6.24)(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/taro-loader': 3.6.24(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/webpack5-prebundle': 3.6.24(@tarojs/runtime@3.6.24)(postcss@8.4.32)(vue@3.3.9)(webpack@5.89.0)
'@tarojs/helper': 3.6.25
'@tarojs/plugin-platform-alipay': 3.6.25(@tarojs/components@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-jd': 3.6.25(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-qq': 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-swan': 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-tt': 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/plugin-platform-weapp': 3.6.25(@tarojs/components@3.6.25)(@tarojs/shared@3.6.25)(@tarojs/taro@3.6.25)
'@tarojs/runner-utils': 3.6.25
'@tarojs/runtime': 3.6.25(@tarojs/shared@3.6.25)
'@tarojs/shared': 3.6.25
'@tarojs/taro': 3.6.25(@tarojs/helper@3.6.25)(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/taro-loader': 3.6.25(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)
'@tarojs/webpack5-prebundle': 3.6.25(@tarojs/runtime@3.6.25)(postcss@8.4.32)(vue@3.3.9)(webpack@5.89.0)
acorn-walk: 8.3.0
autoprefixer: 9.8.8
babel-loader: 8.2.1(@babel/core@7.23.5)(webpack@5.89.0)
@@ -5006,11 +5008,11 @@ packages:
mkdirp: 1.0.4
ora: 5.4.1
postcss: 8.4.32
postcss-html-transform: 3.6.24(postcss@8.4.32)
postcss-html-transform: 3.6.25(postcss@8.4.32)
postcss-import: 14.1.0(postcss@8.4.32)
postcss-loader: 7.3.3(postcss@8.4.32)(typescript@4.9.5)(webpack@5.89.0)
postcss-plugin-constparse: 3.6.24(postcss@8.4.32)
postcss-pxtransform: 3.6.24(postcss@8.4.32)
postcss-plugin-constparse: 3.6.25(postcss@8.4.32)
postcss-pxtransform: 3.6.25(postcss@8.4.32)
postcss-url: 10.1.3(postcss@8.4.32)
regenerator-runtime: 0.11.1
resolve: 1.22.8
@@ -6929,8 +6931,8 @@ packages:
babel-types: 6.26.0
dev: true
/babel-plugin-transform-taroapi@3.6.24:
resolution: {integrity: sha512-NlDArVEjTUhYsBk6PSZW6ObN2uLA6L6aXcXBeZC6S9wX7HOW3zkGgMk3EGS6JfGEZcZlOgLPVfR9AYkEH+XgDg==}
/babel-plugin-transform-taroapi@3.6.25:
resolution: {integrity: sha512-hcXR+rUs7lry8bvqG/yDOmyNN4bn1bty+ZOfsiP7bKIxS5ELmfFWxty0eCNvJgin5msn8FgsxbXHSobHdLbJRA==}
dependencies:
lodash: 4.17.21
dev: false
@@ -7010,8 +7012,8 @@ packages:
- supports-color
dev: true
/babel-preset-taro@3.6.24(@babel/core@7.23.5):
resolution: {integrity: sha512-qMx0X7fwaGdUYTK6Oj0DGk1N4y/VgP7GgVl1CROtYofFBbOEs9lXKQ96DjBX9aUrKFAblvFv8AEzjq1RlqMgcw==}
/babel-preset-taro@3.6.25(@babel/core@7.23.5):
resolution: {integrity: sha512-+OfMkZceuSotyiclnCuUsXgt5MHCYWYG7ttg+xzv5PEIwJlWX0Jl94UQ37PNijwXncab7l00i7Axqrlc6amZog==}
peerDependencies:
'@babel/core': '*'
dependencies:
@@ -7025,7 +7027,7 @@ packages:
'@babel/preset-typescript': 7.23.3(@babel/core@7.23.5)
'@babel/runtime': 7.23.5
'@babel/runtime-corejs3': 7.23.5
'@tarojs/helper': 3.6.24
'@tarojs/helper': 3.6.25
babel-plugin-dynamic-import-node: 2.3.3
babel-plugin-minify-dead-code-elimination: 0.5.2
babel-plugin-transform-imports-api: 1.0.0
@@ -9512,8 +9514,8 @@ packages:
source-map: 0.6.1
dev: true
/eslint-config-taro@3.6.24(@babel/core@7.23.5)(eslint@8.55.0)(typescript@4.9.5):
resolution: {integrity: sha512-7iyBXIskrcoWYRq4r5QGxLvBJomwLQXKMsqe0aaOPhwSdhumO29hdvCou941z6j5P6q/NNR3yKonr1AjTJA31A==}
/eslint-config-taro@3.6.25(@babel/core@7.23.5)(eslint@8.55.0)(typescript@4.9.5):
resolution: {integrity: sha512-csiC3BUOgKulS/XcINn380V2U/vqjDa342jADRir44kIocVx5YgbZoM1j3ODu2q584Y4zH4lQJn9WGwX3w8g7A==}
peerDependencies:
eslint: '*'
dependencies:
@@ -14160,8 +14162,8 @@ packages:
postcss: 8.4.32
dev: true
/postcss-html-transform@3.6.24(postcss@8.4.32):
resolution: {integrity: sha512-7rP5CzAhlTGtD2owJhNij73sXt/76Q4ONLvfxYkJIpBAEpn8f8biEBUDTrri7jOW7Z6UAqjkDYQ57o58OKJNxw==}
/postcss-html-transform@3.6.25(postcss@8.4.32):
resolution: {integrity: sha512-1tl90tAjHjv1n3Uc+6i5fH2hZiPqbeIJdiKeaBxteAebQ11KZw8fbOtL0h93bfN563hbm6gpND/MGamcK+H2mw==}
peerDependencies:
postcss: ^8.4.18
dependencies:
@@ -14473,16 +14475,16 @@ packages:
postcss-value-parser: 4.2.0
dev: true
/postcss-plugin-constparse@3.6.24(postcss@8.4.32):
resolution: {integrity: sha512-+tHwV4KnPDZ6E0dJJ6ht31cTMSDxUcEp6J+Rm3oAuqTHX40QiJk9AsC9s7JsWCFS8PsZSMDxCtVrDvCUNLpINw==}
/postcss-plugin-constparse@3.6.25(postcss@8.4.32):
resolution: {integrity: sha512-x7dYIIZyRXef5ceYd3k2ozb8fbwUbQnTlbfYn2Gv84U3MaR1KiihPLupB4iinxIf42K4i6sX8e4uQQnm0yYtlg==}
peerDependencies:
postcss: ^8.4.18
dependencies:
postcss: 8.4.32
dev: true
/postcss-pxtransform@3.6.24(postcss@8.4.32):
resolution: {integrity: sha512-CJqDKP7YtpjHpMLDFepp0d7CCH1wcX+OC6BwtiHxlKGOrFlC7lII0wyB8+pzizrXA+vZbwJc7EMENaLoEPqW0w==}
/postcss-pxtransform@3.6.25(postcss@8.4.32):
resolution: {integrity: sha512-JuuyZPh/DUYTlwylzxyd4Nw9cxukoUJJjxf9MjtvLUpdBT3nq+uSo2vMlUSILpkKwJcP8/wIuTlB8HAvVdHMtA==}
peerDependencies:
postcss: ^8.4.18
dependencies:

6
src/api/admin.ts
View File

@@ -70,4 +70,8 @@ export const createPayQr = (data: object) =>
// 检查手机号码是否存在
export const checkPhone = (data: object) =>
request("/user/find/phone", data, "POST");
request("/user/find/phone", data, "POST");
// 获取商家特定用户会员积分2024-3-19
export const getUserPoint = (data: object) =>
request("/store/get/user/integral", data, "POST");

19
src/components/Cart.vue
View File

@@ -4,7 +4,7 @@ import Taro from "@tarojs/taro";
import { addCart, getCart, clearCart } from "@/api/cart";
import { Del2 } from "@nutui/icons-vue-taro";
import { createActiveOrder } from "@/api/goods";
import { createAfterOrder } from "@/api/admin";
import { createAfterOrder, getUserPoint } from "@/api/admin";
import Pay from "@/components/Pay.vue";
interface CardList {
@@ -142,11 +142,21 @@ const create_order = async () => {
url: `/pages/admin/add_order/pending_order/pending_order_detail/index?oid=${res.data.oid}&bid=${props.merInfo.bid}`,
});
} else {
const mer_info = Taro.getStorageSync("mer_info");
const user_info = Taro.getStorageSync("userInfo");
const data = await getUserPoint({
phone: user_info.data.phone,
bid: mer_info.bid,
});
res = await createActiveOrder({
Bid: [props.merInfo.bid],
custID: data.data.store_user_id,
});
if (res.data.oid) {
orderData.value = res.oid;
orderData.value = {
jh_info: data.data,
oid: res.data.oid,
};
isShowPay.value = true;
}
}
@@ -174,9 +184,10 @@ defineExpose({
<view class="container">
<view>购物车数量: {{ cartInfo.count }}</view>
<view v-if="cartInfo.count > 0">
<text>总金额: {{ cartInfo.price.toFixed(2) }}元</text
<text>总金额: {{ cartInfo.price.toFixed(2) }}元</text>
<text v-if="!IsPendingOrder"
>，总积分: {{ cartInfo.exchange.toFixed(2) }}</text
>
<text v-if="!IsPendingOrder">，总积分: {{ cartInfo.exchange.toFixed(2) }}</text>
</view>
</view>
<view v-if="cartInfo.count > 0" class="payBtn" @click.stop="create_order"

95
src/components/Pay.vue
View File

@@ -14,45 +14,36 @@
<nut-cell-group
:style="{ margin: interval ? '40rpx 0 150rpx 0' : '40rpx 0' }"
>
<nut-cell
title="微信支付"
desc="使用微信快捷支付"
is-link
@click="goPay(1)"
>
<template v-slot:icon>
<IconFont
size="30"
name="https://img11.360buyimg.com/imagetools/jfs/t1/137646/13/7132/1648/5f4c748bE43da8ddd/a3f06d51dcae7b60.png"
/>
</template>
</nut-cell>
<nut-cell
title="积分支付"
:desc="`剩余积分:${info.integral || 0}`"
is-link
@click="goPay(2)"
>
<template v-slot:icon>
<IconFont
size="30"
name="https://img11.360buyimg.com/imagetools/jfs/t1/137646/13/7132/1648/5f4c748bE43da8ddd/a3f06d51dcae7b60.png"
/>
</template>
</nut-cell>
<!-- <nut-cell
title="挂帐后结"
desc="先消费后结账"
<nut-cell
title="微信支付"
desc="使用微信快捷支付"
is-link
@click="goPay(1)"
>
<template v-slot:icon>
<IconFont size="30" :name="require('../static/wx.png')" />
</template>
</nut-cell>
<nut-cell
title="平台积分支付"
:desc="`剩余积分:${info.integral || 0}`"
is-link
@click="goPay(2)"
>
<template v-slot:icon>
<IconFont size="30" :name="require('../static/pt.png')" />
</template>
</nut-cell>
<nut-cell
title="天才小猪积分支付"
:desc="`剩余积分:${jfInfo.jh_info?.integral || 0}`"
is-link
@click="goPay(3)"
>
<template v-slot:icon>
<IconFont
size="30"
name="https://img11.360buyimg.com/imagetools/jfs/t1/137646/13/7132/1648/5f4c748bE43da8ddd/a3f06d51dcae7b60.png"
/>
<IconFont size="30" :name="require('../static/jh.png')" />
</template>
</nut-cell> -->
</nut-cell>
</nut-cell-group>
</view>
</nut-popup>
@@ -112,21 +103,22 @@ const getInfo = async () => {
};
const goPay = async (type: number) => {
console.log(prop);
if (!prop.jfInfo)
return Taro.showToast({
title: "未获取到订单信息",
title: "未获取到订单信息~",
icon: "none",
});
try {
// 1微信支付 2积分支付 3挂帐
if (type === 1 || type === 2) {
const { data } = await payOrder({
oid: prop.jfInfo,
OrderType: prop.OrderType,
PayType: type,
});
if (type === 1) {
console.log(prop.jfInfo);
// 1微信支付 2积分支付 3专属积分兑换
const { data } = await payOrder({
oid: prop.jfInfo.oid,
OrderType: prop.OrderType,
PayType: type,
});
switch (type) {
case 1:
if (data.data) {
Taro.requestPayment({
timeStamp: data.data.timeStamp,
@@ -153,24 +145,19 @@ const goPay = async (type: number) => {
});
} else {
Taro.showToast({
title: "未知异常",
title: "支付失败，请稍后再试~",
icon: "none",
});
emit("closePay", false);
}
} else if (type === 2) {
break;
default:
Taro.showToast({
title: "支付成功",
icon: "success",
duration: 2000,
icon: "none",
});
emit("successPay", false);
}
} else {
Taro.showToast({
title: "挂帐后结账",
icon: "none",
});
break;
}
} catch (e) {
Taro.showToast({

136
src/pages/user/index.vue
View File

@@ -27,6 +27,15 @@
</view>
<view class="rightIcon">
<Scan style="margin-right: 20px" @click="scanCode" size="22" />
<button v-if="isLogin" open-type="contact">
<Message
color="#666666"
style="margin-right: 20px"
@click="toSetting"
size="22"
/>
</button>
<Setting style="margin-right: 20px" @click="toSetting" size="22" />
</view>
</view>
@@ -91,29 +100,19 @@
</view>
<!-- 我的服务 -->
<view class="user-center">
<view class="user-center" v-if="isLogin">
<view>我的服务</view>
<view class="box">
<template v-if="isLogin">
<view
class="box-mini"
v-for="item in userMenuList"
:key="item.id"
@click="toPage(item.url)"
>
<!-- <image :src="item.icon" /> -->
<IconFont size="40" :name="item.icon"></IconFont>
<view class="label">{{ item.label }}</view>
</view>
</template>
<button v-if="isLogin" class="box-mini" open-type="contact">
<IconFont
size="40"
name="http://jdt168.com/uploads/default/20220829/7437d90fdd0fba868084bd9cd0b59049.png"
></IconFont>
<text class="label">联系客服</text>
</button>
<view
class="box-mini"
v-for="(item, idx) in userMenuList"
:key="idx"
@click="toPage(item.url)"
>
<!-- <image :src="item.icon" /> -->
<IconFont size="40" :name="item.icon"></IconFont>
<view class="label">{{ item.label }}</view>
</view>
</view>
</view>
@@ -130,7 +129,7 @@
@click="toPage('/pages/admin/add_order/index')"
>
<IconFont
size="50"
size="40"
:name="require('../../static/user/1-1.png')"
></IconFont>
</nut-grid-item>
@@ -141,7 +140,7 @@
@click="toPage('/pages/admin/verify/index')"
>
<IconFont
size="50"
size="40"
:name="require('../../static/user/1-2.png')"
></IconFont>
</nut-grid-item>
@@ -152,7 +151,7 @@
@click="toPage('/pages/admin/order_manage/index')"
>
<IconFont
size="50"
size="40"
:name="require('../../static/user/1-3.png')"
></IconFont>
</nut-grid-item>
@@ -163,7 +162,7 @@
@click="toPage('/pages/admin/withdrawal/index')"
>
<IconFont
size="50"
size="40"
:name="require('../../static/user/1-4.png')"
></IconFont>
</nut-grid-item>
@@ -184,7 +183,13 @@
<script lang="ts" setup>
import { ref } from "vue";
import { ArrowRight, Setting, IconFont, Scan } from "@nutui/icons-vue-taro";
import {
ArrowRight,
Setting,
IconFont,
Scan,
Message,
} from "@nutui/icons-vue-taro";
import Taro from "@tarojs/taro";
import Auth from "@/components/Auth.vue";
import { getPersonalInfo, getPhone, bindParent } from "@/api/user";
@@ -229,10 +234,9 @@ const getUserInfo = async () => {
...res.data,
data: {
...res.data.data,
permission:
res.data.data.permission
? JSON.parse(res.data.data.permission)
: {},
permission: res.data.data.permission
? JSON.parse(res.data.data.permission)
: {},
},
};
Taro.setStorageSync("userInfo", userInfo.value);
@@ -262,13 +266,11 @@ const toOrderList = (e: number) => {
const userMenuList = ref([
{
id: 0,
label: "后结订单",
url: "/pages/users/pending_order/index",
icon: require("../../static/user/dd.png"),
},
{
id: 1,
label: "我的账户",
url: "/pages/users/account/index",
icon: "http://jdt168.com/uploads/default/20220829/e819815623276fdbb9a54d685292e5c7.png",
@@ -280,23 +282,15 @@ const userMenuList = ref([
// icon: "http://jdt168.com/uploads/default/20220829/583fd6cbd729b24eab9c3cae20ae694d.png",
// },
{
id: 3,
label: "我的推广",
url: "/pages/users/distribution/index",
icon: "http://jdt168.com/uploads/default/20220829/73656833c1d849c050638f9ee9903b9d.png",
},
// {
// id: 4,
// label: "关注商家",
// url: "",
// icon: "http://jdt168.com/uploads/default/20220829/13637589cd20785aa21fca1d4f9b26bc.png",
// label: "聚合积分",
// url: "/pages/users/integral/index",
// icon: require("../../static/jhjf.png"),
// },
// {
// id: 5,
// label: '联系客服',
// url: '',
// icon: 'http://jdt168.com/uploads/default/20220829/7437d90fdd0fba868084bd9cd0b59049.png'
// }
]);
const toSetting = () => {
@@ -370,6 +364,7 @@ const scanCode = () => {
justify-content: space-between;
box-sizing: border-box;
text-align: left;
padding-right: 20px;
.user-center-card__header__info {
margin-left: 20px;
@@ -381,6 +376,23 @@ const scanCode = () => {
.rightIcon {
height: 100px;
margin: auto;
display: flex;
justify-content: flex-start;
// align-items: center;
button {
padding: 0 !important;
margin: 0 !important;
background: transparent;
-webkit-tap-highlight-color: transparent;
overflow: hidden;
position: relative;
top: -13px;
}
button::after {
border: none;
background: transparent;
}
}
}
@@ -433,25 +445,23 @@ const scanCode = () => {
background-color: #fff;
border-radius: 20px;
margin: 20px;
padding: 30px;
padding: 20px;
width: 710px;
box-sizing: border-box;
.box {
margin-top: 20px;
display: flex;
flex-wrap: wrap;
display: grid;
grid-template-columns: repeat(4, 1fr);
grid-gap: 20px;
box-sizing: border-box;
justify-content: flex-start;
.box-mini {
display: flex;
box-sizing: border-box;
width: 150px;
flex-direction: column;
align-items: center;
width: 150px;
margin-bottom: 20px;
margin-right: 13px;
.label {
font-size: 25px;
@@ -464,32 +474,6 @@ const scanCode = () => {
height: 80px;
}
}
button {
width: 150px;
position: relative;
margin-left: auto;
margin-right: auto;
padding-left: 0;
padding-right: 0;
box-sizing: border-box;
// font-size: 18px;
text-align: center;
text-decoration: none;
// line-height: 1;
line-height: 1.35;
// border-radius: 5px;
-webkit-tap-highlight-color: transparent;
overflow: hidden;
color: #000000;
background-color: #fff;
height: 100%;
}
button::after {
border: none;
background: transparent;
}
}
}

46
src/pages/users/account/index.vue
View File

@@ -22,6 +22,10 @@ const tabsList = ref([
title: "活动赠送",
value: 4,
},
{
title: "聚合积分",
value: 5,
},
]);
const computerType = computed(() => {
@@ -81,13 +85,13 @@ const getList = async () => {
PageSize: page.value.PageSize,
Type: tabValue.value,
};
if (tabValue.value === 1 || tabValue.value === 3) {
if (tabValue.value === 1 || tabValue.value === 3 || tabValue.value === 5) {
res = await getBeanDetail(newData);
} else if (tabValue.value === 2) {
// delete data.value.Type;
Reflect.deleteProperty(data.value, "Type");
res = await getIntegralDetail(newData);
} else {
} else if (tabValue.value === 4) {
res = await getGiftRecord(newData);
}
data.value = res.data.data || [];
@@ -117,28 +121,31 @@ const getList = async () => {
<!-- <image class="img" src="https://picdm.sunbangyan.cn/2023/08/15/ste192.png"/> -->
</view>
</view>
<view class="tabs-box">
<view
v-for="item in tabsList"
:key="item.value"
@click="tabChange(item.value)"
>
<view class="text">{{ item.title }}</view>
<scroll-view scroll-x>
<view class="tabs-box">
<view
class="line"
:class="{ lineColor: item.value === tabValue }"
></view>
v-for="item in tabsList"
:key="item.value"
@click="tabChange(item.value)"
>
<view class="text">{{ item.title }}</view>
<view
class="line"
:class="{ lineColor: item.value === tabValue }"
></view>
</view>
</view>
</view>
</scroll-view>
<view v-if="data.length > 0">
<view v-if="tabValue === 1 || tabValue === 3">
<view v-if="tabValue === 1 || tabValue === 3 || tabValue === 5">
<view class="card-list" v-for="(item, index) in data" :key="index">
<view class="left">
<view>订单：{{ item.oid }}</view>
<view>时间：{{ item.add_time.slice(0, 10) }}</view>
</view>
<view class="right">
<view v-if="tabValue === 1" style="color: green"
<view v-if="tabValue === 1 || tabValue === 5" style="color: green"
>-
<text>{{ item.number }}积分</text>
</view>
@@ -245,12 +252,17 @@ const getList = async () => {
.tabs-box {
display: flex;
flex-direction: row;
justify-content: space-evenly;
// justify-content: space-evenly;
align-items: center;
height: auto;
background-color: #fff;
padding: 0 20px;
padding: 0 10px;
text-align: center;
overflow-x: auto;
view {
width: 200px;
}
.text {
margin: 10px 20px;

27
src/pages/users/order_list/index.vue
View File

@@ -4,6 +4,7 @@ import Taro from "@tarojs/taro";
import Pay from "@/components/Pay.vue";
import { getActiveOrderList, deleteActiveOrder } from "@/api/goods";
import { getOrderStatistics } from "@/api/order";
import { getUserPoint } from "@/api/admin";
const tabValue = ref(0);
@@ -43,6 +44,9 @@ interface OrderList {
oid: string;
add_time: string;
status: number;
Store: {
bid: string;
};
OrderGoods: GoodsItem[];
count: number;
number: number;
@@ -94,13 +98,17 @@ const tabChange = (index: number) => {
getList();
};
Taro.useReachBottom(() => {
console.log("useReachBottom");
});
const openPay = (item: OrderList) => {
const openPay = async (item: OrderList) => {
isShowPay.value = true;
jfInfo.value = item.oid;
const user_info = Taro.getStorageSync("userInfo");
const data = await getUserPoint({
phone: user_info.data.phone,
bid: item.Store.bid,
});
jfInfo.value = {
jh_info: data.data,
oid: item.oid,
};
};
const errPay = () => {
@@ -122,6 +130,12 @@ const closePay = () => {
getList();
};
const successPay = () => {
isShowPay.value = false;
jfInfo.value = {};
getList();
};
const toDetail = (item: any) => {
Taro.setStorageSync("item", item);
Taro.navigateTo({
@@ -271,6 +285,7 @@ const getTj = async () => {
:jfInfo="jfInfo"
:OrderType="2"
@errPay="errPay"
@successPay="successPay"
@closePay="closePay"
/>
</view>

15
src/pages/users/order_list_detail/index.vue
View File

@@ -152,6 +152,7 @@
:jfInfo="jfInfo"
:OrderType="2"
@errPay="errPay"
@successPay="successPay"
@closePay="closePay"
/>
</view>
@@ -164,6 +165,7 @@ import { ref } from "vue";
import dayjs from "dayjs";
import duration from "dayjs/plugin/duration";
import Pay from "@/components/Pay.vue";
import { getUserPoint } from "@/api/admin";
dayjs.extend(duration);
@@ -218,9 +220,18 @@ const toAdder = () => {
});
};
const openPay = () => {
const openPay = async () => {
isShowPay.value = true;
jfInfo.value = Taro.getStorageSync("item");
const mer_info = Taro.getStorageSync("mer_info");
const user_info = Taro.getStorageSync("userInfo");
const data = await getUserPoint({
phone: user_info.data.phone,
bid: mer_info.bid,
});
jfInfo.value = {
jh_info: data.data,
oid: Taro.getStorageSync("item").oid,
};
};
const successPay = (val: boolean) => {

4
src/pages/users/setting/index.vue
View File

@@ -17,10 +17,10 @@ const toPage = (url: string) => {
is-link
@click="toPage('/pages/users/user_setting/index')"
></nut-cell>
<nut-cell title="关于我们" is-link @click="toPage('1')"></nut-cell>
<!-- <nut-cell title="关于我们" is-link @click="toPage('1')"></nut-cell>
<nut-cell title="资质证明" is-link @click="toPage('1')"></nut-cell>
<nut-cell title="协议规则" is-link @click="toPage('1')"></nut-cell>
<nut-cell title="隐私设置" is-link @click="toPage('1')"></nut-cell>
<nut-cell title="隐私设置" is-link @click="toPage('1')"></nut-cell> -->
</nut-cell-group>
</view>
</template>

BIN
src/static/jh.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
src/static/jhjf.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.3 KiB

BIN
src/static/pt.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/static/wx.png Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB