Merge branch 'master' of gitee.com:yudaocode/yudao-ui-admin-vue3 into master
Signed-off-by: whycode <sun_zhl7981@163.com>pull/276/head
whycode
Gitee
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 142 KiB |
|
After Width: | Height: | Size: 152 KiB |
|
After Width: | Height: | Size: 68 KiB |
|
After Width: | Height: | Size: 65 KiB |
|
After Width: | Height: | Size: 95 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 15 KiB |
|
After Width: | Height: | Size: 9.7 KiB |
|
After Width: | Height: | Size: 56 KiB |
|
After Width: | Height: | Size: 8.6 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 26 KiB |
|
After Width: | Height: | Size: 7.0 KiB |
|
After Width: | Height: | Size: 27 KiB |
|
After Width: | Height: | Size: 238 KiB |
|
After Width: | Height: | Size: 139 KiB |
|
After Width: | Height: | Size: 69 KiB |
|
After Width: | Height: | Size: 32 KiB |
|
After Width: | Height: | Size: 201 KiB |
|
After Width: | Height: | Size: 60 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 130 KiB |
|
After Width: | Height: | Size: 89 KiB |
|
After Width: | Height: | Size: 89 KiB |
|
After Width: | Height: | Size: 160 KiB |
|
After Width: | Height: | Size: 150 KiB |
|
After Width: | Height: | Size: 124 KiB |
|
After Width: | Height: | Size: 83 KiB |
|
After Width: | Height: | Size: 73 KiB |
|
After Width: | Height: | Size: 53 KiB |
|
After Width: | Height: | Size: 109 KiB |
|
After Width: | Height: | Size: 69 KiB |
|
After Width: | Height: | Size: 78 KiB |
|
After Width: | Height: | Size: 126 KiB |
|
After Width: | Height: | Size: 74 KiB |
|
After Width: | Height: | Size: 80 KiB |
|
After Width: | Height: | Size: 93 KiB |
|
After Width: | Height: | Size: 93 KiB |
|
After Width: | Height: | Size: 55 KiB |
|
After Width: | Height: | Size: 176 KiB |
|
After Width: | Height: | Size: 91 KiB |
|
After Width: | Height: | Size: 87 KiB |
|
After Width: | Height: | Size: 33 KiB |
|
After Width: | Height: | Size: 37 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 98 KiB |
|
After Width: | Height: | Size: 208 KiB |
|
After Width: | Height: | Size: 47 KiB |
|
After Width: | Height: | Size: 97 KiB |
|
After Width: | Height: | Size: 74 KiB |
|
After Width: | Height: | Size: 114 KiB |
|
After Width: | Height: | Size: 116 KiB |
|
After Width: | Height: | Size: 84 KiB |
|
After Width: | Height: | Size: 173 KiB |
|
After Width: | Height: | Size: 125 KiB |
|
After Width: | Height: | Size: 125 KiB |
|
After Width: | Height: | Size: 148 KiB |
|
After Width: | Height: | Size: 128 KiB |
|
After Width: | Height: | Size: 82 KiB |
|
After Width: | Height: | Size: 112 KiB |
|
After Width: | Height: | Size: 93 KiB |
|
After Width: | Height: | Size: 77 KiB |
|
After Width: | Height: | Size: 41 KiB |
|
After Width: | Height: | Size: 248 KiB |
|
After Width: | Height: | Size: 80 KiB |
|
After Width: | Height: | Size: 96 KiB |
|
After Width: | Height: | Size: 115 KiB |
|
After Width: | Height: | Size: 91 KiB |
|
After Width: | Height: | Size: 129 KiB |
|
After Width: | Height: | Size: 102 KiB |
|
After Width: | Height: | Size: 85 KiB |
|
After Width: | Height: | Size: 73 KiB |
|
After Width: | Height: | Size: 92 KiB |
|
After Width: | Height: | Size: 77 KiB |
|
After Width: | Height: | Size: 109 KiB |
|
After Width: | Height: | Size: 89 KiB |
|
After Width: | Height: | Size: 80 KiB |
|
After Width: | Height: | Size: 110 KiB |
|
After Width: | Height: | Size: 131 KiB |
|
After Width: | Height: | Size: 62 KiB |
103
README.md
|
|
@ -39,14 +39,14 @@
|
|||
| 框架 | 说明 | 版本 |
|
||||
|----------------------------------------------------------------------|------------------|--------|
|
||||
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
|
||||
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 |
|
||||
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.14 |
|
||||
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.11 |
|
||||
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.4.0 |
|
||||
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 |
|
||||
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
|
||||
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 |
|
||||
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.4.1 |
|
||||
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.7 |
|
||||
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.5.0 |
|
||||
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.5.0 |
|
||||
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 |
|
||||
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.1 |
|
||||
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.5 |
|
||||
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
|
||||
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
|
||||
|
||||
|
|
@ -66,6 +66,18 @@
|
|||
| ESLint | 脚本代码检查 |
|
||||
| DotENV | env 文件高亮 |
|
||||
|
||||
## 🔥 后端架构
|
||||
|
||||
支持 Spring Boot、Spring Cloud 两种架构：
|
||||
|
||||
① Spring Boot 单体架构：<https://github.com/YunaiV/ruoyi-vue-pro>
|
||||
|
||||
|
||||
|
||||
② Spring Cloud 微服务架构：<https://github.com/YunaiV/yudao-cloud>
|
||||
|
||||
|
||||
|
||||
## 内置功能
|
||||
|
||||
系统内置多种多种业务功能，可以用于快速你的业务系统：
|
||||
|
|
@ -174,62 +186,61 @@ ps：核心功能已经实现，正在对接微信小程序中...
|
|||
|
||||
### 商城系统
|
||||
|
||||
建设中...
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
_前端基于 crmeb uniapp 经过授权重构，优化代码实现，接入芋道快速开发平台_
|
||||
|
||||
|
||||
演示地址：<https://doc.iocoder.cn/mall-preview/>
|
||||
|
||||
## 🐷 演示图
|
||||
|
||||
### 系统功能
|
||||
|
||||
| 模块 | biu | biu | biu |
|
||||
|------------|--------------------------------------------------------------------|------------------------------------------------------------------|------------------------------------------------------------------|
|
||||
| 登录 & 首页 |  |  |  |
|
||||
| 用户 & 应用 |  |  |  |
|
||||
| 租户 & 套餐 |  |  | - |
|
||||
| 部门 & 岗位 |  |  | - |
|
||||
| 菜单 & 角色 |  |  | - |
|
||||
| 审计日志 |  |  | - |
|
||||
| 短信 |  |  |  |
|
||||
| 字典 & 敏感词 |  |  |  |
|
||||
| 错误码 & 通知 |  |  | - |
|
||||
| 模块 | biu | biu | biu |
|
||||
|----------|-----------------------------|---------------------------|--------------------------|
|
||||
| 登录 & 首页 |  |  |  |
|
||||
| 用户 & 应用 |  |  |  |
|
||||
| 租户 & 套餐 |  |  | - |
|
||||
| 部门 & 岗位 |  |  | - |
|
||||
| 菜单 & 角色 |  |  | - |
|
||||
| 审计日志 |  |  | - |
|
||||
| 短信 |  |  |  |
|
||||
| 字典 & 敏感词 |  |  |  |
|
||||
| 错误码 & 通知 |  |  | - |
|
||||
|
||||
### 工作流程
|
||||
|
||||
| 模块 | biu | biu | biu |
|
||||
|---------|------------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
|
||||
| 流程模型 |  |  |  |
|
||||
| 表单 & 分组 |  |  | - |
|
||||
| 我的流程 |  |  |  |
|
||||
| 待办 & 已办 |  |  |  |
|
||||
| OA 请假 |  |  |  |
|
||||
| 模块 | biu | biu | biu |
|
||||
|---------|---------------------------------|---------------------------------|---------------------------------|
|
||||
| 流程模型 |  |  |  |
|
||||
| 表单 & 分组 |  |  | - |
|
||||
| 我的流程 |  |  |  |
|
||||
| 待办 & 已办 |  |  |  |
|
||||
| OA 请假 |  |  |  |
|
||||
|
||||
### 基础设施
|
||||
|
||||
| 模块 | biu | biu | biu |
|
||||
|---------------|----------------------------------------------------------------------|--------------------------------------------------------------------|------------------------------------------------------------------|
|
||||
| 代码生成 |  |  | - |
|
||||
| 文档 |  |  | - |
|
||||
| 文件 & 配置 |  |  |  |
|
||||
| 定时任务 |  |  | - |
|
||||
| API 日志 |  |  | - |
|
||||
| MySQL & Redis |  |  | - |
|
||||
| 监控平台 |  |  |  |
|
||||
| 模块 | biu | biu | biu |
|
||||
|---------------|-------------------------------|-----------------------------|---------------------------|
|
||||
| 代码生成 |  |  | - |
|
||||
| 文档 |  |  | - |
|
||||
| 文件 & 配置 |  |  |  |
|
||||
| 定时任务 |  |  | - |
|
||||
| API 日志 |  |  | - |
|
||||
| MySQL & Redis |  |  | - |
|
||||
| 监控平台 |  |  |  |
|
||||
|
||||
### 支付系统
|
||||
|
||||
| 模块 | biu | biu | biu |
|
||||
|---------|------------------------------------------------------------------|------------------------------------------------------------------------|------------------------------------------------------------------------|
|
||||
| 商家 & 应用 |  |  |  |
|
||||
| 支付 & 退款 |  |  | --- |
|
||||
|
||||
| 模块 | biu | biu | biu |
|
||||
|---------|---------------------------|---------------------------------|---------------------------------|
|
||||
| 商家 & 应用 |  |  |  |
|
||||
| 支付 & 退款 |  |  | --- |
|
||||
### 数据报表
|
||||
|
||||
| 模块 | biu | biu | biu |
|
||||
|-------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------|
|
||||
| 报表设计器 |  |  |  |
|
||||
| 大屏设计器 |  |  |  |
|
||||
| 模块 | biu | biu | biu |
|
||||
|-------|---------------------------------|---------------------------------|---------------------------------------|
|
||||
| 报表设计器 |  |  |  |
|
||||
| 大屏设计器 |  |  |  |
|
||||
|
|
|
|||
70
package.json
|
|
@ -31,31 +31,31 @@
|
|||
"@form-create/element-ui": "^3.1.24",
|
||||
"@iconify/iconify": "^3.1.1",
|
||||
"@videojs-player/vue": "^1.0.0",
|
||||
"@vueuse/core": "^10.4.1",
|
||||
"@vueuse/core": "^10.5.0",
|
||||
"@wangeditor/editor": "^5.1.23",
|
||||
"@wangeditor/editor-for-vue": "^5.1.10",
|
||||
"@zxcvbn-ts/core": "^3.0.4",
|
||||
"animate.css": "^4.1.1",
|
||||
"axios": "^1.5.0",
|
||||
"axios": "^1.5.1",
|
||||
"benz-amr-recorder": "^1.1.5",
|
||||
"bpmn-js-token-simulation": "^0.10.0",
|
||||
"camunda-bpmn-moddle": "^7.0.1",
|
||||
"cropperjs": "^1.6.1",
|
||||
"crypto-js": "^4.1.1",
|
||||
"dayjs": "^1.11.10",
|
||||
"diagram-js": "^12.3.0",
|
||||
"diagram-js": "^12.4.0",
|
||||
"echarts": "^5.4.3",
|
||||
"echarts-wordcloud": "^2.1.0",
|
||||
"element-plus": "2.3.14",
|
||||
"fast-xml-parser": "^4.3.0",
|
||||
"highlight.js": "^11.8.0",
|
||||
"element-plus": "2.4.0",
|
||||
"fast-xml-parser": "^4.3.2",
|
||||
"highlight.js": "^11.9.0",
|
||||
"intro.js": "^7.2.0",
|
||||
"jsencrypt": "^3.3.2",
|
||||
"lodash-es": "^4.17.21",
|
||||
"min-dash": "^4.1.1",
|
||||
"mitt": "^3.0.1",
|
||||
"nprogress": "^0.2.0",
|
||||
"pinia": "^2.1.6",
|
||||
"pinia": "^2.1.7",
|
||||
"qrcode": "^1.5.3",
|
||||
"qs": "^6.11.2",
|
||||
"steady-xml": "^0.1.0",
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
"video.js": "^7.21.5",
|
||||
"vue": "^3.3.4",
|
||||
"vue-dompurify-html": "^4.1.4",
|
||||
"vue-i18n": "^9.4.1",
|
||||
"vue-i18n": "^9.5.0",
|
||||
"vue-router": "^4.2.5",
|
||||
"vue-types": "^5.1.1",
|
||||
"vuedraggable": "^4.1.0",
|
||||
|
|
@ -71,54 +71,54 @@
|
|||
"xml-js": "^1.6.11"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@commitlint/cli": "^17.7.1",
|
||||
"@commitlint/config-conventional": "^17.7.0",
|
||||
"@iconify/json": "^2.2.119",
|
||||
"@intlify/unplugin-vue-i18n": "^1.2.0",
|
||||
"@commitlint/cli": "^17.8.0",
|
||||
"@commitlint/config-conventional": "^17.8.0",
|
||||
"@iconify/json": "^2.2.129",
|
||||
"@intlify/unplugin-vue-i18n": "^1.4.0",
|
||||
"@purge-icons/generated": "^0.9.0",
|
||||
"@types/intro.js": "^5.1.1",
|
||||
"@types/intro.js": "^5.1.2",
|
||||
"@types/lodash-es": "^4.17.9",
|
||||
"@types/node": "^20.6.0",
|
||||
"@types/nprogress": "^0.2.0",
|
||||
"@types/node": "^20.8.6",
|
||||
"@types/nprogress": "^0.2.1",
|
||||
"@types/qrcode": "^1.5.2",
|
||||
"@types/qs": "^6.9.8",
|
||||
"@typescript-eslint/eslint-plugin": "^6.7.2",
|
||||
"@typescript-eslint/parser": "^6.7.2",
|
||||
"@unocss/transformer-variant-group": "^0.56.1",
|
||||
"@unocss/eslint-config": "^0.56.1",
|
||||
"@typescript-eslint/eslint-plugin": "^6.7.5",
|
||||
"@typescript-eslint/parser": "^6.7.5",
|
||||
"@unocss/transformer-variant-group": "^0.56.5",
|
||||
"@unocss/eslint-config": "^0.56.5",
|
||||
"@vitejs/plugin-legacy": "^4.1.1",
|
||||
"@vitejs/plugin-vue": "^4.3.4",
|
||||
"@vitejs/plugin-vue": "^4.4.0",
|
||||
"@vitejs/plugin-vue-jsx": "^3.0.2",
|
||||
"@vue-macros/volar": "^0.14.3",
|
||||
"@vue-macros/volar": "^0.17.0",
|
||||
"autoprefixer": "^10.4.16",
|
||||
"bpmn-js": "8.9.0",
|
||||
"bpmn-js-properties-panel": "0.46.0",
|
||||
"consola": "^3.2.3",
|
||||
"eslint": "^8.49.0",
|
||||
"eslint": "^8.51.0",
|
||||
"eslint-config-prettier": "^9.0.0",
|
||||
"eslint-define-config": "^1.23.0",
|
||||
"eslint-plugin-prettier": "^5.0.0",
|
||||
"eslint-define-config": "^1.24.1",
|
||||
"eslint-plugin-prettier": "^5.0.1",
|
||||
"eslint-plugin-vue": "^9.17.0",
|
||||
"lint-staged": "^14.0.1",
|
||||
"postcss": "^8.4.30",
|
||||
"lint-staged": "^15.0.1",
|
||||
"postcss": "^8.4.31",
|
||||
"postcss-html": "^1.5.0",
|
||||
"postcss-scss": "^4.0.8",
|
||||
"postcss-scss": "^4.0.9",
|
||||
"prettier": "^3.0.3",
|
||||
"rimraf": "^5.0.1",
|
||||
"rollup": "^3.29.2",
|
||||
"sass": "^1.68.0",
|
||||
"rimraf": "^5.0.5",
|
||||
"rollup": "^4.1.4",
|
||||
"sass": "^1.69.3",
|
||||
"stylelint": "^15.10.3",
|
||||
"stylelint-config-html": "^1.1.0",
|
||||
"stylelint-config-recommended": "^13.0.0",
|
||||
"stylelint-config-standard": "^34.0.0",
|
||||
"stylelint-order": "^6.0.3",
|
||||
"terser": "^5.20.0",
|
||||
"terser": "^5.21.0",
|
||||
"typescript": "5.2.2",
|
||||
"unocss": "^0.56.1",
|
||||
"unocss": "^0.56.5",
|
||||
"unplugin-auto-import": "^0.16.6",
|
||||
"unplugin-element-plus": "^0.8.0",
|
||||
"unplugin-vue-components": "^0.25.2",
|
||||
"vite": "4.4.9",
|
||||
"vite": "4.4.11",
|
||||
"vite-plugin-compression": "^0.5.1",
|
||||
"vite-plugin-ejs": "^1.6.4",
|
||||
"vite-plugin-eslint": "^1.8.1",
|
||||
|
|
@ -126,8 +126,8 @@
|
|||
"vite-plugin-purge-icons": "^0.9.2",
|
||||
"vite-plugin-svg-icons": "^2.0.1",
|
||||
"vite-plugin-top-level-await": "^1.3.1",
|
||||
"vue-eslint-parser": "^9.3.1",
|
||||
"vue-tsc": "^1.8.13"
|
||||
"vue-eslint-parser": "^9.3.2",
|
||||
"vue-tsc": "^1.8.19"
|
||||
},
|
||||
"license": "MIT",
|
||||
"repository": {
|
||||
|
|
|
|||
|
|
@ -47,6 +47,18 @@ export const smsLogin = (data: SmsLoginVO) => {
|
|||
return request.post({ url: '/system/auth/sms-login', data })
|
||||
}
|
||||
|
||||
// 社交快捷登录，使用 code 授权码
|
||||
export function socialLogin(type: string, code: string, state: string) {
|
||||
return request.post({
|
||||
url: '/system/auth/social-login',
|
||||
data: {
|
||||
type,
|
||||
code,
|
||||
state
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
// 社交授权的跳转
|
||||
export const socialAuthRedirect = (type: number, redirectUri: string) => {
|
||||
return request.get({
|
||||
|
|
|
|||
|
|
@ -2,6 +2,9 @@ export type UserLoginVO = {
|
|||
username: string
|
||||
password: string
|
||||
captchaVerification: string
|
||||
socialType?: string
|
||||
socialCode?: string
|
||||
socialState?: string
|
||||
}
|
||||
|
||||
export type TokenType = {
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@ export interface Sku {
|
|||
stock?: number // 库存
|
||||
weight?: number // 商品重量，单位：kg 千克
|
||||
volume?: number // 商品体积，单位：m^3 平米
|
||||
firstBrokerageRecord?: number | string // 一级分销的佣金
|
||||
secondBrokerageRecord?: number | string // 二级分销的佣金
|
||||
firstBrokeragePrice?: number | string // 一级分销的佣金
|
||||
secondBrokeragePrice?: number | string // 二级分销的佣金
|
||||
salesCount?: number // 商品销量
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,17 +7,16 @@ export interface BargainActivityVO {
|
|||
startTime?: Date
|
||||
endTime?: Date
|
||||
status?: number
|
||||
userSize?: number // 达到该人数，才能砍到低价
|
||||
helpMaxCount?: number // 达到该人数，才能砍到低价
|
||||
bargainCount?: number // 最大帮砍次数
|
||||
totalLimitCount?: number // 最大购买次数
|
||||
spuId: number
|
||||
skuId: number
|
||||
bargainFirstPrice: number // 砍价起始价格，单位分
|
||||
bargainPrice: number // 砍价底价
|
||||
bargainMinPrice: number // 砍价底价
|
||||
stock: number // 活动库存
|
||||
randomMinPrice?: number // 用户每次砍价的最小金额，单位：分
|
||||
randomMaxPrice?: number // 用户每次砍价的最大金额，单位：分
|
||||
successCount?: number // 砍价成功数量
|
||||
}
|
||||
|
||||
// 砍价活动所需属性。选择的商品和属性的时候使用方便使用活动的通用封装
|
||||
|
|
@ -25,7 +24,7 @@ export interface BargainProductVO {
|
|||
spuId: number
|
||||
skuId: number
|
||||
bargainFirstPrice: number // 砍价起始价格，单位分
|
||||
bargainPrice: number // 砍价底价
|
||||
bargainMinPrice: number // 砍价底价
|
||||
stock: number // 活动库存
|
||||
}
|
||||
|
||||
|
|
@ -58,6 +57,11 @@ export const updateBargainActivity = async (data: BargainActivityVO) => {
|
|||
return await request.put({ url: '/promotion/bargain-activity/update', data })
|
||||
}
|
||||
|
||||
// 关闭砍价活动
|
||||
export const closeBargainActivity = async (id: number) => {
|
||||
return await request.put({ url: '/promotion/bargain-activity/close?id=' + id })
|
||||
}
|
||||
|
||||
// 删除砍价活动
|
||||
export const deleteBargainActivity = async (id: number) => {
|
||||
return await request.delete({ url: '/promotion/bargain-activity/delete?id=' + id })
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
export interface BargainHelpVO {
|
||||
id: number
|
||||
record: number
|
||||
userId: number
|
||||
reducePrice: number
|
||||
endTime: Date
|
||||
}
|
||||
|
||||
// 查询砍价记录列表
|
||||
export const getBargainHelpPage = async (params) => {
|
||||
return await request.get({ url: `/promotion/bargain-help/page`, params })
|
||||
}
|
||||
|
|
@ -0,0 +1,19 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
export interface BargainRecordVO {
|
||||
id: number
|
||||
activityId: number
|
||||
userId: number
|
||||
spuId: number
|
||||
skuId: number
|
||||
bargainFirstPrice: number
|
||||
bargainPrice: number
|
||||
status: number
|
||||
orderId: number
|
||||
endTime: Date
|
||||
}
|
||||
|
||||
// 查询砍价记录列表
|
||||
export const getBargainRecordPage = async (params) => {
|
||||
return await request.get({ url: `/promotion/bargain-record/page`, params })
|
||||
}
|
||||
|
|
@ -55,6 +55,11 @@ export const updateCombinationActivity = async (data: CombinationActivityVO) =>
|
|||
return await request.put({ url: '/promotion/combination-activity/update', data })
|
||||
}
|
||||
|
||||
// 关闭拼团活动
|
||||
export const closeCombinationActivity = async (id: number) => {
|
||||
return await request.put({ url: '/promotion/bargain-combination/close?id=' + id })
|
||||
}
|
||||
|
||||
// 删除拼团活动
|
||||
export const deleteCombinationActivity = async (id: number) => {
|
||||
return await request.delete({ url: '/promotion/combination-activity/delete?id=' + id })
|
||||
|
|
|
|||
|
|
@ -0,0 +1,33 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
export interface CombinationRecordVO {
|
||||
id: number // 拼团记录编号
|
||||
activityId: number // 拼团活动编号
|
||||
nickname: string // 用户昵称
|
||||
avatar: string // 用户头像
|
||||
headId: number // 团长编号
|
||||
expireTime: string // 过期时间
|
||||
userSize: number // 可参团人数
|
||||
userCount: number // 已参团人数
|
||||
status: number // 拼团状态
|
||||
spuName: string // 商品名字
|
||||
picUrl: string // 商品图片
|
||||
virtualGroup: boolean // 是否虚拟成团
|
||||
startTime: string // 开始时间 (订单付款后开始的时间)
|
||||
endTime: string // 结束时间（成团时间/失败时间）
|
||||
}
|
||||
|
||||
// 查询拼团记录列表
|
||||
export const getCombinationRecordPage = async (params) => {
|
||||
return await request.get({ url: '/promotion/combination-record/page', params })
|
||||
}
|
||||
|
||||
// 查询一个拼团的完整拼团记录
|
||||
export const getCombinationRecordPageByHeadId = async (params) => {
|
||||
return await request.get({ url: '/promotion/combination-record/page-by-headId', params })
|
||||
}
|
||||
|
||||
// 获得拼团记录的概要信息
|
||||
export const getCombinationRecordSummary = async () => {
|
||||
return await request.get({ url: '/promotion/combination-record/get-summary' })
|
||||
}
|
||||
|
|
@ -57,6 +57,11 @@ export const updateSeckillActivity = async (data: SeckillActivityVO) => {
|
|||
return await request.put({ url: '/promotion/seckill-activity/update', data })
|
||||
}
|
||||
|
||||
// 关闭秒杀活动
|
||||
export const closeSeckillActivity = async (id: number) => {
|
||||
return await request.put({ url: '/promotion/seckill-activity/close?id=' + id })
|
||||
}
|
||||
|
||||
// 删除秒杀活动
|
||||
export const deleteSeckillActivity = async (id: number) => {
|
||||
return await request.delete({ url: '/promotion/seckill-activity/delete?id=' + id })
|
||||
|
|
|
|||
|
|
@ -0,0 +1,91 @@
|
|||
import request from '@/config/axios'
|
||||
import dayjs from 'dayjs'
|
||||
import { TradeStatisticsComparisonRespVO } from '@/api/mall/statistics/trade'
|
||||
import { formatDate } from '@/utils/formatTime'
|
||||
|
||||
/** 会员分析 Request VO */
|
||||
export interface MemberAnalyseReqVO {
|
||||
times: [dayjs.ConfigType, dayjs.ConfigType]
|
||||
}
|
||||
|
||||
/** 会员分析 Response VO */
|
||||
export interface MemberAnalyseRespVO {
|
||||
visitorCount: number
|
||||
orderUserCount: number
|
||||
payUserCount: number
|
||||
atv: number
|
||||
comparison: TradeStatisticsComparisonRespVO<MemberAnalyseComparisonRespVO>
|
||||
}
|
||||
|
||||
/** 会员分析对照数据 Response VO */
|
||||
export interface MemberAnalyseComparisonRespVO {
|
||||
userCount: number
|
||||
activeUserCount: number
|
||||
rechargeUserCount: number
|
||||
}
|
||||
|
||||
/** 会员地区统计 Response VO */
|
||||
export interface MemberAreaStatisticsRespVO {
|
||||
areaId: number
|
||||
areaName: string
|
||||
userCount: number
|
||||
orderCreateCount: number
|
||||
orderPayCount: number
|
||||
orderPayPrice: number
|
||||
}
|
||||
|
||||
/** 会员性别统计 Response VO */
|
||||
export interface MemberSexStatisticsRespVO {
|
||||
sex: number
|
||||
userCount: number
|
||||
}
|
||||
|
||||
/** 会员统计 Response VO */
|
||||
export interface MemberSummaryRespVO {
|
||||
userCount: number
|
||||
rechargeUserCount: number
|
||||
rechargePrice: number
|
||||
expensePrice: number
|
||||
}
|
||||
|
||||
/** 会员终端统计 Response VO */
|
||||
export interface MemberTerminalStatisticsRespVO {
|
||||
terminal: number
|
||||
userCount: number
|
||||
}
|
||||
|
||||
// 查询会员统计
|
||||
export const getMemberSummary = () => {
|
||||
return request.get<MemberSummaryRespVO>({
|
||||
url: '/statistics/member/summary'
|
||||
})
|
||||
}
|
||||
|
||||
// 查询会员分析数据
|
||||
export const getMemberAnalyse = (params: MemberAnalyseReqVO) => {
|
||||
return request.get<MemberAnalyseRespVO>({
|
||||
url: '/statistics/member/analyse',
|
||||
params: { times: [formatDate(params.times[0]), formatDate(params.times[1])] }
|
||||
})
|
||||
}
|
||||
|
||||
// 按照省份，查询会员统计列表
|
||||
export const getMemberAreaStatisticsList = () => {
|
||||
return request.get<MemberAreaStatisticsRespVO[]>({
|
||||
url: '/statistics/member/get-area-statistics-list'
|
||||
})
|
||||
}
|
||||
|
||||
// 按照性别，查询会员统计列表
|
||||
export const getMemberSexStatisticsList = () => {
|
||||
return request.get<MemberSexStatisticsRespVO[]>({
|
||||
url: '/statistics/member/get-sex-statistics-list'
|
||||
})
|
||||
}
|
||||
|
||||
// 按照终端，查询会员统计列表
|
||||
export const getMemberTerminalStatisticsList = () => {
|
||||
return request.get<MemberTerminalStatisticsRespVO[]>({
|
||||
url: '/statistics/member/get-terminal-statistics-list'
|
||||
})
|
||||
}
|
||||
|
|
@ -0,0 +1,70 @@
|
|||
import request from '@/config/axios'
|
||||
import dayjs from 'dayjs'
|
||||
import { formatDate } from '@/utils/formatTime'
|
||||
|
||||
/** 交易统计对照 Response VO */
|
||||
export interface TradeStatisticsComparisonRespVO<T> {
|
||||
value: T
|
||||
reference: T
|
||||
}
|
||||
|
||||
/** 交易统计 Response VO */
|
||||
export interface TradeSummaryRespVO {
|
||||
yesterdayOrderCount: number
|
||||
monthOrderCount: number
|
||||
yesterdayPayPrice: number
|
||||
monthPayPrice: number
|
||||
}
|
||||
|
||||
/** 交易状况 Request VO */
|
||||
export interface TradeTrendReqVO {
|
||||
times: [dayjs.ConfigType, dayjs.ConfigType]
|
||||
}
|
||||
|
||||
/** 交易状况统计 Response VO */
|
||||
export interface TradeTrendSummaryRespVO {
|
||||
time: string
|
||||
turnover: number
|
||||
orderPayPrice: number
|
||||
rechargePrice: number
|
||||
expensePrice: number
|
||||
balancePrice: number
|
||||
brokerageSettlementPrice: number
|
||||
orderRefundPrice: number
|
||||
}
|
||||
|
||||
// 查询交易统计
|
||||
export const getTradeStatisticsSummary = () => {
|
||||
return request.get<TradeStatisticsComparisonRespVO<TradeSummaryRespVO>>({
|
||||
url: '/statistics/trade/summary'
|
||||
})
|
||||
}
|
||||
|
||||
// 获得交易状况统计
|
||||
export const getTradeTrendSummary = (params: TradeTrendReqVO) => {
|
||||
return request.get<TradeStatisticsComparisonRespVO<TradeTrendSummaryRespVO>>({
|
||||
url: '/statistics/trade/trend/summary',
|
||||
params: formatDateParam(params)
|
||||
})
|
||||
}
|
||||
|
||||
// 获得交易状况明细
|
||||
export const getTradeTrendList = (params: TradeTrendReqVO) => {
|
||||
return request.get<TradeTrendSummaryRespVO[]>({
|
||||
url: '/statistics/trade/trend/list',
|
||||
params: formatDateParam(params)
|
||||
})
|
||||
}
|
||||
|
||||
// 导出交易状况明细
|
||||
export const exportTradeTrend = (params: TradeTrendReqVO) => {
|
||||
return request.download({
|
||||
url: '/statistics/trade/trend/export-excel',
|
||||
params: formatDateParam(params)
|
||||
})
|
||||
}
|
||||
|
||||
/** 时间参数需要格式化, 确保接口能识别 */
|
||||
const formatDateParam = (params: TradeTrendReqVO) => {
|
||||
return { times: [formatDate(params.times[0]), formatDate(params.times[1])] } as TradeTrendReqVO
|
||||
}
|
||||
|
|
@ -4,13 +4,13 @@ export interface ConfigVO {
|
|||
brokerageEnabled: boolean
|
||||
brokerageEnabledCondition: number
|
||||
brokerageBindMode: number
|
||||
brokeragePostUrls: string
|
||||
brokeragePosterUrls: string
|
||||
brokerageFirstPercent: number
|
||||
brokerageSecondPercent: number
|
||||
brokerageWithdrawMinPrice: number
|
||||
brokerageBankNames: string
|
||||
brokerageFrozenDays: number
|
||||
brokerageWithdrawType: string
|
||||
brokerageWithdrawTypes: string
|
||||
}
|
||||
|
||||
// 查询交易中心配置详情
|
||||
|
|
|
|||
|
|
@ -41,15 +41,22 @@ export interface OrderVO {
|
|||
refundPrice?: number | null // 退款金额
|
||||
couponId?: number | null // 优惠劵编号
|
||||
couponPrice?: number | null // 优惠劵减免金额
|
||||
vipPrice?: number | null // VIP 减免金额
|
||||
pointPrice?: number | null // 积分抵扣的金额
|
||||
receiverAreaName?: string //收件人地区名字
|
||||
items?: OrderItemRespVO[] // 订单项列表
|
||||
// 用户信息
|
||||
// 下单用户信息
|
||||
user?: {
|
||||
id?: number | null
|
||||
nickname?: string
|
||||
avatar?: string
|
||||
}
|
||||
// 推广用户信息
|
||||
brokerageUser?: {
|
||||
id?: number | null
|
||||
nickname?: string
|
||||
avatar?: string
|
||||
}
|
||||
// 订单操作日志
|
||||
logs?: OrderLogRespVO[]
|
||||
}
|
||||
|
|
@ -114,21 +121,26 @@ export interface DeliveryVO {
|
|||
}
|
||||
|
||||
// 订单发货
|
||||
export const delivery = async (data: DeliveryVO) => {
|
||||
export const deliveryOrder = async (data: DeliveryVO) => {
|
||||
return await request.put({ url: `/trade/order/delivery`, data })
|
||||
}
|
||||
|
||||
// 订单备注
|
||||
export const updateRemark = async (data: any) => {
|
||||
export const updateOrderRemark = async (data: any) => {
|
||||
return await request.put({ url: `/trade/order/update-remark`, data })
|
||||
}
|
||||
|
||||
// 订单调价
|
||||
export const updatePrice = async (data: any) => {
|
||||
export const updateOrderPrice = async (data: any) => {
|
||||
return await request.put({ url: `/trade/order/update-price`, data })
|
||||
}
|
||||
|
||||
// 修改订单地址
|
||||
export const updateAddress = async (data: any) => {
|
||||
export const updateOrderAddress = async (data: any) => {
|
||||
return await request.put({ url: `/trade/order/update-address`, data })
|
||||
}
|
||||
|
||||
// 订单核销
|
||||
export const pickUpOrder = async (id: number) => {
|
||||
return await request.put({ url: `/trade/order/pick-up?id=${id}` })
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,19 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
export interface ConfigVO {
|
||||
id: number
|
||||
pointTradeDeductEnable: number
|
||||
pointTradeDeductUnitPrice: number
|
||||
pointTradeDeductMaxPrice: number
|
||||
pointTradeGivePoint: number
|
||||
}
|
||||
|
||||
// 查询积分设置详情
|
||||
export const getConfig = async () => {
|
||||
return await request.get({ url: `/member/config/get` })
|
||||
}
|
||||
|
||||
// 新增修改积分设置
|
||||
export const saveConfig = async (data: ConfigVO) => {
|
||||
return await request.put({ url: `/member/config/save`, data })
|
||||
}
|
||||
|
|
@ -1,19 +0,0 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
export interface ConfigVO {
|
||||
id: number
|
||||
tradeDeductEnable: number
|
||||
tradeDeductUnitPrice: number
|
||||
tradeDeductMaxPrice: number
|
||||
tradeGivePoint: number
|
||||
}
|
||||
|
||||
// 查询积分设置详情
|
||||
export const getConfig = async () => {
|
||||
return await request.get({ url: `/member/point/config/get` })
|
||||
}
|
||||
|
||||
// 新增修改积分设置
|
||||
export const saveConfig = async (data: ConfigVO) => {
|
||||
return await request.put({ url: `/member/point/config/save`, data })
|
||||
}
|
||||
|
|
@ -1,10 +1,11 @@
|
|||
import request from '@/config/axios'
|
||||
|
||||
export interface SignInConfigVO {
|
||||
id: number
|
||||
day: number | null
|
||||
point: number | null
|
||||
enable: boolean | null
|
||||
id?: number
|
||||
day?: number
|
||||
point?: number
|
||||
experience?: number
|
||||
status?: number
|
||||
}
|
||||
|
||||
// 查询积分签到规则列表
|
||||
|
|
|
|||