Skip to content

Commit d62bbcd

Browse files
author
puhui999
committed
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts: # package.json # src/views/member/user/detail/UserOrderList.vue
2 parents 1e8945d + 2457665 commit d62bbcd

File tree

59 files changed

+2764
-609
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+2764
-609
lines changed

‎README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,14 +39,14 @@
3939
| 框架 | 说明 | 版本 |
4040
|----------------------------------------------------------------------|------------------|--------|
4141
| [Vue](https://staging-cn.vuejs.org/) | Vue 框架 | 3.3.4 |
42-
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.9 |
43-
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.3.14 |
42+
| [Vite](https://cn.vitejs.dev//) | 开发与构建工具 | 4.4.11 |
43+
| [Element Plus](https://element-plus.org/zh-CN/) | Element Plus | 2.4.0 |
4444
| [TypeScript](https://www.typescriptlang.org/docs/) | JavaScript 的超集 | 5.2.2 |
45-
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.6 |
46-
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.4.1 |
47-
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.4.1 |
45+
| [pinia](https://pinia.vuejs.org/) | Vue 存储库 替代 vuex5 | 2.1.7 |
46+
| [vueuse](https://vueuse.org/) | 常用工具集 | 10.5.0 |
47+
| [vue-i18n](https://kazupon.github.io/vue-i18n/zh/introduction.html/) | 国际化 | 9.5.0 |
4848
| [vue-router](https://router.vuejs.org/) | Vue 路由 | 4.2.5 |
49-
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.1 |
49+
| [unocss](https://uno.antfu.me/) | 原子 css | 0.56.5 |
5050
| [iconify](https://icon-sets.iconify.design/) | 在线图标库 | 3.1.1 |
5151
| [wangeditor](https://www.wangeditor.com/) | 富文本编辑器 | 5.1.23 |
5252

‎package.json

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,31 @@
3131
"@form-create/element-ui": "^3.1.24",
3232
"@iconify/iconify": "^3.1.1",
3333
"@videojs-player/vue": "^1.0.0",
34-
"@vueuse/core": "^10.4.1",
34+
"@vueuse/core": "^10.5.0",
3535
"@wangeditor/editor": "^5.1.23",
3636
"@wangeditor/editor-for-vue": "^5.1.10",
3737
"@zxcvbn-ts/core": "^3.0.4",
3838
"animate.css": "^4.1.1",
39-
"axios": "^1.5.0",
39+
"axios": "^1.5.1",
4040
"benz-amr-recorder": "^1.1.5",
4141
"bpmn-js-token-simulation": "^0.10.0",
4242
"camunda-bpmn-moddle": "^7.0.1",
4343
"cropperjs": "^1.6.1",
4444
"crypto-js": "^4.1.1",
4545
"dayjs": "^1.11.10",
46-
"diagram-js": "^12.3.0",
46+
"diagram-js": "^12.4.0",
4747
"echarts": "^5.4.3",
4848
"echarts-wordcloud": "^2.1.0",
49-
"element-plus": "2.3.14",
50-
"fast-xml-parser": "^4.3.0",
51-
"highlight.js": "^11.8.0",
49+
"element-plus": "2.4.0",
50+
"fast-xml-parser": "^4.3.2",
51+
"highlight.js": "^11.9.0",
5252
"intro.js": "^7.2.0",
5353
"jsencrypt": "^3.3.2",
5454
"lodash-es": "^4.17.21",
5555
"min-dash": "^4.1.1",
5656
"mitt": "^3.0.1",
5757
"nprogress": "^0.2.0",
58-
"pinia": "^2.1.6",
58+
"pinia": "^2.1.7",
5959
"qrcode": "^1.5.3",
6060
"qs": "^6.11.2",
6161
"sortablejs": "^1.15.0",
@@ -64,72 +64,76 @@
6464
"video.js": "^7.21.5",
6565
"vue": "^3.3.4",
6666
"vue-dompurify-html": "^4.1.4",
67-
"vue-i18n": "^9.4.1",
67+
"vue-i18n": "^9.5.0",
6868
"vue-router": "^4.2.5",
6969
"vue-types": "^5.1.1",
7070
"vuedraggable": "^4.1.0",
7171
"web-storage-cache": "^1.1.1",
7272
"xml-js": "^1.6.11"
7373
},
7474
"devDependencies": {
75-
"@commitlint/cli": "^17.7.1",
76-
"@commitlint/config-conventional": "^17.7.0",
77-
"@iconify/json": "^2.2.119",
78-
"@intlify/unplugin-vue-i18n": "^1.2.0",
75+
"@commitlint/cli": "^17.8.0",
76+
"@commitlint/config-conventional": "^17.8.0",
77+
"@iconify/json": "^2.2.129",
78+
"@intlify/unplugin-vue-i18n": "^1.4.0",
7979
"@purge-icons/generated": "^0.9.0",
80-
"@types/intro.js": "^5.1.1",
80+
"@types/intro.js": "^5.1.2",
8181
"@types/lodash-es": "^4.17.9",
82-
"@types/node": "^20.6.0",
83-
"@types/nprogress": "^0.2.0",
82+
"@types/node": "^20.8.6",
83+
"@types/nprogress": "^0.2.1",
8484
"@types/qrcode": "^1.5.2",
8585
"@types/qs": "^6.9.8",
8686
"@types/sortablejs": "^1.15.4",
8787
"@typescript-eslint/eslint-plugin": "^6.7.2",
8888
"@typescript-eslint/parser": "^6.7.2",
8989
"@unocss/eslint-config": "^0.56.1",
9090
"@unocss/transformer-variant-group": "^0.56.1",
91+
"@typescript-eslint/eslint-plugin": "^6.7.5",
92+
"@typescript-eslint/parser": "^6.7.5",
93+
"@unocss/transformer-variant-group": "^0.56.5",
94+
"@unocss/eslint-config": "^0.56.5",
9195
"@vitejs/plugin-legacy": "^4.1.1",
92-
"@vitejs/plugin-vue": "^4.3.4",
96+
"@vitejs/plugin-vue": "^4.4.0",
9397
"@vitejs/plugin-vue-jsx": "^3.0.2",
94-
"@vue-macros/volar": "^0.14.3",
98+
"@vue-macros/volar": "^0.17.0",
9599
"autoprefixer": "^10.4.16",
96100
"bpmn-js": "8.9.0",
97101
"bpmn-js-properties-panel": "0.46.0",
98102
"consola": "^3.2.3",
99-
"eslint": "^8.49.0",
103+
"eslint": "^8.51.0",
100104
"eslint-config-prettier": "^9.0.0",
101-
"eslint-define-config": "^1.23.0",
102-
"eslint-plugin-prettier": "^5.0.0",
105+
"eslint-define-config": "^1.24.1",
106+
"eslint-plugin-prettier": "^5.0.1",
103107
"eslint-plugin-vue": "^9.17.0",
104-
"lint-staged": "^14.0.1",
105-
"postcss": "^8.4.30",
108+
"lint-staged": "^15.0.1",
109+
"postcss": "^8.4.31",
106110
"postcss-html": "^1.5.0",
107-
"postcss-scss": "^4.0.8",
111+
"postcss-scss": "^4.0.9",
108112
"prettier": "^3.0.3",
109-
"rimraf": "^5.0.1",
110-
"rollup": "^3.29.2",
111-
"sass": "^1.68.0",
113+
"rimraf": "^5.0.5",
114+
"rollup": "^4.1.4",
115+
"sass": "^1.69.3",
112116
"stylelint": "^15.10.3",
113117
"stylelint-config-html": "^1.1.0",
114118
"stylelint-config-recommended": "^13.0.0",
115119
"stylelint-config-standard": "^34.0.0",
116120
"stylelint-order": "^6.0.3",
117-
"terser": "^5.20.0",
121+
"terser": "^5.21.0",
118122
"typescript": "5.2.2",
119-
"unocss": "^0.56.1",
123+
"unocss": "^0.56.5",
120124
"unplugin-auto-import": "^0.16.6",
121125
"unplugin-element-plus": "^0.8.0",
122126
"unplugin-vue-components": "^0.25.2",
123-
"vite": "4.4.9",
127+
"vite": "4.4.11",
124128
"vite-plugin-compression": "^0.5.1",
125129
"vite-plugin-ejs": "^1.6.4",
126130
"vite-plugin-eslint": "^1.8.1",
127131
"vite-plugin-progress": "^0.0.7",
128132
"vite-plugin-purge-icons": "^0.9.2",
129133
"vite-plugin-svg-icons": "^2.0.1",
130134
"vite-plugin-top-level-await": "^1.3.1",
131-
"vue-eslint-parser": "^9.3.1",
132-
"vue-tsc": "^1.8.13"
135+
"vue-eslint-parser": "^9.3.2",
136+
"vue-tsc": "^1.8.19"
133137
},
134138
"license": "MIT",
135139
"repository": {

‎src/api/bpm/task/index.ts

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,24 @@ export const returnTask = async (data) => {
5858
export const delegateTask = async (data) => {
5959
return await request.put({ url: '/bpm/task/delegate', data })
6060
}
61+
62+
/**
63+
* 加签
64+
*/
65+
export const taskAddSign = async (data) => {
66+
return await request.put({ url: '/bpm/task/add-sign', data })
67+
}
68+
69+
/**
70+
* 获取减签任务列表
71+
*/
72+
export const getChildrenTaskList = async (id: string) => {
73+
return await request.get({ url: '/bpm/task/get-children-task-list?taskId=' + id })
74+
}
75+
76+
/**
77+
* 减签
78+
*/
79+
export const taskSubSign = async (data) => {
80+
return await request.put({ url: '/bpm/task/sub-sign', data })
81+
}

‎src/api/login/index.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ export const smsLogin = (data: SmsLoginVO) => {
4747
return request.post({ url: '/system/auth/sms-login', data })
4848
}
4949

50+
// 社交快捷登录，使用 code 授权码
51+
export function socialLogin(type: string, code: string, state: string) {
52+
return request.post({
53+
url: '/system/auth/social-login',
54+
data: {
55+
type,
56+
code,
57+
state
58+
}
59+
})
60+
}
61+
5062
// 社交授权的跳转
5163
export const socialAuthRedirect = (type: number, redirectUri: string) => {
5264
return request.get({

‎src/api/login/types.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ export type UserLoginVO = {
22
username: string
33
password: string
44
captchaVerification: string
5+
socialType?: string
6+
socialCode?: string
7+
socialState?: string
58
}
69

710
export type TokenType = {

‎src/api/mall/promotion/article/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,3 @@ export const updateArticle = async (data: ArticleVO) => {
4040
export const deleteArticle = async (id: number) => {
4141
return await request.delete({ url: `/promotion/article/delete?id=` + id })
4242
}
43-
44-
// 导出文章管理 Excel
45-
export const exportArticle = async (params) => {
46-
return await request.download({ url: `/promotion/article/export-excel`, params })
47-
}

‎src/api/mall/promotion/articleCategory/index.ts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,3 @@ export const updateArticleCategory = async (data: ArticleCategoryVO) => {
3737
export const deleteArticleCategory = async (id: number) => {
3838
return await request.delete({ url: `/promotion/article-category/delete?id=` + id })
3939
}
40-
41-
// 导出文章分类 Excel
42-
export const exportArticleCategory = async (params) => {
43-
return await request.download({ url: `/promotion/article-category/export-excel`, params })
44-
}

‎src/api/mall/statistics/common.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
/** 数据对照 Response VO */
2+
export interface DataComparisonRespVO<T> {
3+
value: T
4+
reference: T
5+
}

‎src/api/mall/statistics/member.ts

Lines changed: 42 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import request from '@/config/axios'
22
import dayjs from 'dayjs'
3-
import { TradeStatisticsComparisonRespVO } from '@/api/mall/statistics/trade'
3+
import { DataComparisonRespVO } from '@/api/mall/statistics/common'
44
import { formatDate } from '@/utils/formatTime'
55

66
/** 会员分析 Request VO */
@@ -10,17 +10,17 @@ export interface MemberAnalyseReqVO {
1010

1111
/** 会员分析 Response VO */
1212
export interface MemberAnalyseRespVO {
13-
visitorCount: number
13+
visitUserCount: number
1414
orderUserCount: number
1515
payUserCount: number
1616
atv: number
17-
comparison: TradeStatisticsComparisonRespVO<MemberAnalyseComparisonRespVO>
17+
comparison: DataComparisonRespVO<MemberAnalyseComparisonRespVO>
1818
}
1919

2020
/** 会员分析对照数据 Response VO */
2121
export interface MemberAnalyseComparisonRespVO {
22-
userCount: number
23-
activeUserCount: number
22+
registerUserCount: number
23+
visitUserCount: number
2424
rechargeUserCount: number
2525
}
2626

@@ -29,8 +29,8 @@ export interface MemberAreaStatisticsRespVO {
2929
areaId: number
3030
areaName: string
3131
userCount: number
32-
orderCreateCount: number
33-
orderPayCount: number
32+
orderCreateUserCount: number
33+
orderPayUserCount: number
3434
orderPayPrice: number
3535
}
3636

@@ -54,6 +54,20 @@ export interface MemberTerminalStatisticsRespVO {
5454
userCount: number
5555
}
5656

57+
/** 会员数量统计 Response VO */
58+
export interface MemberCountRespVO {
59+
/** 用户访问量 */
60+
visitUserCount: string
61+
/** 注册用户数量 */
62+
registerUserCount: number
63+
}
64+
65+
/** 会员注册数量 Response VO */
66+
export interface MemberRegisterCountRespVO {
67+
date: string
68+
count: number
69+
}
70+
5771
// 查询会员统计
5872
export const getMemberSummary = () => {
5973
return request.get<MemberSummaryRespVO>({
@@ -72,20 +86,38 @@ export const getMemberAnalyse = (params: MemberAnalyseReqVO) => {
7286
// 按照省份，查询会员统计列表
7387
export const getMemberAreaStatisticsList = () => {
7488
return request.get<MemberAreaStatisticsRespVO[]>({
75-
url: '/statistics/member/get-area-statistics-list'
89+
url: '/statistics/member/area-statistics-list'
7690
})
7791
}
7892

7993
// 按照性别，查询会员统计列表
8094
export const getMemberSexStatisticsList = () => {
8195
return request.get<MemberSexStatisticsRespVO[]>({
82-
url: '/statistics/member/get-sex-statistics-list'
96+
url: '/statistics/member/sex-statistics-list'
8397
})
8498
}
8599

86100
// 按照终端，查询会员统计列表
87101
export const getMemberTerminalStatisticsList = () => {
88102
return request.get<MemberTerminalStatisticsRespVO[]>({
89-
url: '/statistics/member/get-terminal-statistics-list'
103+
url: '/statistics/member/terminal-statistics-list'
104+
})
105+
}
106+
107+
// 获得用户数量量对照
108+
export const getUserCountComparison = () => {
109+
return request.get<DataComparisonRespVO<MemberCountRespVO>>({
110+
url: '/statistics/member/user-count-comparison'
111+
})
112+
}
113+
114+
// 获得会员注册数量列表
115+
export const getMemberRegisterCountList = (
116+
beginTime: dayjs.ConfigType,
117+
endTime: dayjs.ConfigType
118+
) => {
119+
return request.get<MemberRegisterCountRespVO[]>({
120+
url: '/statistics/member/register-count-list',
121+
params: { times: [formatDate(beginTime), formatDate(endTime)] }
90122
})
91123
}

‎src/api/mall/statistics/pay.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import request from '@/config/axios'
2+
3+
/** 支付统计 */
4+
export interface PaySummaryRespVO {
5+
/** 充值金额，单位分 */
6+
rechargePrice: number
7+
}
8+
9+
/** 获取钱包充值金额 */
10+
export const getWalletRechargePrice = async () => {
11+
return await request.get<PaySummaryRespVO>({ url: `/statistics/pay/summary` })
12+
}

0 commit comments

Comments
 (0)