XinLingKeJi/jdt-mer
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-15 16:09:37 +08:00
parent 528c405f63 760c843060
commit c563bf8cd6
30 changed files with 598 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.dockerignore Normal file
View File

@@ -0,0 +1 @@
node_modules

158
.drone.yml Normal file
View File

@@ -0,0 +1,158 @@
kind: pipeline
type: docker
name: default
platform:
os: linux
arch: amd64
steps:
- name: 测试服-依赖安装&&编译打包
pull: if-not-exists
image: node:20-alpine
when:
branch:
- test
commands:
- npm config set registry https://registry.npmmirror.com/
- npm install -g pnpm
- pnpm install
- pnpm build:test
- rm -rf dist.tar
- rm -rf node_modules
- tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile
- name: 正式服-依赖安装&&编译打包
pull: if-not-exists
image: node:20-alpine
when:
branch:
- main
commands:
- npm config set registry https://registry.npmmirror.com/
- npm install -g pnpm
- pnpm install
- pnpm build:prod
- rm -rf dist.tar
- rm -rf node_modules
- tar -zcvf dist.tar ./dist ./default.conf ./Dockerfile
- name: 测试服-产物上传
pull: if-not-exists
image: appleboy/drone-scp
when:
branch:
- test
settings:
host:
from_secret: HOST_DEV
username:
from_secret: USER_DEV
password:
from_secret: PWD_DEV
port: 22
strip_components: 1
target: /www/builder
source:
- ./dist.tar
- name: 测试服-部署
pull: if-not-exists
image: appleboy/drone-ssh
when:
branch:
- test
settings:
host:
from_secret: HOST_DEV
username:
from_secret: USER_DEV
password:
from_secret: PWD_DEV
port: 22
script:
- cd /www/builder
- mkdir jdt-mer-dev
- tar -xzvf dist.tar -C /www/builder/jdt-mer-dev
- rm -rf dist.tar
- cd jdt-mer-dev
- docker build -t jdt-mer-dev .
- docker stop jdt-mer-dev
- docker rm jdt-mer-dev
- docker run -d -p 8083:80 --restart=always --name jdt-mer-dev jdt-mer-dev
- cd ..
- rm -rf jdt-mer-dev
- name: 正式服-产物上传
pull: if-not-exists
image: appleboy/drone-scp
when:
branch:
- main
settings:
host:
from_secret: HOST_PROD
username:
from_secret: USER_PROD
password:
from_secret: PWD_PROD
port: 22
strip_components: 1
target: /www/builder
source:
- ./dist.tar
- name: 正式服-部署
pull: if-not-exists
image: appleboy/drone-ssh
when:
branch:
- main
settings:
host:
from_secret: HOST_PROD
username:
from_secret: USER_PROD
password:
from_secret: PWD_PROD
port: 22
script:
- cd /www/builder
- mkdir jdt-mer-prod
- tar -xzvf dist.tar -C /www/builder/jdt-mer-prod
- rm -rf dist.tar
- cd jdt-mer-prod
- docker build -t jdt-mer-prod .
- docker stop jdt-mer-prod
- docker rm jdt-mer-prod
- docker run -d -p 8083:80 --restart=always --name jdt-mer-prod jdt-mer-prod
- cd ..
- rm -rf jdt-mer-prod
- name: 企业微信通知
pull: if-not-exists
image: plugins/webhook
when:
branch:
- test
- main
status:
- success
- failure
settings:
urls: https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=a2065e21-4f92-4f5b-a432-2c0cd1d965b5
content_type: application/json
template: |
{
"msgtype": "markdown",
"markdown": {
"content": "{{#success build.status}}✅{{else}}❌{{/success}}**{{ repo.owner }}/{{ repo.name }}** (Build #{{build.number}})\n
>**构建结果**: {{ build.status }}
>**构建详情**: [点击查看]({{ build.link }})
>**代码分支**: {{ build.branch }}
>**提交标识**: {{ build.commit }}
>**提交发起**: {{ build.author }}
>**提交信息**: {{ build.message }}
"
}
}

3
.env.development
View File

@@ -11,6 +11,3 @@ VITE_USE_PROXY=true
VITE_BASE_API='/store'
VITE_ADMIN_API='/admin'
# 是否启用监控
VITE_SENTRY=false

3
.env.production
View File

@@ -14,6 +14,3 @@ VITE_USE_COMPRESS=true
# 压缩类型
VITE_COMPRESS_TYPE=gzip
# 是否启用监控
VITE_SENTRY=true

5
.env.sentry-build-plugin
View File

@@ -1,5 +0,0 @@
# DO NOT commit this file to your repository!
# The SENTRY_AUTH_TOKEN variable is picked up by the Sentry Build Plugin.
# It's used for authentication when uploading source maps.
# You can also set this env variable in your own `.env` files and remove this file.
SENTRY_AUTH_TOKEN="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"

3
.env.test
View File

@@ -13,6 +13,3 @@ VITE_USE_COMPRESS=true
# 压缩类型
VITE_COMPRESS_TYPE=gzip
# 是否启用监控
VITE_SENTRY=false

5
.idea/.gitignore generated vendored
View File

@@ -1,5 +0,0 @@
# 默认忽略的文件
/shelf/
/workspace.xml
# 基于编辑器的 HTTP 客户端请求
/httpRequests/

65
.idea/codeStyles/Project.xml generated
View File

@@ -1,65 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="LINE_SEPARATOR" value="&#10;" />
<HTMLCodeStyleSettings>
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
<option name="HTML_QUOTE_STYLE" value="Single" />
<option name="HTML_ENFORCE_QUOTES" value="true" />
</HTMLCodeStyleSettings>
<JSCodeStyleSettings version="0">
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="USE_DOUBLE_QUOTES" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</JSCodeStyleSettings>
<TypeScriptCodeStyleSettings version="0">
<option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
<option name="FORCE_SEMICOLON_STYLE" value="true" />
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
<option name="USE_DOUBLE_QUOTES" value="false" />
<option name="FORCE_QUOTE_STYlE" value="true" />
<option name="ENFORCE_TRAILING_COMMA" value="Remove" />
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
<option name="SPACES_WITHIN_IMPORTS" value="true" />
</TypeScriptCodeStyleSettings>
<VueCodeStyleSettings>
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
</VueCodeStyleSettings>
<codeStyleSettings language="HTML">
<option name="SOFT_MARGINS" value="100" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
<option name="SMART_TABS" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JavaScript">
<option name="SOFT_MARGINS" value="100" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="TypeScript">
<option name="SOFT_MARGINS" value="100" />
<indentOptions>
<option name="INDENT_SIZE" value="2" />
<option name="CONTINUATION_INDENT_SIZE" value="2" />
<option name="TAB_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Vue">
<option name="SOFT_MARGINS" value="100" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="2" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>

5
.idea/codeStyles/codeStyleConfig.xml generated
View File

@@ -1,5 +0,0 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

6
.idea/inspectionProfiles/Project_Default.xml generated
View File

@@ -1,6 +0,0 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
</profile>
</component>

6
.idea/jsLibraryMappings.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="JavaScriptLibraryMappings">
<includedPredefinedLibrary name="Node.js Core" />
</component>
</project>

6
.idea/jsLinters/eslint.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="EslintConfiguration">
<option name="fix-on-save" value="true" />
</component>
</project>

12
.idea/mer.iml generated
View File

@@ -1,12 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="WEB_MODULE" version="4">
<component name="NewModuleRootManager">
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
<excludeFolder url="file://$MODULE_DIR$/temp" />
<excludeFolder url="file://$MODULE_DIR$/tmp" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>

8
.idea/modules.xml generated
View File

@@ -1,8 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ProjectModuleManager">
<modules>
<module fileurl="file://$PROJECT_DIR$/.idea/mer.iml" filepath="$PROJECT_DIR$/.idea/mer.iml" />
</modules>
</component>
</project>

6
.idea/prettier.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="PrettierConfiguration">
<option name="myConfigurationMode" value="AUTOMATIC" />
</component>
</project>

6
.idea/vcs.xml generated
View File

@@ -1,6 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
</component>
</project>

2
.vscode/settings.json vendored
View File

@@ -25,7 +25,7 @@
},
"eslint.validate": ["javascript", "javascriptreact", "typescript", "vue"],
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"files.associations": {
"*.env.*": "dotenv",

17
build/plugin/index.js
View File

@@ -14,7 +14,6 @@ import viteCompression from 'vite-plugin-compression'
import { configHtmlPlugin } from './html'
import { configMockPlugin } from './mock'
import unplugin from './unplugin'
import { sentryVitePlugin } from '@sentry/vite-plugin'
export function createVitePlugins(viteEnv, isBuild) {
const plugins = [vue(), ...unplugin, configHtmlPlugin(viteEnv, isBuild), Unocss()]
@@ -36,21 +35,5 @@ export function createVitePlugins(viteEnv, isBuild) {
})
)
}
if (viteEnv.VITE_SENTRY) {
plugins.push(
sentryVitePlugin({
authToken: process.env.SENTRY_AUTH_TOKEN,
org: 'sentry',
project: 'jdt-mer',
url: 'https://w.huakk.top',
sourcemaps: {
ignore: ['node_modules'],
filesToDeleteAfterUpload: ['dist/**/*.js.map'],
},
})
)
}
return plugins
}

8
build/plugin/unplugin.js
View File

@@ -5,7 +5,6 @@ import { NaiveUiResolver } from 'unplugin-vue-components/resolvers'
import { FileSystemIconLoader } from 'unplugin-icons/loaders'
import IconsResolver from 'unplugin-icons/resolver'
import mkcert from 'vite-plugin-mkcert'
import { sentryVitePlugin } from '@sentry/vite-plugin'
/**
* * unplugin-icons插件，自动引入iconify图标
@@ -46,11 +45,4 @@ export default [
customDomId: '__CUSTOM_SVG_ICON__',
}),
mkcert(),
sentryVitePlugin({
authToken:
'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',
org: 'sentry',
project: 'jdt-mer',
url: 'https://w.huakk.top',
}),
]

6
package.json
View File

@@ -2,7 +2,7 @@
"name": "vue-naive-admin",
"version": "1.0.0",
"scripts": {
"build": "vite build",
"build:prod": "vite build",
"build:test": "vite build --mode test",
"cz": "cz",
"dev": "vite",
@@ -32,20 +32,20 @@
]
},
"dependencies": {
"@sentry/vite-plugin": "^2.10.2",
"@sentry/vue": "^7.84.0",
"@unocss/eslint-config": "^0.55.7",
"@vueuse/core": "^10.6.1",
"@wangeditor/editor": "^5.1.23",
"@wangeditor/editor-for-vue": "5.1.12",
"axios": "^1.6.2",
"dayjs": "^1.11.10",
"echarts": "^5.5.0",
"lodash-es": "^4.17.21",
"md-editor-v3": "^4.9.0",
"mockjs": "^1.1.0",
"pinia": "^2.1.7",
"vite": "^4.5.0",
"vue": "3.3.4",
"vue-echarts": "^6.6.9",
"vue-router": "^4.2.5",
"xlsx": "^0.18.5"
},

371
pnpm-lock.yaml generated
View File

@@ -5,12 +5,6 @@ settings:
excludeLinksFromLockfile: false
dependencies:
'@sentry/vite-plugin':
specifier: ^2.10.2
version: 2.10.2
'@sentry/vue':
specifier: ^7.84.0
version: 7.84.0(vue@3.3.4)
'@unocss/eslint-config':
specifier: ^0.55.7
version: 0.55.7(eslint@8.54.0)(typescript@5.3.2)
@@ -29,6 +23,9 @@ dependencies:
dayjs:
specifier: ^1.11.10
version: 1.11.10
echarts:
specifier: ^5.5.0
version: 5.5.0
lodash-es:
specifier: ^4.17.21
version: 4.17.21
@@ -47,6 +44,9 @@ dependencies:
vue:
specifier: 3.3.4
version: 3.3.4
vue-echarts:
specifier: ^6.6.9
version: 6.6.9(echarts@5.5.0)(vue@3.3.4)
vue-router:
specifier: ^4.2.5
version: 4.2.5(vue@3.3.4)
@@ -1338,195 +1338,6 @@ packages:
rollup: 2.79.1
dev: true
/@sentry-internal/tracing@7.84.0:
resolution: {integrity: sha512-y9bGYA0OM6PEREfd+nk4UURZy29tpIw+7vQwpxWfEVs2fqq0/5TBFX/tKFb8AKUI9lVM8v0bcF0bNSCnuPQZHQ==}
engines: {node: '>=8'}
dependencies:
'@sentry/core': 7.84.0
'@sentry/types': 7.84.0
'@sentry/utils': 7.84.0
dev: false
/@sentry/browser@7.84.0:
resolution: {integrity: sha512-X50TlTKY9WzAnHsYc4FYrCWgm+CdVo0h02ggmodVBUpRLUBjj+cs5Q1plov/v/XeorSwmorNEMUu/n+XZNSsrA==}
engines: {node: '>=8'}
dependencies:
'@sentry-internal/tracing': 7.84.0
'@sentry/core': 7.84.0
'@sentry/replay': 7.84.0
'@sentry/types': 7.84.0
'@sentry/utils': 7.84.0
dev: false
/@sentry/bundler-plugin-core@2.10.2:
resolution: {integrity: sha512-7IoekLtROlJZqTxtHQ3IhocBuf9dsEq+JjqlHMyZXoq+QKuvJFvMd/4T+r6KjZ15kMZOIkR+spK3V7duH201hw==}
engines: {node: '>= 14'}
dependencies:
'@sentry/cli': 2.22.3
'@sentry/node': 7.84.0
'@sentry/utils': 7.84.0
dotenv: 16.3.1
find-up: 5.0.0
glob: 9.3.2
magic-string: 0.27.0
unplugin: 1.0.1
transitivePeerDependencies:
- encoding
- supports-color
dev: false
/@sentry/cli-darwin@2.22.3:
resolution: {integrity: sha512-A1DwFTffg3+fF68qujaJI07dk/1H1pRuihlvS5WQ9sD7nQLnXZGoLUht4eULixhDzZYinWHKkcWzQ6k40UTvNA==}
engines: {node: '>=10'}
os: [darwin]
requiresBuild: true
dev: false
optional: true
/@sentry/cli-linux-arm64@2.22.3:
resolution: {integrity: sha512-PnBPb4LJ+A2LlqLjtVFn4mEizcVdxBSLZvB85pEGzq9DRXjZ6ZEuGWFHTVnWvjd79TB/s0me29QnLc3n4B6lgA==}
engines: {node: '>=10'}
cpu: [arm64]
os: [linux, freebsd]
requiresBuild: true
dev: false
optional: true
/@sentry/cli-linux-arm@2.22.3:
resolution: {integrity: sha512-mDtLVbqbCu/5b/v2quTAMzY/atGlJVvrqO2Wvpro0Jb/LYhn7Y1pVBdoXEDcnOX82/pseFkLT8PFfq/OcezPhA==}
engines: {node: '>=10'}
cpu: [arm]
os: [linux, freebsd]
requiresBuild: true
dev: false
optional: true
/@sentry/cli-linux-i686@2.22.3:
resolution: {integrity: sha512-wxvbpQ2hiw4hwJWfJMp7K45BV40nXL62f91jLuftFXIbieKX1Li57NNKNu2JUVn7W1bJxkwz/PKGGTXSgeJlRw==}
engines: {node: '>=10'}
cpu: [x86, ia32]
os: [linux, freebsd]
requiresBuild: true
dev: false
optional: true
/@sentry/cli-linux-x64@2.22.3:
resolution: {integrity: sha512-0GxsYNO5GyRWifeOpng+MmdUFZRA64bgA1n1prsEsXnoeLcm3Zj4Q63hBZmiwz9Qbhf5ibohkpf94a7dI7pv3A==}
engines: {node: '>=10'}
cpu: [x64]
os: [linux, freebsd]
requiresBuild: true
dev: false
optional: true
/@sentry/cli-win32-i686@2.22.3:
resolution: {integrity: sha512-YERPsd7ClBrxKcmCUw+ZrAvQfbyIZFrqh269hgDuXFodpsB7LPGnI33ilo0uzmKdq2vGppTb6Z3gf1Rbq0Hadg==}
engines: {node: '>=10'}
cpu: [x86, ia32]
os: [win32]
requiresBuild: true
dev: false
optional: true
/@sentry/cli-win32-x64@2.22.3:
resolution: {integrity: sha512-NUh56xWvgJo2KuC9lI6o6nTPXdzbpQUB4qGwJ73L9NP3HT2P1I27jtHyrC2zlXTVlYE23gQZGrL3wgW4Jy80QA==}
engines: {node: '>=10'}
cpu: [x64]
os: [win32]
requiresBuild: true
dev: false
optional: true
/@sentry/cli@2.22.3:
resolution: {integrity: sha512-VFHdtrHsMyTRSZhDLeMyXvit7xB4e81KugIEwMve95c7h5HO672bfmCcM/403CAugj4NzvQ+IR2NKF/2SsEPlg==}
engines: {node: '>= 10'}
hasBin: true
dependencies:
https-proxy-agent: 5.0.1
node-fetch: 2.7.0
progress: 2.0.3
proxy-from-env: 1.1.0
which: 2.0.2
optionalDependencies:
'@sentry/cli-darwin': 2.22.3
'@sentry/cli-linux-arm': 2.22.3
'@sentry/cli-linux-arm64': 2.22.3
'@sentry/cli-linux-i686': 2.22.3
'@sentry/cli-linux-x64': 2.22.3
'@sentry/cli-win32-i686': 2.22.3
'@sentry/cli-win32-x64': 2.22.3
transitivePeerDependencies:
- encoding
- supports-color
dev: false
/@sentry/core@7.84.0:
resolution: {integrity: sha512-tbuwunbBx2kSex15IHCqHDnrMfIlqPc6w/76fwkGqokz3oh9GSEGlLICwmBWL8AypWimUg13IDtFpD0TJTriWA==}
engines: {node: '>=8'}
dependencies:
'@sentry/types': 7.84.0
'@sentry/utils': 7.84.0
dev: false
/@sentry/node@7.84.0:
resolution: {integrity: sha512-Xm3fIXT3TZOQi+6uQBavI8iOehD3PkY7v0y3hog0d4lQTH88vQK9BBsI+jZEq81Em+RG/u7vZNiFo6YMTnWF7Q==}
engines: {node: '>=8'}
dependencies:
'@sentry-internal/tracing': 7.84.0
'@sentry/core': 7.84.0
'@sentry/types': 7.84.0
'@sentry/utils': 7.84.0
https-proxy-agent: 5.0.1
transitivePeerDependencies:
- supports-color
dev: false
/@sentry/replay@7.84.0:
resolution: {integrity: sha512-c4PxT0ZpvkR9zXNfmAk3ojkm6eZ9+NlDze09RFBOCNo69QwIN90hnvbjXFC1+vRIJsfgo78Zr0ya/Wzb3Rog7Q==}
engines: {node: '>=12'}
dependencies:
'@sentry-internal/tracing': 7.84.0
'@sentry/core': 7.84.0
'@sentry/types': 7.84.0
'@sentry/utils': 7.84.0
dev: false
/@sentry/types@7.84.0:
resolution: {integrity: sha512-VqGLIF3JOUrk7yIXjLXJvAORkZL1e3dDX0Q1okRehwyt/5CRE+mdUTeJZkBo9P9mBwgMyvtwklzOGGrzjb4eMA==}
engines: {node: '>=8'}
dev: false
/@sentry/utils@7.84.0:
resolution: {integrity: sha512-qdUVuxnRBvaf05AU+28R+xYtZmi/Ymf8os3Njq9g4XuA+QEkZLbzmIpRK5W9Ja7vUtjOeg29Xgg43A8znde9LQ==}
engines: {node: '>=8'}
dependencies:
'@sentry/types': 7.84.0
dev: false
/@sentry/vite-plugin@2.10.2:
resolution: {integrity: sha512-30uu0L8ZCpAKOxAXmtyqwL06sG8UEBXGY5mxUDITyQYDf8pKuiOEf5018KlEDjhYVypfMQH3jq5xXUUka+/ipg==}
engines: {node: '>= 14'}
dependencies:
'@sentry/bundler-plugin-core': 2.10.2
unplugin: 1.0.1
transitivePeerDependencies:
- encoding
- supports-color
dev: false
/@sentry/vue@7.84.0(vue@3.3.4):
resolution: {integrity: sha512-Tbw3ahuChdGIHdE4SvVXj9wUrlR/Z1vKWUebd/8IXEyASJvCRlMJmFCE4R4CPvEQkzFkYN2DHixwZyicxpaFVw==}
engines: {node: '>=8'}
peerDependencies:
vue: 2.x || 3.x
dependencies:
'@sentry/browser': 7.84.0
'@sentry/core': 7.84.0
'@sentry/types': 7.84.0
'@sentry/utils': 7.84.0
vue: 3.3.4
dev: false
/@transloadit/prettier-bytes@0.0.7:
resolution: {integrity: sha512-VeJbUb0wEKbcwaSlj5n+LscBl9IPgLPkHVGBkh00cztv6X4L/TJXK58LzFuBKX7/GAfiGhIwH67YTLTlzvIzBA==}
dev: false
@@ -2380,15 +2191,6 @@ packages:
engines: {node: '>=0.8'}
dev: false
/agent-base@6.0.2:
resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
engines: {node: '>= 6.0.0'}
dependencies:
debug: 4.3.4
transitivePeerDependencies:
- supports-color
dev: false
/ajv@6.12.6:
resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
dependencies:
@@ -2626,6 +2428,7 @@ packages:
resolution: {integrity: sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==}
dependencies:
balanced-match: 1.0.2
dev: true
/braces@2.3.2:
resolution: {integrity: sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==}
@@ -3471,6 +3274,7 @@ packages:
/dotenv@16.3.1:
resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
engines: {node: '>=12'}
dev: true
/duplexer@0.1.2:
resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==}
@@ -3480,6 +3284,13 @@ packages:
resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
dev: true
/echarts@5.5.0:
resolution: {integrity: sha512-rNYnNCzqDAPCr4m/fqyUFv7fD9qIsd50S6GDFgO1DxZhncCsNsG7IfUlAlvZe5oSEQxtsjnHiUuppzccry93Xw==}
dependencies:
tslib: 2.3.0
zrender: 5.5.0
dev: false
/editor@1.0.0:
resolution: {integrity: sha512-SoRmbGStwNYHgKfjOrX2L0mUvp9bUVv0uPppZSOMAntEbcFtoC3MKF5b3T6HQPXKIV+QGY3xPO3JK5it5lVkuw==}
dev: true
@@ -4146,16 +3957,6 @@ packages:
once: 1.4.0
path-is-absolute: 1.0.1
/glob@9.3.2:
resolution: {integrity: sha512-BTv/JhKXFEHsErMte/AnfiSv8yYOLLiyH2lTg8vn02O21zWFgHPTfxtgn1QRe7NRgggUhC8hacR2Re94svHqeA==}
engines: {node: '>=16 || 14 >=14.17'}
dependencies:
fs.realpath: 1.0.0
minimatch: 7.4.6
minipass: 4.2.8
path-scurry: 1.10.1
dev: false
/global-dirs@0.1.1:
resolution: {integrity: sha512-NknMLn7F2J7aflwFOlGdNIuCDpN3VGoSoB+aap3KABFWbHVn1TCgFC+np23J8W2BiZbjfEw3BFBycSMv1AFblg==}
engines: {node: '>=4'}
@@ -4336,16 +4137,6 @@ packages:
readable-stream: 3.6.2
dev: true
/https-proxy-agent@5.0.1:
resolution: {integrity: sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==}
engines: {node: '>= 6'}
dependencies:
agent-base: 6.0.2
debug: 4.3.4
transitivePeerDependencies:
- supports-color
dev: false
/human-signals@2.1.0:
resolution: {integrity: sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==}
engines: {node: '>=10.17.0'}
@@ -4983,11 +4774,6 @@ packages:
tslib: 2.6.2
dev: true
/lru-cache@10.1.0:
resolution: {integrity: sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag==}
engines: {node: 14 || >=16.14}
dev: false
/lru-cache@6.0.0:
resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==}
engines: {node: '>=10'}
@@ -4999,13 +4785,6 @@ packages:
engines: {node: '>=16.14'}
dev: false
/magic-string@0.27.0:
resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==}
engines: {node: '>=12'}
dependencies:
'@jridgewell/sourcemap-codec': 1.4.15
dev: false
/magic-string@0.30.5:
resolution: {integrity: sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==}
engines: {node: '>=12'}
@@ -5211,13 +4990,6 @@ packages:
brace-expansion: 2.0.1
dev: true
/minimatch@7.4.6:
resolution: {integrity: sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==}
engines: {node: '>=10'}
dependencies:
brace-expansion: 2.0.1
dev: false
/minimatch@9.0.3:
resolution: {integrity: sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==}
engines: {node: '>=16 || 14 >=14.17'}
@@ -5242,16 +5014,6 @@ packages:
resolution: {integrity: sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==}
dev: true
/minipass@4.2.8:
resolution: {integrity: sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==}
engines: {node: '>=8'}
dev: false
/minipass@7.0.4:
resolution: {integrity: sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==}
engines: {node: '>=16 || 14 >=14.17'}
dev: false
/mixin-deep@1.3.2:
resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
engines: {node: '>=0.10.0'}
@@ -5373,18 +5135,6 @@ packages:
resolution: {integrity: sha512-NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==}
dev: true
/node-fetch@2.7.0:
resolution: {integrity: sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==}
engines: {node: 4.x || >=6.0.0}
peerDependencies:
encoding: ^0.1.0
peerDependenciesMeta:
encoding:
optional: true
dependencies:
whatwg-url: 5.0.0
dev: false
/node-html-parser@5.4.2:
resolution: {integrity: sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==}
dependencies:
@@ -5651,14 +5401,6 @@ packages:
resolution: {integrity: sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==}
dev: true
/path-scurry@1.10.1:
resolution: {integrity: sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==}
engines: {node: '>=16 || 14 >=14.17'}
dependencies:
lru-cache: 10.1.0
minipass: 7.0.4
dev: false
/path-to-regexp@6.2.1:
resolution: {integrity: sha512-JLyh7xT1kizaEvcaXOQwOc2/Yhw6KZOvPf1S8401UyLk86CU79LN3vl7ztXGm/pZ+YjoyAJ4rxmHwbkBXJX+yw==}
dev: true
@@ -5816,11 +5558,6 @@ packages:
engines: {node: '>=6'}
dev: false
/progress@2.0.3:
resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
engines: {node: '>=0.4.0'}
dev: false
/proxy-from-env@1.1.0:
resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
@@ -5922,6 +5659,10 @@ packages:
engines: {node: '>=0.10.0'}
dev: true
/resize-detector@0.3.0:
resolution: {integrity: sha512-R/tCuvuOHQ8o2boRP6vgx8hXCCy87H1eY9V5imBYeVNyNVpuL9ciReSccLj2gDcax9+2weXy3bc8Vv+NRXeEvQ==}
dev: false
/resolve-dir@1.0.1:
resolution: {integrity: sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==}
engines: {node: '>=0.10.0'}
@@ -6609,10 +6350,6 @@ packages:
engines: {node: '>=6'}
dev: true
/tr46@0.0.3:
resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
dev: false
/traverse@0.6.7:
resolution: {integrity: sha512-/y956gpUo9ZNCb99YjxG7OaslxZWHfCHAUUfshwqOXmxUIvqLjVO581BT+gM59+QV9tFe6/CGG53tsA1Y7RSdg==}
dev: true
@@ -6670,6 +6407,10 @@ packages:
resolution: {integrity: sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==}
dev: true
/tslib@2.3.0:
resolution: {integrity: sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==}
dev: false
/tslib@2.6.2:
resolution: {integrity: sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==}
@@ -6917,15 +6658,6 @@ packages:
- supports-color
dev: true
/unplugin@1.0.1:
resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==}
dependencies:
acorn: 8.11.2
chokidar: 3.5.3
webpack-sources: 3.2.3
webpack-virtual-modules: 0.5.0
dev: false
/unplugin@1.5.1:
resolution: {integrity: sha512-0QkvG13z6RD+1L1FoibQqnvTwVBXvS4XSPwAyinVgoOCl2jAgwzdUKmEj05o4Lt8xwQI85Hb6mSyYkcAGwZPew==}
dependencies:
@@ -7138,6 +6870,21 @@ packages:
vue: 3.3.4
dev: true
/vue-demi@0.13.11(vue@3.3.4):
resolution: {integrity: sha512-IR8HoEEGM65YY3ZJYAjMlKygDQn25D5ajNFNoKh9RSDMQtlzCxtfQjdQgv9jjK+m3377SsJXY8ysq8kLCZL25A==}
engines: {node: '>=12'}
hasBin: true
requiresBuild: true
peerDependencies:
'@vue/composition-api': ^1.0.0-rc.1
vue: ^3.0.0-0 || ^2.6.0
peerDependenciesMeta:
'@vue/composition-api':
optional: true
dependencies:
vue: 3.3.4
dev: false
/vue-demi@0.14.6(vue@3.3.4):
resolution: {integrity: sha512-8QA7wrYSHKaYgUxDA5ZC24w+eHm3sYCbp0EzcDwKqN3p6HqtTCGR/GVsPyZW92unff4UlcSh++lmqDWN3ZIq4w==}
engines: {node: '>=12'}
@@ -7152,6 +6899,26 @@ packages:
dependencies:
vue: 3.3.4
/vue-echarts@6.6.9(echarts@5.5.0)(vue@3.3.4):
resolution: {integrity: sha512-mojIq3ZvsjabeVmDthhAUDV8Kgf2Rr/X4lV4da7gEFd1fP05gcSJ0j7wa7HQkW5LlFmF2gdCJ8p4Chas6NNIQQ==}
requiresBuild: true
peerDependencies:
'@vue/composition-api': ^1.0.5
'@vue/runtime-core': ^3.0.0
echarts: ^5.4.1
vue: ^2.6.12 || ^3.1.1
peerDependenciesMeta:
'@vue/composition-api':
optional: true
'@vue/runtime-core':
optional: true
dependencies:
echarts: 5.5.0
resize-detector: 0.3.0
vue: 3.3.4
vue-demi: 0.13.11(vue@3.3.4)
dev: false
/vue-eslint-parser@9.3.2(eslint@8.54.0):
resolution: {integrity: sha512-q7tWyCVaV9f8iQyIA5Mkj/S6AoJ9KBN8IeUSf3XEmBrOtxOZnfTg5s4KClbZBCK3GtnT/+RyCLZyDHuZwTuBjg==}
engines: {node: ^14.17.0 || >=16.0.0}
@@ -7213,29 +6980,15 @@ packages:
defaults: 1.0.4
dev: true
/webidl-conversions@3.0.1:
resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
dev: false
/webpack-sources@3.2.3:
resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
engines: {node: '>=10.13.0'}
/webpack-virtual-modules@0.5.0:
resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==}
dev: false
dev: true
/webpack-virtual-modules@0.6.1:
resolution: {integrity: sha512-poXpCylU7ExuvZK8z+On3kX+S8o/2dQ/SVYueKA0D4WEMXROXgY8Ez50/bQEUmvoSMMrWcrJqCHuhAbsiwg7Dg==}
dev: true
/whatwg-url@5.0.0:
resolution: {integrity: sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==}
dependencies:
tr46: 0.0.3
webidl-conversions: 3.0.1
dev: false
/which@1.3.1:
resolution: {integrity: sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==}
hasBin: true
@@ -7353,3 +7106,9 @@ packages:
/yocto-queue@0.1.0:
resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
engines: {node: '>=10'}
/zrender@5.5.0:
resolution: {integrity: sha512-O3MilSi/9mwoovx77m6ROZM7sXShR/O/JIanvzTwjN3FORfLSr81PsUGd7jlaYOeds9d8tw82oP44+3YucVo+w==}
dependencies:
tslib: 2.3.0
dev: false

51
src/components/Echarts.vue Normal file
View File

@@ -0,0 +1,51 @@
<template>
<v-chart :loading="loading" class="chart" :option="option" />
</template>
<script setup>
import { use } from 'echarts/core'
import { BarChart, PieChart } from 'echarts/charts'
import {
TitleComponent,
TooltipComponent,
LegendComponent,
GridComponent,
DataZoomComponent,
} from 'echarts/components'
import { CanvasRenderer } from 'echarts/renderers'
use([
TitleComponent,
TooltipComponent,
LegendComponent,
GridComponent,
BarChart,
CanvasRenderer,
PieChart,
DataZoomComponent,
])
import VChart, { THEME_KEY } from 'vue-echarts'
import { provide } from 'vue'
provide(THEME_KEY, 'white')
defineProps({
option: {
type: Object,
required: true,
},
loading: {
type: Boolean,
default: true,
},
})
</script>
<style lang="scss" scoped>
.chart {
width: 100%;
height: 100%;
}
</style>

17
src/router/index.js
View File

@@ -3,7 +3,6 @@ import { setupRouterGuard } from './guard'
import { basicRoutes, EMPTY_ROUTE, NOT_FOUND_ROUTE } from './routes'
import { getToken, isNullOrWhitespace } from '@/utils'
import { useUserStore, usePermissionStore } from '@/store'
import * as Sentry from '@sentry/vue'
const isHash = false
export const router = createRouter({
@@ -15,22 +14,6 @@ export const router = createRouter({
export async function setupRouter(app) {
await addDynamicRoutes()
setupRouterGuard(router)
if (import.meta.env.VITE_SENTRY === 'true') {
Sentry.init({
app,
dsn: 'https://aa4308fc56a9d107786b8dbcd2ae56e8@w.huakk.top/13',
integrations: [
new Sentry.BrowserTracing({
tracePropagationTargets: ['localhost', /^https:\/\/w\.huakk\.top\/api/],
routingInstrumentation: Sentry.vueRouterInstrumentation(router),
}),
new Sentry.Replay(),
],
tracesSampleRate: 1.0,
replaysSessionSampleRate: 0.1,
replaysOnErrorSampleRate: 1.0,
})
}
app.use(router)
}

2
src/views/order/index/api.js
View File

@@ -1,5 +1,5 @@
import { request } from '@/utils'
export default {
getOrder: (data) => request.post('/order', data),
getOrder: (data) => request.post('/later/order', data),
}

126
src/views/order/index/index.vue
View File

@@ -3,21 +3,31 @@
<n-row gutter="12">
<n-col :span="24">
<div flex>
<n-card w-500>
<n-statistic label="订单流水" tabular-nums>
<n-number-animation :from="0" :to="cardData.total" :precision="2" />
<n-card w-500 rounded-5 style="background-color: #5579e9">
<n-statistic label="交易金额（元）" tabular-nums>
<n-number-animation :from="0" :to="cardData.payments" :precision="2" />
</n-statistic>
</n-card>
<n-card ml-10 w-500>
<n-statistic label="订单佣金" tabular-nums>
<n-number-animation :from="0" :to="cardData.service" />
</n-statistic>
</n-card>
<n-card ml-10 w-500>
<n-statistic label="订单数量" tabular-nums>
<n-card ml-10 w-500 rounded-5 style="background-color: #e74f5b">
<n-statistic label="订单数量（条）" tabular-nums>
<n-number-animation :from="0" :to="cardData.count" />
</n-statistic>
</n-card>
<n-card ml-10 w-500 rounded-5 style="background-color: #00b4c3">
<n-statistic label="赠送豆子（个）" tabular-nums>
<n-number-animation :from="0" :to="cardData.total_pulse" :precision="2" />
</n-statistic>
</n-card>
<n-card ml-10 w-500 rounded-5 style="background-color: #f1b301">
<n-statistic label="挂帐（元）" tabular-nums>
<n-number-animation :from="0" :to="cardData.onAccount" :precision="2" />
</n-statistic>
</n-card>
<n-card ml-10 w-500 rounded-5 style="background-color: #ffa940">
<n-statistic label="抹零（元）" tabular-nums>
<n-number-animation :from="0" :to="cardData.zero" :precision="2" />
</n-statistic>
</n-card>
</div>
</n-col>
<n-col :span="24" mt-10>
@@ -39,7 +49,7 @@
<n-input-group>
<n-select
v-model:value="queryData.selectKey"
:style="{ width: '7%' }"
:style="{ width: '25rem' }"
:options="selectOptions"
placeholder="请选择"
/>
@@ -79,7 +89,6 @@
<script setup>
import api from './api'
import { NEllipsis } from 'naive-ui'
const loading = ref(false)
@@ -91,21 +100,17 @@ const queryData = ref({
})
const songs = ref([
{
value: 0,
label: '未付款',
},
{
value: 1,
label: '待付款',
label: '已付款',
},
{
value: 2,
label: '待核销',
},
{
value: 3,
label: '已核销',
},
{
value: 4,
label: '已过期',
label: '挂帐中',
},
])
@@ -137,7 +142,8 @@ const columns = ref([
{
title: '用户',
align: 'center',
key: 'user_name',
slot: 'nickName',
render: (row) => h('span', {}, { default: () => row.User.nickName }),
},
{
title: '手机号',
@@ -149,15 +155,19 @@ const columns = ref([
align: 'center',
slot: 'goods_name',
render: (row) => {
return h(
NEllipsis,
{
style: 'max-width: 240px',
},
{
default: () => row.goods_name,
}
)
const el = []
row.OrderGoods.forEach((item) => {
el.push(
h(
'div',
{},
{
default: () => `${item.Goods.name}|${item.pay_price}元|X${item.number}`,
}
)
)
})
return el
},
},
{
@@ -168,12 +178,17 @@ const columns = ref([
{
title: '商品总价',
align: 'center',
key: 'number',
key: 'payments',
},
{
title: '订单佣金',
title: '实付金额',
align: 'center',
key: 'commission',
key: 'pay_amount',
},
{
title: '抹零',
align: 'center',
key: 'zero',
},
{
title: '订单状态',
@@ -182,13 +197,11 @@ const columns = ref([
render(row) {
switch (row.status) {
case 0:
return h('span', '待付款')
return h('span', '未付款')
case 1:
return h('span', '待使用')
return h('span', '已付款')
case 2:
return h('span', '已完成')
case 3:
return h('span', '已过期')
return h('span', '挂帐中')
}
},
},
@@ -198,9 +211,14 @@ const columns = ref([
key: 'add_time',
},
{
title: '核销时间',
title: '挂帐时间',
align: 'center',
key: 'cancel_time',
key: 'on_account_time',
},
{
title: '付款时间',
align: 'center',
key: 'payment_time',
},
// {
// title: '操作',
@@ -243,13 +261,13 @@ const getList = async () => {
loading.value = true
try {
const query_data = {
Status: queryData.value.status || '',
Status: queryData.value.status,
StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
}
switch (queryData.value.selectKey) {
case 0:
query_data['GoodsName'] = queryData.value.word
query_data['GoodName'] = queryData.value.word
break
case 1:
query_data['UserName'] = queryData.value.word
@@ -262,14 +280,15 @@ const getList = async () => {
break
}
const res = await api.getOrder({
pageNum: pagination.value.page,
pageSize: pagination.value.pageSize,
PageNum: pagination.value.page,
PageSize: pagination.value.pageSize,
...query_data,
})
data.value = res.data.data || []
pagination.value.itemCount = res.data.total
cardData.value.total = res.data.number
cardData.value.service = res.data.commission
cardData.value.payments = res.data.payments
cardData.value.onAccount = res.data.onAccount
cardData.value.total_pulse = res.data.total_pulse
cardData.value.count = res.data.total
} catch (error) {
$message.error(error.msg)
@@ -289,4 +308,13 @@ const clear = () => {
}
</script>
<style lang="scss" scoped></style>
<style lang="scss" scoped>
:deep(.n-statistic__label) {
color: #fff !important;
font-size: 16px;
}
:deep(.n-statistic-value__content) {
color: #fff !important;
font-size: 16px;
}
</style>

2
src/views/order/index1/index.vue
View File

@@ -66,7 +66,7 @@
<n-input-group>
<n-select
v-model:value="queryData.selectKey"
:style="{ width: '10%' }"
:style="{ width: '25rem' }"
:options="selectOptions"
placeholder="请选择"
/>

5
src/views/order/pengding_order_data/api.js Normal file
View File

@@ -0,0 +1,5 @@
import { request } from '@/utils'
export default {
getData: (data) => request.post('/later/order/count', data),
}

181
src/views/order/pengding_order_data/index.vue Normal file
View File

@@ -0,0 +1,181 @@
<template>
<CommonPage show-footer :title="$route.title">
<n-grid mb-10 flex items-center x-gap="10" :y-gap="8" :cols="3">
<n-gi>
<!-- {{ queryData }} -->
<div flex items-center>
<span w-120>时间筛选：</span>
<n-date-picker
v-model:formatted-value="queryData.time"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
clearable
/>
</div>
</n-gi>
<n-gi>
<div>
<n-button type="primary" @click="get_data">搜索</n-button>
<n-button ml-10 @click="clear">重置</n-button>
</div>
</n-gi>
</n-grid>
<n-card mb-5 rounded-5 title="营业额汇总">
<n-grid x-gap="10" :y-gap="8" :cols="4">
<n-gi>
<n-card rounded-5 style="background-color: #5579e9">
<n-statistic label="应收金额（元）" tabular-nums>
<n-number-animation :from="0" :to="cardData.payments" :precision="2" />
</n-statistic>
</n-card>
</n-gi>
<n-gi>
<n-card rounded-5 style="background-color: #e74f5b">
<n-statistic label="实收金额（条）" tabular-nums>
<n-number-animation :from="0" :to="cardData.payAmount" :precision="2" />
</n-statistic>
</n-card>
</n-gi>
<n-gi>
<n-card rounded-5 style="background-color: #00b4c3">
<n-statistic label="促销积分" tabular-nums>
<n-number-animation :from="0" :to="cardData.integral" :precision="2" />
</n-statistic>
</n-card>
</n-gi>
<n-gi>
<n-card rounded-5 style="background-color: #e74f5b">
<n-statistic label="订单数量（条）" tabular-nums>
<n-number-animation :from="0" :to="cardData.total" />
</n-statistic>
</n-card>
</n-gi>
<n-gi>
<n-card rounded-5 style="background-color: #2c5ba9">
<n-statistic label="挂帐（元）" tabular-nums>
<n-number-animation :from="0" :to="cardData.onAccount" :precision="2" />
</n-statistic>
</n-card>
</n-gi>
<n-gi>
<n-card rounded-5 style="background-color: #f0727d">
<n-statistic label="赠送豆子（个）" tabular-nums>
<n-number-animation :from="0" :to="cardData.total_pulse" />
</n-statistic>
</n-card>
</n-gi>
<n-gi>
<n-card rounded-5 style="background-color: #797979">
<n-statistic label="抹零（元）" tabular-nums>
<n-number-animation :from="0" :to="cardData.zero" :precision="2" />
</n-statistic>
</n-card>
</n-gi>
</n-grid>
</n-card>
<n-card rounded-5 title="商品类别汇总（元）">
<Echarts :loading="loading" :option="option" />
</n-card>
</CommonPage>
</template>
<script setup>
import api from './api'
import Echarts from '@/components/Echarts.vue'
const cardData = ref({})
const loading = ref(false)
const queryData = ref({
time: null,
})
const option = ref({
tooltip: {
trigger: 'axis',
axisPointer: {
type: 'shadow',
},
},
grid: {
left: '3%',
right: '4%',
bottom: '3%',
containLabel: true,
},
xAxis: {
type: 'category',
data: [],
},
yAxis: {
type: 'value',
},
series: [
{
data: [],
type: 'bar',
barWidth: '10%',
name: '金额（元）',
label: {
show: true,
position: 'top',
formatter: function (value) {
return `¥${value.data}元`
},
},
},
],
dataZoom: [
{
type: 'inside',
},
{
type: 'slider',
},
],
})
onMounted(() => {
get_data()
})
const get_data = async () => {
loading.value = true
option.value.xAxis.data = []
option.value.series[0].data = []
const query_data = {
StartTime: queryData.value.time === null ? '' : queryData.value.time[0] || '',
EndTime: queryData.value.time === null ? '' : queryData.value.time[1] || '',
}
const res = await api.getData(query_data)
cardData.value = res.data
for (let i = 0; i < res.data.data.length; i++) {
option.value.xAxis.data.push(res.data.data[i].Name)
option.value.series[0].data.push(res.data.data[i].Price)
}
console.log(cardData.value)
loading.value = false
}
const clear = async () => {
queryData.value.time = null
get_data()
}
</script>
<style lang="scss" scoped>
:deep(.n-statistic__label) {
color: #fff !important;
font-size: 16px;
}
:deep(.n-statistic-value__content) {
color: #fff !important;
font-size: 16px;
}
.chart {
width: 100%;
height: 150rem;
}
</style>

33
src/views/order/route.js
View File

@@ -22,16 +22,27 @@ export default {
icon: 'material-symbols:auto-awesome-outline-rounded',
},
},
// {
// name: 'dhList',
// path: 'dh_list',
// component: () => import('./index/index.vue'),
// meta: {
// requireAuth: true,
// title: '订单列表',
// role: ['2'],
// icon: 'material-symbols:auto-awesome-outline-rounded',
// },
// },
{
name: 'pendingList',
path: 'pending_list',
component: () => import('./index/index.vue'),
meta: {
// requireAuth: true,
title: '后结订单',
// role: ['2'],
icon: 'material-symbols:auto-awesome-outline-rounded',
},
},
{
name: 'pendingData',
path: 'pending_data',
component: () => import('./pengding_order_data/index.vue'),
meta: {
// requireAuth: true,
title: '后结统计',
// role: ['2'],
icon: 'material-symbols:auto-awesome-outline-rounded',
},
},
],
}

34
src/views/sys/verify/index.vue
View File

@@ -28,7 +28,6 @@ const columns = ref([
slot: 'action',
align: 'center',
render: (row) => {
console.log(row)
return [
h(
NButton,
@@ -112,6 +111,7 @@ const addUser = (type, row = {}) => {
id: row.uid,
url: row.avatarUrl,
name: row.nickName,
pres: JSON.parse(row.permission),
}
}
showModal.value = true
@@ -124,6 +124,12 @@ const model = ref({
url: '',
id: null,
name: '',
pres: {
dd: false,
tj: false,
hx: false,
tx: false,
},
})
const search = async () => {
@@ -135,6 +141,12 @@ const search = async () => {
id: res.data.data.uid,
url: res.data.data.avatarUrl,
name: res.data.data.nickName,
pres: {
dd: false,
tj: false,
hx: false,
tx: false,
},
}
}
@@ -142,6 +154,7 @@ const submit = async () => {
if (!model.value.id) return $message.error('请绑定核销人员')
const res = await api.bindUser({
uid: model.value.id,
permission: JSON.stringify(model.value.pres),
})
$message.success(res.msg)
clear()
@@ -153,6 +166,12 @@ const clear = () => {
url: '',
id: null,
name: '',
pres: {
dd: false,
tj: false,
hx: false,
tx: false,
},
}
showModal.value = false
get_list()
@@ -206,9 +225,20 @@ const delVerifyUser = async (row) => {
<img class="h-100 w-100 border rounded-5" :src="model.url || ''" />
<div>{{ model.name }}</div>
</div>
<div v-else class="checkBox">+</div>
</n-form-item-gi>
<n-form-item-gi label="开启点单" :span="12">
<n-switch v-model:value="model.pres.dd" />
</n-form-item-gi>
<n-form-item-gi label="开启核销" :span="12">
<n-switch v-model:value="model.pres.hx" />
</n-form-item-gi>
<n-form-item-gi label="开启统计" :span="12">
<n-switch v-model:value="model.pres.tj" />
</n-form-item-gi>
<n-form-item-gi label="开启提现" :span="12">
<n-switch v-model:value="model.pres.tx" />
</n-form-item-gi>
<n-form-item-gi>
<div m-auto>
<n-button type="primary" @click="submit">提交</n-button>