diff --git a/.image/Java监控.jpg b/.image/Java监控.jpg
new file mode 100644
index 00000000..6ad522ab
Binary files /dev/null and b/.image/Java监控.jpg differ
diff --git a/.image/MySQL.jpg b/.image/MySQL.jpg
new file mode 100644
index 00000000..64a1940c
Binary files /dev/null and b/.image/MySQL.jpg differ
diff --git a/.image/OA请假-列表.jpg b/.image/OA请假-列表.jpg
new file mode 100644
index 00000000..787bb73f
Binary files /dev/null and b/.image/OA请假-列表.jpg differ
diff --git a/.image/OA请假-发起.jpg b/.image/OA请假-发起.jpg
new file mode 100644
index 00000000..1a7342d7
Binary files /dev/null and b/.image/OA请假-发起.jpg differ
diff --git a/.image/OA请假-详情.jpg b/.image/OA请假-详情.jpg
new file mode 100644
index 00000000..a83e7c14
Binary files /dev/null and b/.image/OA请假-详情.jpg differ
diff --git a/.image/Redis.jpg b/.image/Redis.jpg
new file mode 100644
index 00000000..95693526
Binary files /dev/null and b/.image/Redis.jpg differ
diff --git a/.image/admin-uniapp/01.png b/.image/admin-uniapp/01.png
new file mode 100644
index 00000000..0f65d99e
Binary files /dev/null and b/.image/admin-uniapp/01.png differ
diff --git a/.image/admin-uniapp/02.png b/.image/admin-uniapp/02.png
new file mode 100644
index 00000000..05ec781c
Binary files /dev/null and b/.image/admin-uniapp/02.png differ
diff --git a/.image/admin-uniapp/03.png b/.image/admin-uniapp/03.png
new file mode 100644
index 00000000..f400c688
Binary files /dev/null and b/.image/admin-uniapp/03.png differ
diff --git a/.image/admin-uniapp/04.png b/.image/admin-uniapp/04.png
new file mode 100644
index 00000000..d5d5ea07
Binary files /dev/null and b/.image/admin-uniapp/04.png differ
diff --git a/.image/admin-uniapp/05.png b/.image/admin-uniapp/05.png
new file mode 100644
index 00000000..1de6d8ae
Binary files /dev/null and b/.image/admin-uniapp/05.png differ
diff --git a/.image/admin-uniapp/06.png b/.image/admin-uniapp/06.png
new file mode 100644
index 00000000..400ae90b
Binary files /dev/null and b/.image/admin-uniapp/06.png differ
diff --git a/.image/admin-uniapp/07.png b/.image/admin-uniapp/07.png
new file mode 100644
index 00000000..2ed8c0ff
Binary files /dev/null and b/.image/admin-uniapp/07.png differ
diff --git a/.image/admin-uniapp/08.png b/.image/admin-uniapp/08.png
new file mode 100644
index 00000000..090e64a6
Binary files /dev/null and b/.image/admin-uniapp/08.png differ
diff --git a/.image/admin-uniapp/09.png b/.image/admin-uniapp/09.png
new file mode 100644
index 00000000..f2032c8a
Binary files /dev/null and b/.image/admin-uniapp/09.png differ
diff --git a/.image/common/mall-feature.png b/.image/common/mall-feature.png
new file mode 100644
index 00000000..cca05c0e
Binary files /dev/null and b/.image/common/mall-feature.png differ
diff --git a/.image/common/mall-preview.png b/.image/common/mall-preview.png
new file mode 100644
index 00000000..f939214b
Binary files /dev/null and b/.image/common/mall-preview.png differ
diff --git a/.image/common/project-vs.png b/.image/common/project-vs.png
new file mode 100644
index 00000000..561e092f
Binary files /dev/null and b/.image/common/project-vs.png differ
diff --git a/.image/common/ruoyi-vue-pro-architecture.png b/.image/common/ruoyi-vue-pro-architecture.png
new file mode 100644
index 00000000..7bd7d59a
Binary files /dev/null and b/.image/common/ruoyi-vue-pro-architecture.png differ
diff --git a/.image/common/ruoyi-vue-pro-biz.png b/.image/common/ruoyi-vue-pro-biz.png
new file mode 100644
index 00000000..24a385ab
Binary files /dev/null and b/.image/common/ruoyi-vue-pro-biz.png differ
diff --git a/.image/common/yudao-cloud-architecture.png b/.image/common/yudao-cloud-architecture.png
new file mode 100644
index 00000000..59416d80
Binary files /dev/null and b/.image/common/yudao-cloud-architecture.png differ
diff --git a/.image/common/yudao-roadmap.png b/.image/common/yudao-roadmap.png
new file mode 100644
index 00000000..f4becc98
Binary files /dev/null and b/.image/common/yudao-roadmap.png differ
diff --git a/.image/个人中心.jpg b/.image/个人中心.jpg
new file mode 100644
index 00000000..ce57f6e1
Binary files /dev/null and b/.image/个人中心.jpg differ
diff --git a/.image/代码生成.jpg b/.image/代码生成.jpg
new file mode 100644
index 00000000..751603ef
Binary files /dev/null and b/.image/代码生成.jpg differ
diff --git a/.image/令牌管理.jpg b/.image/令牌管理.jpg
new file mode 100644
index 00000000..04abf4d2
Binary files /dev/null and b/.image/令牌管理.jpg differ
diff --git a/.image/任务列表-审批.jpg b/.image/任务列表-审批.jpg
new file mode 100644
index 00000000..cba312a0
Binary files /dev/null and b/.image/任务列表-审批.jpg differ
diff --git a/.image/任务列表-已办.jpg b/.image/任务列表-已办.jpg
new file mode 100644
index 00000000..7a8d0fb1
Binary files /dev/null and b/.image/任务列表-已办.jpg differ
diff --git a/.image/任务列表-待办.jpg b/.image/任务列表-待办.jpg
new file mode 100644
index 00000000..a90323fb
Binary files /dev/null and b/.image/任务列表-待办.jpg differ
diff --git a/.image/任务日志.jpg b/.image/任务日志.jpg
new file mode 100644
index 00000000..599e50a9
Binary files /dev/null and b/.image/任务日志.jpg differ
diff --git a/.image/商户信息.jpg b/.image/商户信息.jpg
new file mode 100644
index 00000000..483eace1
Binary files /dev/null and b/.image/商户信息.jpg differ
diff --git a/.image/在线用户.jpg b/.image/在线用户.jpg
new file mode 100644
index 00000000..b183009b
Binary files /dev/null and b/.image/在线用户.jpg differ
diff --git a/.image/大屏设计器-列表.jpg b/.image/大屏设计器-列表.jpg
new file mode 100644
index 00000000..9a45c3bd
Binary files /dev/null and b/.image/大屏设计器-列表.jpg differ
diff --git a/.image/大屏设计器-编辑.jpg b/.image/大屏设计器-编辑.jpg
new file mode 100644
index 00000000..63298a0c
Binary files /dev/null and b/.image/大屏设计器-编辑.jpg differ
diff --git a/.image/大屏设计器-预览.jpg b/.image/大屏设计器-预览.jpg
new file mode 100644
index 00000000..501d9ea2
Binary files /dev/null and b/.image/大屏设计器-预览.jpg differ
diff --git a/.image/字典数据.jpg b/.image/字典数据.jpg
new file mode 100644
index 00000000..8298c893
Binary files /dev/null and b/.image/字典数据.jpg differ
diff --git a/.image/字典类型.jpg b/.image/字典类型.jpg
new file mode 100644
index 00000000..6613392f
Binary files /dev/null and b/.image/字典类型.jpg differ
diff --git a/.image/定时任务.jpg b/.image/定时任务.jpg
new file mode 100644
index 00000000..d5bbd851
Binary files /dev/null and b/.image/定时任务.jpg differ
diff --git a/.image/岗位管理.jpg b/.image/岗位管理.jpg
new file mode 100644
index 00000000..42b64d2c
Binary files /dev/null and b/.image/岗位管理.jpg differ
diff --git a/.image/应用信息-列表.jpg b/.image/应用信息-列表.jpg
new file mode 100644
index 00000000..da419a24
Binary files /dev/null and b/.image/应用信息-列表.jpg differ
diff --git a/.image/应用信息-编辑.jpg b/.image/应用信息-编辑.jpg
new file mode 100644
index 00000000..913cfbc8
Binary files /dev/null and b/.image/应用信息-编辑.jpg differ
diff --git a/.image/应用管理.jpg b/.image/应用管理.jpg
new file mode 100644
index 00000000..6e7789fc
Binary files /dev/null and b/.image/应用管理.jpg differ
diff --git a/.image/我的流程-列表.jpg b/.image/我的流程-列表.jpg
new file mode 100644
index 00000000..223d17af
Binary files /dev/null and b/.image/我的流程-列表.jpg differ
diff --git a/.image/我的流程-发起.jpg b/.image/我的流程-发起.jpg
new file mode 100644
index 00000000..7a833062
Binary files /dev/null and b/.image/我的流程-发起.jpg differ
diff --git a/.image/我的流程-详情.jpg b/.image/我的流程-详情.jpg
new file mode 100644
index 00000000..6a015418
Binary files /dev/null and b/.image/我的流程-详情.jpg differ
diff --git a/.image/报表设计器-图形报表.jpg b/.image/报表设计器-图形报表.jpg
new file mode 100644
index 00000000..681b3185
Binary files /dev/null and b/.image/报表设计器-图形报表.jpg differ
diff --git a/.image/报表设计器-打印设计.jpg b/.image/报表设计器-打印设计.jpg
new file mode 100644
index 00000000..bb86da64
Binary files /dev/null and b/.image/报表设计器-打印设计.jpg differ
diff --git a/.image/报表设计器-数据报表.jpg b/.image/报表设计器-数据报表.jpg
new file mode 100644
index 00000000..9ca5b9b6
Binary files /dev/null and b/.image/报表设计器-数据报表.jpg differ
diff --git a/.image/操作日志.jpg b/.image/操作日志.jpg
new file mode 100644
index 00000000..4a0611a3
Binary files /dev/null and b/.image/操作日志.jpg differ
diff --git a/.image/支付订单.jpg b/.image/支付订单.jpg
new file mode 100644
index 00000000..0a56dd74
Binary files /dev/null and b/.image/支付订单.jpg differ
diff --git a/.image/敏感词.jpg b/.image/敏感词.jpg
new file mode 100644
index 00000000..92a53974
Binary files /dev/null and b/.image/敏感词.jpg differ
diff --git a/.image/数据库文档.jpg b/.image/数据库文档.jpg
new file mode 100644
index 00000000..a4339d96
Binary files /dev/null and b/.image/数据库文档.jpg differ
diff --git a/.image/文件管理.jpg b/.image/文件管理.jpg
new file mode 100644
index 00000000..054b19f1
Binary files /dev/null and b/.image/文件管理.jpg differ
diff --git a/.image/文件管理2.jpg b/.image/文件管理2.jpg
new file mode 100644
index 00000000..b12e5c3c
Binary files /dev/null and b/.image/文件管理2.jpg differ
diff --git a/.image/文件配置.jpg b/.image/文件配置.jpg
new file mode 100644
index 00000000..e618049a
Binary files /dev/null and b/.image/文件配置.jpg differ
diff --git a/.image/日志中心.jpg b/.image/日志中心.jpg
new file mode 100644
index 00000000..27c1c6cb
Binary files /dev/null and b/.image/日志中心.jpg differ
diff --git a/.image/流程模型-列表.jpg b/.image/流程模型-列表.jpg
new file mode 100644
index 00000000..ffdc5840
Binary files /dev/null and b/.image/流程模型-列表.jpg differ
diff --git a/.image/流程模型-定义.jpg b/.image/流程模型-定义.jpg
new file mode 100644
index 00000000..18b316c7
Binary files /dev/null and b/.image/流程模型-定义.jpg differ
diff --git a/.image/流程模型-设计.jpg b/.image/流程模型-设计.jpg
new file mode 100644
index 00000000..96149690
Binary files /dev/null and b/.image/流程模型-设计.jpg differ
diff --git a/.image/流程表单.jpg b/.image/流程表单.jpg
new file mode 100644
index 00000000..60669c14
Binary files /dev/null and b/.image/流程表单.jpg differ
diff --git a/.image/生成效果.jpg b/.image/生成效果.jpg
new file mode 100644
index 00000000..98ff2cca
Binary files /dev/null and b/.image/生成效果.jpg differ
diff --git a/.image/用户分组.jpg b/.image/用户分组.jpg
new file mode 100644
index 00000000..39af1cd1
Binary files /dev/null and b/.image/用户分组.jpg differ
diff --git a/.image/用户管理.jpg b/.image/用户管理.jpg
new file mode 100644
index 00000000..844604a6
Binary files /dev/null and b/.image/用户管理.jpg differ
diff --git a/.image/登录.jpg b/.image/登录.jpg
new file mode 100644
index 00000000..b782b988
Binary files /dev/null and b/.image/登录.jpg differ
diff --git a/.image/登录日志.jpg b/.image/登录日志.jpg
new file mode 100644
index 00000000..25662d97
Binary files /dev/null and b/.image/登录日志.jpg differ
diff --git a/.image/短信日志.jpg b/.image/短信日志.jpg
new file mode 100644
index 00000000..ada8e56d
Binary files /dev/null and b/.image/短信日志.jpg differ
diff --git a/.image/短信模板.jpg b/.image/短信模板.jpg
new file mode 100644
index 00000000..09381cc5
Binary files /dev/null and b/.image/短信模板.jpg differ
diff --git a/.image/短信渠道.jpg b/.image/短信渠道.jpg
new file mode 100644
index 00000000..df3a5c39
Binary files /dev/null and b/.image/短信渠道.jpg differ
diff --git a/.image/租户套餐.png b/.image/租户套餐.png
new file mode 100644
index 00000000..96631679
Binary files /dev/null and b/.image/租户套餐.png differ
diff --git a/.image/租户管理.jpg b/.image/租户管理.jpg
new file mode 100644
index 00000000..647416a9
Binary files /dev/null and b/.image/租户管理.jpg differ
diff --git a/.image/系统接口.jpg b/.image/系统接口.jpg
new file mode 100644
index 00000000..6d39d421
Binary files /dev/null and b/.image/系统接口.jpg differ
diff --git a/.image/菜单管理.jpg b/.image/菜单管理.jpg
new file mode 100644
index 00000000..ad3b7979
Binary files /dev/null and b/.image/菜单管理.jpg differ
diff --git a/.image/表单构建.jpg b/.image/表单构建.jpg
new file mode 100644
index 00000000..81f03746
Binary files /dev/null and b/.image/表单构建.jpg differ
diff --git a/.image/角色管理.jpg b/.image/角色管理.jpg
new file mode 100644
index 00000000..eed776e8
Binary files /dev/null and b/.image/角色管理.jpg differ
diff --git a/.image/访问日志.jpg b/.image/访问日志.jpg
new file mode 100644
index 00000000..ef301aad
Binary files /dev/null and b/.image/访问日志.jpg differ
diff --git a/.image/退款订单.jpg b/.image/退款订单.jpg
new file mode 100644
index 00000000..2c6c6c9e
Binary files /dev/null and b/.image/退款订单.jpg differ
diff --git a/.image/通知公告.jpg b/.image/通知公告.jpg
new file mode 100644
index 00000000..97bb42fe
Binary files /dev/null and b/.image/通知公告.jpg differ
diff --git a/.image/部门管理.jpg b/.image/部门管理.jpg
new file mode 100644
index 00000000..6eab2330
Binary files /dev/null and b/.image/部门管理.jpg differ
diff --git a/.image/配置管理.jpg b/.image/配置管理.jpg
new file mode 100644
index 00000000..0abaec93
Binary files /dev/null and b/.image/配置管理.jpg differ
diff --git a/.image/链路追踪.jpg b/.image/链路追踪.jpg
new file mode 100644
index 00000000..12f7aa8e
Binary files /dev/null and b/.image/链路追踪.jpg differ
diff --git a/.image/错误日志.jpg b/.image/错误日志.jpg
new file mode 100644
index 00000000..eb615ea3
Binary files /dev/null and b/.image/错误日志.jpg differ
diff --git a/.image/错误码管理.jpg b/.image/错误码管理.jpg
new file mode 100644
index 00000000..ea91dde1
Binary files /dev/null and b/.image/错误码管理.jpg differ
diff --git a/.image/首页.jpg b/.image/首页.jpg
new file mode 100644
index 00000000..10a7fde7
Binary files /dev/null and b/.image/首页.jpg differ
diff --git a/README.md b/README.md
index 8466bbc3..56683973 100644
--- a/README.md
+++ b/README.md
@@ -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 |
+|-------|---------------------------------|---------------------------------|---------------------------------------|
+| 报表设计器 |  |  |  |
+| 大屏设计器 |  |  |  |
diff --git a/src/api/mall/product/spu.ts b/src/api/mall/product/spu.ts
index c78bef47..5cc4d8fe 100644
--- a/src/api/mall/product/spu.ts
+++ b/src/api/mall/product/spu.ts
@@ -104,5 +104,5 @@ export const exportSpu = async (params) => {
// 获得商品 SPU 精简列表
export const getSpuSimpleList = async () => {
- return request.get({ url: '/product/spu/get-simple-list' })
+ return request.get({ url: '/product/spu/list-all-simple' })
}
diff --git a/src/api/mall/promotion/article/index.ts b/src/api/mall/promotion/article/index.ts
new file mode 100644
index 00000000..c2941d05
--- /dev/null
+++ b/src/api/mall/promotion/article/index.ts
@@ -0,0 +1,47 @@
+import request from '@/config/axios'
+
+export interface ArticleVO {
+ id: number
+ categoryId: number
+ title: string
+ author: string
+ picUrl: string
+ introduction: string
+ browseCount: string
+ sort: number
+ status: number
+ spuId: number
+ recommendHot: boolean
+ recommendBanner: boolean
+ content: string
+}
+
+// 查询文章管理列表
+export const getArticlePage = async (params) => {
+ return await request.get({ url: `/promotion/article/page`, params })
+}
+
+// 查询文章管理详情
+export const getArticle = async (id: number) => {
+ return await request.get({ url: `/promotion/article/get?id=` + id })
+}
+
+// 新增文章管理
+export const createArticle = async (data: ArticleVO) => {
+ return await request.post({ url: `/promotion/article/create`, data })
+}
+
+// 修改文章管理
+export const updateArticle = async (data: ArticleVO) => {
+ return await request.put({ url: `/promotion/article/update`, data })
+}
+
+// 删除文章管理
+export const deleteArticle = async (id: number) => {
+ return await request.delete({ url: `/promotion/article/delete?id=` + id })
+}
+
+// 导出文章管理 Excel
+export const exportArticle = async (params) => {
+ return await request.download({ url: `/promotion/article/export-excel`, params })
+}
diff --git a/src/api/mall/promotion/articleCategory/index.ts b/src/api/mall/promotion/articleCategory/index.ts
new file mode 100644
index 00000000..2950d759
--- /dev/null
+++ b/src/api/mall/promotion/articleCategory/index.ts
@@ -0,0 +1,44 @@
+import request from '@/config/axios'
+
+export interface ArticleCategoryVO {
+ id: number
+ name: string
+ picUrl: string
+ status: number
+ sort: number
+}
+
+// 查询文章分类列表
+export const getArticleCategoryPage = async (params) => {
+ return await request.get({ url: `/promotion/article-category/page`, params })
+}
+
+// 查询文章分类精简信息列表
+export const getSimpleArticleCategoryList = async () => {
+ return await request.get({ url: `/promotion/article-category/list-all-simple` })
+}
+
+// 查询文章分类详情
+export const getArticleCategory = async (id: number) => {
+ return await request.get({ url: `/promotion/article-category/get?id=` + id })
+}
+
+// 新增文章分类
+export const createArticleCategory = async (data: ArticleCategoryVO) => {
+ return await request.post({ url: `/promotion/article-category/create`, data })
+}
+
+// 修改文章分类
+export const updateArticleCategory = async (data: ArticleCategoryVO) => {
+ return await request.put({ url: `/promotion/article-category/update`, data })
+}
+
+// 删除文章分类
+export const deleteArticleCategory = async (id: number) => {
+ return await request.delete({ url: `/promotion/article-category/delete?id=` + id })
+}
+
+// 导出文章分类 Excel
+export const exportArticleCategory = async (params) => {
+ return await request.download({ url: `/promotion/article-category/export-excel`, params })
+}
diff --git a/src/api/pay/wallet/rechargePackage/index.ts b/src/api/pay/wallet/rechargePackage/index.ts
new file mode 100644
index 00000000..c8e4cc9c
--- /dev/null
+++ b/src/api/pay/wallet/rechargePackage/index.ts
@@ -0,0 +1,34 @@
+import request from '@/config/axios'
+
+export interface WalletRechargePackageVO {
+ id: number
+ name: string
+ payPrice: number
+ bonusPrice: number
+ status: number
+}
+
+// 查询套餐充值列表
+export const getWalletRechargePackagePage = async (params) => {
+ return await request.get({ url: '/pay/wallet-recharge-package/page', params })
+}
+
+// 查询套餐充值详情
+export const getWalletRechargePackage = async (id: number) => {
+ return await request.get({ url: '/pay/wallet-recharge-package/get?id=' + id })
+}
+
+// 新增套餐充值
+export const createWalletRechargePackage = async (data: WalletRechargePackageVO) => {
+ return await request.post({ url: '/pay/wallet-recharge-package/create', data })
+}
+
+// 修改套餐充值
+export const updateWalletRechargePackage = async (data: WalletRechargePackageVO) => {
+ return await request.put({ url: '/pay/wallet-recharge-package/update', data })
+}
+
+// 删除套餐充值
+export const deleteWalletRechargePackage = async (id: number) => {
+ return await request.delete({ url: '/pay/wallet-recharge-package/delete?id=' + id })
+}
diff --git a/src/views/mall/promotion/article/ArticleForm.vue b/src/views/mall/promotion/article/ArticleForm.vue
new file mode 100644
index 00000000..36fc1340
--- /dev/null
+++ b/src/views/mall/promotion/article/ArticleForm.vue
@@ -0,0 +1,236 @@
+<template>
+ <Dialog v-model="dialogVisible" :title="dialogTitle" width="70%">
+ <el-form
+ ref="formRef"
+ v-loading="formLoading"
+ :model="formData"
+ :rules="formRules"
+ label-width="110px"
+ >
+ <el-row>
+ <el-col :span="12">
+ <el-form-item label="文章分类" prop="categoryId">
+ <el-select v-model="formData.categoryId" placeholder="请选择">
+ <el-option
+ v-for="item in categoryList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="文章标题" prop="title">
+ <el-input v-model="formData.title" placeholder="请输入文章标题" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="文章作者" prop="author">
+ <el-input v-model="formData.author" placeholder="请输入文章作者" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="文章简介" prop="introduction">
+ <el-input v-model="formData.introduction" placeholder="请输入文章简介" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="文章封面" prop="picUrl">
+ <UploadImg v-model="formData.picUrl" height="80px" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="浏览次数" prop="browseCount">
+ <el-input-number
+ v-model="formData.browseCount"
+ :min="0"
+ clearable
+ controls-position="right"
+ />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="排序" prop="sort">
+ <el-input-number v-model="formData.sort" :min="0" clearable controls-position="right" />
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="状态" prop="status">
+ <el-radio-group v-model="formData.status">
+ <el-radio
+ v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="商品关联" prop="spuId">
+ <el-select v-model="formData.spuId" placeholder="请选择">
+ <el-option
+ v-for="item in spuList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="是否热门" prop="recommendHot">
+ <el-radio-group v-model="formData.recommendHot">
+ <el-radio
+ v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item label="是否轮播图" prop="recommendBanner">
+ <el-radio-group v-model="formData.recommendBanner">
+ <el-radio
+ v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
+ <el-col :span="24">
+ <el-form-item label="文章内容">
+ <Editor v-model="formData.content" height="150px" />
+ </el-form-item>
+ </el-col>
+ </el-row>
+ </el-form>
+ <template #footer>
+ <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ </template>
+ </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
+import * as ArticleApi from '@/api/mall/promotion/article'
+import * as ArticleCategoryApi from '@/api/mall/promotion/articleCategory'
+import * as ProductSpuApi from '@/api/mall/product/spu'
+
+defineOptions({ name: 'PromotionArticleForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+ id: undefined,
+ categoryId: undefined,
+ title: undefined,
+ author: undefined,
+ picUrl: undefined,
+ introduction: undefined,
+ browseCount: 0,
+ sort: 0,
+ status: 0,
+ spuId: undefined,
+ recommendHot: false,
+ recommendBanner: false,
+ content: undefined
+})
+const formRules = reactive({
+ categoryId: [{ required: true, message: '分类id不能为空', trigger: 'blur' }],
+ title: [{ required: true, message: '文章标题不能为空', trigger: 'blur' }],
+ picUrl: [{ required: true, message: '文章封面图片地址不能为空', trigger: 'blur' }],
+ sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }],
+ status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+ spuId: [{ required: true, message: '商品关联id不能为空', trigger: 'blur' }],
+ recommendHot: [{ required: true, message: '是否热门(小程序)不能为空', trigger: 'blur' }],
+ recommendBanner: [{ required: true, message: '是否轮播图(小程序)不能为空', trigger: 'blur' }],
+ content: [{ required: true, message: '文章内容不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+ dialogVisible.value = true
+ dialogTitle.value = t('action.' + type)
+ formType.value = type
+ resetForm()
+ // 修改时，设置数据
+ if (id) {
+ formLoading.value = true
+ try {
+ formData.value = await ArticleApi.getArticle(id)
+ } finally {
+ formLoading.value = false
+ }
+ }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+ // 校验表单
+ if (!formRef) return
+ const valid = await formRef.value.validate()
+ if (!valid) return
+ // 提交请求
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as ArticleApi.ArticleVO
+ if (formType.value === 'create') {
+ await ArticleApi.createArticle(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await ArticleApi.updateArticle(data)
+ message.success(t('common.updateSuccess'))
+ }
+ dialogVisible.value = false
+ // 发送操作成功的事件
+ emit('success')
+ } finally {
+ formLoading.value = false
+ }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ id: undefined,
+ categoryId: undefined,
+ title: undefined,
+ author: undefined,
+ picUrl: undefined,
+ introduction: undefined,
+ browseCount: 0,
+ sort: 0,
+ status: 0,
+ spuId: undefined,
+ recommendHot: false,
+ recommendBanner: false,
+ content: undefined
+ }
+ formRef.value?.resetFields()
+}
+
+const categoryList = ref<ArticleCategoryApi.ArticleCategoryVO[]>([])
+const spuList = ref<ProductSpuApi.Spu[]>([])
+onMounted(async () => {
+ categoryList.value =
+ (await ArticleCategoryApi.getSimpleArticleCategoryList()) as ArticleCategoryApi.ArticleCategoryVO[]
+ spuList.value = (await ProductSpuApi.getSpuSimpleList()) as ProductSpuApi.Spu[]
+})
+</script>
diff --git a/src/views/mall/promotion/article/category/ArticleCategoryForm.vue b/src/views/mall/promotion/article/category/ArticleCategoryForm.vue
new file mode 100644
index 00000000..39b1fc0f
--- /dev/null
+++ b/src/views/mall/promotion/article/category/ArticleCategoryForm.vue
@@ -0,0 +1,119 @@
+<template>
+ <Dialog v-model="dialogVisible" :title="dialogTitle">
+ <el-form
+ ref="formRef"
+ v-loading="formLoading"
+ :model="formData"
+ :rules="formRules"
+ label-width="100px"
+ >
+ <el-form-item label="分类名称" prop="name">
+ <el-input v-model="formData.name" placeholder="请输入分类名称" />
+ </el-form-item>
+ <el-form-item label="图标地址" prop="picUrl">
+ <UploadImg v-model="formData.picUrl" height="80px" />
+ </el-form-item>
+ <el-form-item label="状态" prop="status">
+ <el-radio-group v-model="formData.status">
+ <el-radio
+ v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="排序" prop="sort">
+ <el-input-number v-model="formData.sort" :min="0" clearable controls-position="right" />
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <el-button :disabled="formLoading" type="primary" @click="submitForm">确 定</el-button>
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ </template>
+ </Dialog>
+</template>
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as ArticleCategoryApi from '@/api/mall/promotion/articleCategory'
+
+defineOptions({ name: 'PromotionArticleCategoryForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+ id: undefined,
+ name: undefined,
+ picUrl: undefined,
+ status: undefined,
+ sort: undefined
+})
+const formRules = reactive({
+ name: [{ required: true, message: '分类名称不能为空', trigger: 'blur' }],
+ status: [{ required: true, message: '状态不能为空', trigger: 'blur' }],
+ sort: [{ required: true, message: '排序不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+ dialogVisible.value = true
+ dialogTitle.value = t('action.' + type)
+ formType.value = type
+ resetForm()
+ // 修改时，设置数据
+ if (id) {
+ formLoading.value = true
+ try {
+ formData.value = await ArticleCategoryApi.getArticleCategory(id)
+ } finally {
+ formLoading.value = false
+ }
+ }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+ // 校验表单
+ if (!formRef) return
+ const valid = await formRef.value.validate()
+ if (!valid) return
+ // 提交请求
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as ArticleCategoryApi.ArticleCategoryVO
+ if (formType.value === 'create') {
+ await ArticleCategoryApi.createArticleCategory(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await ArticleCategoryApi.updateArticleCategory(data)
+ message.success(t('common.updateSuccess'))
+ }
+ dialogVisible.value = false
+ // 发送操作成功的事件
+ emit('success')
+ } finally {
+ formLoading.value = false
+ }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ id: undefined,
+ name: undefined,
+ picUrl: undefined,
+ status: undefined,
+ sort: undefined
+ }
+ formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/mall/promotion/article/category/index.vue b/src/views/mall/promotion/article/category/index.vue
new file mode 100644
index 00000000..32d385c3
--- /dev/null
+++ b/src/views/mall/promotion/article/category/index.vue
@@ -0,0 +1,225 @@
+<template>
+ <ContentWrap>
+ <!-- 搜索工作栏 -->
+ <el-form
+ ref="queryFormRef"
+ :inline="true"
+ :model="queryParams"
+ class="-mb-15px"
+ label-width="68px"
+ >
+ <el-form-item label="分类名称" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ class="!w-240px"
+ clearable
+ placeholder="请输入分类名称"
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="状态" prop="status">
+ <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="创建时间" prop="createTime">
+ <el-date-picker
+ v-model="queryParams.createTime"
+ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+ class="!w-240px"
+ end-placeholder="结束日期"
+ start-placeholder="开始日期"
+ type="daterange"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="handleQuery">
+ <Icon class="mr-5px" icon="ep:search" />
+ 搜索
+ </el-button>
+ <el-button @click="resetQuery">
+ <Icon class="mr-5px" icon="ep:refresh" />
+ 重置
+ </el-button>
+ <el-button
+ v-hasPermi="['promotion:article-category:create']"
+ plain
+ type="primary"
+ @click="openForm('create')"
+ >
+ <Icon class="mr-5px" icon="ep:plus" />
+ 新增
+ </el-button>
+ <el-button
+ v-hasPermi="['promotion:article-category:export']"
+ :loading="exportLoading"
+ plain
+ type="success"
+ @click="handleExport"
+ >
+ <Icon class="mr-5px" icon="ep:download" />
+ 导出
+ </el-button>
+ </el-form-item>
+ </el-form>
+ </ContentWrap>
+
+ <!-- 列表 -->
+ <ContentWrap>
+ <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+ <el-table-column align="center" label="编号" prop="id" />
+ <el-table-column align="center" label="分类名称" prop="name" />
+ <el-table-column label="分类图图" min-width="80">
+ <template #default="{ row }">
+ <el-image :src="row.picUrl" class="h-30px w-30px" @click="imagePreview(row.picUrl)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="状态" prop="status">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="排序" prop="sort" />
+ <el-table-column
+ :formatter="dateFormatter"
+ align="center"
+ label="创建时间"
+ prop="createTime"
+ width="180px"
+ />
+ <el-table-column align="center" label="操作">
+ <template #default="scope">
+ <el-button
+ v-hasPermi="['promotion:article-category:update']"
+ link
+ type="primary"
+ @click="openForm('update', scope.row.id)"
+ >
+ 编辑
+ </el-button>
+ <el-button
+ v-hasPermi="['promotion:article-category:delete']"
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ >
+ 删除
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 分页 -->
+ <Pagination
+ v-model:limit="queryParams.pageSize"
+ v-model:page="queryParams.pageNo"
+ :total="total"
+ @pagination="getList"
+ />
+ </ContentWrap>
+
+ <!-- 表单弹窗：添加/修改 -->
+ <ArticleCategoryForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ArticleCategoryApi from '@/api/mall/promotion/articleCategory'
+import ArticleCategoryForm from './ArticleCategoryForm.vue'
+import { createImageViewer } from '@/components/ImageViewer'
+
+defineOptions({ name: 'PromotionArticleCategory' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ name: null,
+ status: null,
+ createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 分类图预览 */
+const imagePreview = (imgUrl: string) => {
+ createImageViewer({
+ urlList: [imgUrl]
+ })
+}
+
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await ArticleCategoryApi.getArticleCategoryPage(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } finally {
+ loading.value = false
+ }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ queryParams.pageNo = 1
+ getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+ formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+ try {
+ // 删除的二次确认
+ await message.delConfirm()
+ // 发起删除
+ await ArticleCategoryApi.deleteArticleCategory(id)
+ message.success(t('common.delSuccess'))
+ // 刷新列表
+ await getList()
+ } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+ try {
+ // 导出的二次确认
+ await message.exportConfirm()
+ // 发起导出
+ exportLoading.value = true
+ const data = await ArticleCategoryApi.exportArticleCategory(queryParams)
+ download.excel(data, '分类.xls')
+ } catch {
+ } finally {
+ exportLoading.value = false
+ }
+}
+
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
+</script>
diff --git a/src/views/mall/promotion/article/index.vue b/src/views/mall/promotion/article/index.vue
new file mode 100644
index 00000000..7f5f4b70
--- /dev/null
+++ b/src/views/mall/promotion/article/index.vue
@@ -0,0 +1,321 @@
+<template>
+ <ContentWrap>
+ <!-- 搜索工作栏 -->
+ <el-form
+ ref="queryFormRef"
+ :inline="true"
+ :model="queryParams"
+ class="-mb-15px"
+ label-width="80px"
+ >
+ <el-form-item label="文章分类" prop="categoryId">
+ <el-select
+ v-model="queryParams.categoryId"
+ class="!w-240px"
+ placeholder="全部"
+ @keyup.enter="handleQuery"
+ >
+ <el-option
+ v-for="item in categoryList"
+ :key="item.id"
+ :label="item.name"
+ :value="item.id"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="文章标题" prop="title">
+ <el-input
+ v-model="queryParams.title"
+ class="!w-240px"
+ clearable
+ placeholder="请输入文章标题"
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="文章作者" prop="author">
+ <el-input
+ v-model="queryParams.author"
+ class="!w-240px"
+ clearable
+ placeholder="请输入文章作者"
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="状态" prop="status">
+ <el-select v-model="queryParams.status" class="!w-240px" clearable placeholder="请选择状态">
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="关联商品" prop="spuId">
+ <el-select
+ v-model="queryParams.spuId"
+ class="!w-240px"
+ placeholder="全部"
+ @keyup.enter="handleQuery"
+ >
+ <el-option v-for="item in spuList" :key="item.id" :label="item.name" :value="item.id" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="热门" prop="recommendHot">
+ <el-select v-model="queryParams.recommendHot" class="!w-240px" clearable placeholder="全部">
+ <el-option
+ v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="轮播图" prop="recommendBanner">
+ <el-select
+ v-model="queryParams.recommendBanner"
+ class="!w-240px"
+ clearable
+ placeholder="全部"
+ >
+ <el-option
+ v-for="dict in getBoolDictOptions(DICT_TYPE.INFRA_BOOLEAN_STRING)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="创建时间" prop="createTime">
+ <el-date-picker
+ v-model="queryParams.createTime"
+ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+ class="!w-240px"
+ end-placeholder="结束日期"
+ start-placeholder="开始日期"
+ type="daterange"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="handleQuery">
+ <Icon class="mr-5px" icon="ep:search" />
+ 搜索
+ </el-button>
+ <el-button @click="resetQuery">
+ <Icon class="mr-5px" icon="ep:refresh" />
+ 重置
+ </el-button>
+ <el-button
+ v-hasPermi="['promotion:article:create']"
+ plain
+ type="primary"
+ @click="openForm('create')"
+ >
+ <Icon class="mr-5px" icon="ep:plus" />
+ 新增
+ </el-button>
+ <el-button
+ v-hasPermi="['promotion:article:export']"
+ :loading="exportLoading"
+ plain
+ type="success"
+ @click="handleExport"
+ >
+ <Icon class="mr-5px" icon="ep:download" />
+ 导出
+ </el-button>
+ </el-form-item>
+ </el-form>
+ </ContentWrap>
+
+ <!-- 列表 -->
+ <ContentWrap>
+ <el-table v-loading="loading" :data="list" :show-overflow-tooltip="true" :stripe="true">
+ <el-table-column align="center" label="文章分类" prop="categoryId">
+ <template #default="scope">
+ {{ categoryList.find((item) => item.id === scope.row.categoryId)?.name }}
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="关联商品" prop="spuId" width="300">
+ <template #default="scope">
+ <el-image
+ :preview-src-list="[spuList.find((item) => item.id === scope.row.spuId)?.picUrl]"
+ :src="spuList.find((item) => item.id === scope.row.spuId)?.picUrl"
+ class="mr-[10px] h-40px w-40px v-middle"
+ preview-teleported
+ />
+ {{ spuList.find((item) => item.id === scope.row.spuId)?.name }}
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="文章标题" prop="title" />
+ <el-table-column align="center" label="文章作者" prop="author" />
+ <el-table-column align="center" label="文章封面" prop="picUrl">
+ <template #default="{ row }">
+ <el-image :src="row.picUrl" class="h-30px w-30px" @click="imagePreview(row.picUrl)" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="文章简介" prop="introduction" />
+ <el-table-column align="center" label="浏览次数" prop="browseCount" />
+ <el-table-column align="center" label="排序" prop="sort" />
+ <el-table-column align="center" label="状态" prop="status">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="热门" prop="recommendHot">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.recommendHot" />
+ </template>
+ </el-table-column>
+ <el-table-column align="center" label="轮播图" prop="recommendBanner">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.recommendBanner" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ :formatter="dateFormatter"
+ align="center"
+ label="创建时间"
+ prop="createTime"
+ width="180px"
+ />
+ <el-table-column align="center" fixed="right" label="操作" width="120">
+ <template #default="scope">
+ <el-button
+ v-hasPermi="['promotion:article:update']"
+ link
+ type="primary"
+ @click="openForm('update', scope.row.id)"
+ >
+ 编辑
+ </el-button>
+ <el-button
+ v-hasPermi="['promotion:article:delete']"
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ >
+ 删除
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 分页 -->
+ <Pagination
+ v-model:limit="queryParams.pageSize"
+ v-model:page="queryParams.pageNo"
+ :total="total"
+ @pagination="getList"
+ />
+ </ContentWrap>
+
+ <!-- 表单弹窗：添加/修改 -->
+ <ArticleForm ref="formRef" @success="getList" />
+</template>
+
+<script lang="ts" setup>
+import { DICT_TYPE, getBoolDictOptions, getIntDictOptions } from '@/utils/dict'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import * as ArticleApi from '@/api/mall/promotion/article'
+import ArticleForm from './ArticleForm.vue'
+import * as ArticleCategoryApi from '@/api/mall/promotion/articleCategory'
+import * as ProductSpuApi from '@/api/mall/product/spu'
+import { createImageViewer } from '@/components/ImageViewer'
+
+defineOptions({ name: 'PromotionArticle' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ categoryId: undefined,
+ spuId: undefined,
+ title: null,
+ author: null,
+ status: undefined,
+ recommendHot: undefined,
+ recommendBanner: undefined,
+ createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+/** 文章封面预览 */
+const imagePreview = (imgUrl: string) => {
+ createImageViewer({
+ urlList: [imgUrl]
+ })
+}
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await ArticleApi.getArticlePage(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } finally {
+ loading.value = false
+ }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ queryParams.pageNo = 1
+ getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+ formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+ try {
+ // 删除的二次确认
+ await message.delConfirm()
+ // 发起删除
+ await ArticleApi.deleteArticle(id)
+ message.success(t('common.delSuccess'))
+ // 刷新列表
+ await getList()
+ } catch {}
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+ try {
+ // 导出的二次确认
+ await message.exportConfirm()
+ // 发起导出
+ exportLoading.value = true
+ const data = await ArticleApi.exportArticle(queryParams)
+ download.excel(data, '文章管理.xls')
+ } catch {
+ } finally {
+ exportLoading.value = false
+ }
+}
+
+const categoryList = ref<ArticleCategoryApi.ArticleCategoryVO[]>([])
+const spuList = ref<ProductSpuApi.Spu[]>([])
+onMounted(async () => {
+ await getList()
+ categoryList.value =
+ (await ArticleCategoryApi.getSimpleArticleCategoryList()) as ArticleCategoryApi.ArticleCategoryVO[]
+ spuList.value = (await ProductSpuApi.getSpuSimpleList()) as ProductSpuApi.Spu[]
+})
+</script>
diff --git a/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
new file mode 100644
index 00000000..f538b78c
--- /dev/null
+++ b/src/views/pay/wallet/rechargePackage/WalletRechargePackageForm.vue
@@ -0,0 +1,122 @@
+<template>
+ <Dialog :title="dialogTitle" v-model="dialogVisible">
+ <el-form
+ ref="formRef"
+ :model="formData"
+ :rules="formRules"
+ label-width="150px"
+ v-loading="formLoading"
+ >
+ <el-form-item label="套餐名" prop="name">
+ <el-input v-model="formData.name" placeholder="请输入套餐名" />
+ </el-form-item>
+ <el-form-item label="支付金额(元)" prop="payPrice">
+ <el-input-number v-model="formData.payPrice" :min="0" :precision="2" :step="0.01" />
+ </el-form-item>
+ <el-form-item label="赠送金额(元)" prop="bonusPrice">
+ <el-input-number v-model="formData.bonusPrice" :min="0" :precision="2" :step="0.01" />
+ </el-form-item>
+ <el-form-item label="开启状态" prop="status">
+ <el-radio-group v-model="formData.status">
+ <el-radio
+ v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+ <el-button @click="dialogVisible = false">取 消</el-button>
+ </template>
+ </Dialog>
+</template>
+<script setup lang="ts">
+import * as WalletRechargePackageApi from '@/api/pay/wallet/rechargePackage'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import { fenToYuan, yuanToFen } from '@/utils'
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const formData = ref({
+ id: undefined,
+ name: undefined,
+ payPrice: undefined,
+ bonusPrice: undefined,
+ status: undefined
+})
+const formRules = reactive({
+ name: [{ required: true, message: '套餐名不能为空', trigger: 'blur' }],
+ payPrice: [{ required: true, message: '支付金额不能为空', trigger: 'blur' }],
+ bonusPrice: [{ required: true, message: '赠送金额不能为空', trigger: 'blur' }],
+ status: [{ required: true, message: '状态不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+ dialogVisible.value = true
+ dialogTitle.value = t('action.' + type)
+ formType.value = type
+ resetForm()
+ // 修改时，设置数据
+ if (id) {
+ formLoading.value = true
+ try {
+ formData.value = await WalletRechargePackageApi.getWalletRechargePackage(id)
+ formData.value.payPrice = fenToYuan(formData.value.payPrice)
+ formData.value.bonusPrice = fenToYuan(formData.value.bonusPrice)
+ } finally {
+ formLoading.value = false
+ }
+ }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+ // 校验表单
+ if (!formRef) return
+ const valid = await formRef.value.validate()
+ if (!valid) return
+ // 提交请求
+ formLoading.value = true
+ try {
+ const data = formData.value as unknown as WalletRechargePackageApi.WalletRechargePackageVO
+ data.payPrice = yuanToFen(data.payPrice)
+ data.bonusPrice = yuanToFen(data.bonusPrice)
+ if (formType.value === 'create') {
+ await WalletRechargePackageApi.createWalletRechargePackage(data)
+ message.success(t('common.createSuccess'))
+ } else {
+ await WalletRechargePackageApi.updateWalletRechargePackage(data)
+ message.success(t('common.updateSuccess'))
+ }
+ dialogVisible.value = false
+ // 发送操作成功的事件
+ emit('success')
+ } finally {
+ formLoading.value = false
+ }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+ formData.value = {
+ id: undefined,
+ name: undefined,
+ payPrice: undefined,
+ bonusPrice: undefined,
+ status: undefined
+ }
+ formRef.value?.resetFields()
+}
+</script>
diff --git a/src/views/pay/wallet/rechargePackage/index.vue b/src/views/pay/wallet/rechargePackage/index.vue
new file mode 100644
index 00000000..6034e447
--- /dev/null
+++ b/src/views/pay/wallet/rechargePackage/index.vue
@@ -0,0 +1,186 @@
+<template>
+ <ContentWrap>
+ <!-- 搜索工作栏 -->
+ <el-form
+ class="-mb-15px"
+ :model="queryParams"
+ ref="queryFormRef"
+ :inline="true"
+ label-width="68px"
+ >
+ <el-form-item label="套餐名" prop="name">
+ <el-input
+ v-model="queryParams.name"
+ placeholder="请输入套餐名"
+ clearable
+ @keyup.enter="handleQuery"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item label="状态" prop="status">
+ <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+ <el-option
+ v-for="dict in getIntDictOptions(DICT_TYPE.COMMON_STATUS)"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="创建时间" prop="createTime">
+ <el-date-picker
+ v-model="queryParams.createTime"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="daterange"
+ start-placeholder="开始日期"
+ end-placeholder="结束日期"
+ :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+ class="!w-240px"
+ />
+ </el-form-item>
+ <el-form-item>
+ <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
+ <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
+ <el-button
+ type="primary"
+ plain
+ @click="openForm('create')"
+ v-hasPermi="['pay:wallet-recharge-package:create']"
+ >
+ <Icon icon="ep:plus" class="mr-5px" /> 新增
+ </el-button>
+ </el-form-item>
+ </el-form>
+ </ContentWrap>
+
+ <!-- 列表 -->
+ <ContentWrap>
+ <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
+ <el-table-column label="编号" align="center" prop="id" />
+ <el-table-column label="套餐名" align="center" prop="name" />
+ <el-table-column label="支付金额" align="center" prop="payPrice">
+ <template #default="{ row }"> {{ fenToYuan(row.payPrice) }} 元</template>
+ </el-table-column>
+ <el-table-column label="赠送金额" align="center" prop="bonusPrice">
+ <template #default="{ row }"> {{ fenToYuan(row.bonusPrice) }} 元</template>
+ </el-table-column>
+ <el-table-column label="状态" align="center" prop="status">
+ <template #default="scope">
+ <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status" />
+ </template>
+ </el-table-column>
+ <el-table-column
+ label="创建时间"
+ align="center"
+ prop="createTime"
+ :formatter="dateFormatter"
+ width="180px"
+ />
+ <el-table-column label="操作" align="center">
+ <template #default="scope">
+ <el-button
+ link
+ type="primary"
+ @click="openForm('update', scope.row.id)"
+ v-hasPermi="['pay:wallet-recharge-package:update']"
+ >
+ 编辑
+ </el-button>
+ <el-button
+ link
+ type="danger"
+ @click="handleDelete(scope.row.id)"
+ v-hasPermi="['pay:wallet-recharge-package:delete']"
+ >
+ 删除
+ </el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <!-- 分页 -->
+ <Pagination
+ :total="total"
+ v-model:page="queryParams.pageNo"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
+ />
+ </ContentWrap>
+
+ <!-- 表单弹窗：添加/修改 -->
+ <WalletRechargePackageForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { dateFormatter } from '@/utils/formatTime'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
+import * as WalletRechargePackageApi from '@/api/pay/wallet/rechargePackage'
+import WalletRechargePackageForm from './WalletRechargePackageForm.vue'
+import { fenToYuan } from '@/utils'
+
+defineOptions({ name: 'WalletRechargePackage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const total = ref(0) // 列表的总页数
+const list = ref([]) // 列表的数据
+const queryParams = reactive({
+ pageNo: 1,
+ pageSize: 10,
+ name: null,
+ payPrice: null,
+ bonusPrice: null,
+ status: null,
+ createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+ loading.value = true
+ try {
+ const data = await WalletRechargePackageApi.getWalletRechargePackagePage(queryParams)
+ list.value = data.list
+ total.value = data.total
+ } finally {
+ loading.value = false
+ }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+ queryParams.pageNo = 1
+ getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+ queryFormRef.value.resetFields()
+ handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+ formRef.value.open(type, id)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+ try {
+ // 删除的二次确认
+ await message.delConfirm()
+ // 发起删除
+ await WalletRechargePackageApi.deleteWalletRechargePackage(id)
+ message.success(t('common.delSuccess'))
+ // 刷新列表
+ await getList()
+ } catch {}
+}
+/** 初始化 **/
+onMounted(() => {
+ getList()
+})
+</script>
diff --git a/src/views/system/notify/template/NotifyTemplateSendForm.vue b/src/views/system/notify/template/NotifyTemplateSendForm.vue
index 78103d71..964f6b98 100644
--- a/src/views/system/notify/template/NotifyTemplateSendForm.vue
+++ b/src/views/system/notify/template/NotifyTemplateSendForm.vue
@@ -15,7 +15,21 @@
type="textarea"
/>
</el-form-item>
- <el-form-item label="接收人" prop="userId">
+ <el-form-item label="用户类型" prop="userType">
+ <el-radio-group v-model="formData.userType">
+ <el-radio
+ v-for="dict in getIntDictOptions(DICT_TYPE.USER_TYPE)"
+ :key="dict.value"
+ :label="dict.value as number"
+ >
+ {{ dict.label }}
+ </el-radio>
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item v-show="formData.userType === 1" label="接收人ID" prop="userId">
+ <el-input v-model="formData.userId" style="width: 160px" />
+ </el-form-item>
+ <el-form-item v-show="formData.userType === 2" label="接收人" prop="userId">
<el-select v-model="formData.userId" placeholder="请选择接收人">
<el-option
v-for="item in userOption"
@@ -46,6 +60,7 @@
<script lang="ts" setup>
import * as UserApi from '@/api/system/user'
import * as NotifyTemplateApi from '@/api/system/notify/template'
+import { DICT_TYPE, getIntDictOptions } from '@/utils/dict'
defineOptions({ name: 'SystemNotifyTemplateSendForm' })
@@ -57,6 +72,7 @@ const formData = ref({
content: '',
params: {},
userId: null,
+ userType: 1,
templateCode: '',
templateParams: new Map()
})
@@ -122,7 +138,8 @@ const resetForm = () => {
params: {},
mobile: '',
templateCode: '',
- templateParams: new Map()
+ templateParams: new Map(),
+ userType: 1
} as any
formRef.value?.resetFields()
}