huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-30 03:01:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,570 Commits 1 Branch 0 Tags 176 MiB
5122aee924
Commit Graph

684 Commits

Author SHA1 Message Date
YunaiV
eb660ca619 pay：示例订单，增加发起退款的操作 2023-02-15 22:40:56 +08:00
liuyang
d47ce54e18 fix: 登录选择钉钉等第三方弹窗后点击取消弹窗后恢复登录按钮loading状态 2023-02-15 15:48:52 +08:00
YunaiV
4d2ebcd898 pay：前端收银台接入支付宝扫码 2023-02-15 00:11:34 +08:00
YunaiV
84e9c0bba0 pay：前端收银台的信息接入 2023-02-13 23:59:03 +08:00
YunaiV
ecbeba5da0 增加支付收银台的前端界面 2023-02-12 21:56:02 +08:00
YunaiV
7fbdfec396 增加接入示例的查询 2023-02-11 23:04:35 +08:00
YunaiV
35ba9b36af 菜单新增 alwaysShow 总是展示、componentName 组件名 2023-02-10 23:03:10 +08:00
xingyuv
cb8e92a658 feat: update deps 2023-02-09 10:23:42 +08:00
YunaiV
fb45a70bce 集成 Go-View 大屏设计器 2023-02-07 23:08:14 +08:00
YunaiV
1b6124a0db 集成 Go-View 大屏设计器 2023-02-07 22:56:33 +08:00
YunaiV
de7d26129c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 
# Conflicts:
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/vo/BpmOALeaveBaseVO.java
#	yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/task/vo/task/BpmTaskTodoPageReqVO.java
 2023-02-04 20:58:09 +08:00
YunaiV
53767614fe 增加商城的提示 2023-02-04 20:38:51 +08:00
YunaiV
c3eb9022b8 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/springdoc 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/ConfigController.java
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/clean.sql
#	yudao-module-mall/yudao-module-product-biz/src/test/resources/sql/create_tables.sql
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/auth/AuthController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/PostController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/RoleController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsChannelController.java
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
#	yudao-server/pom.xml
 2023-02-04 10:21:45 +08:00
芋道源码
ee150702b7
!369 解决只有一个菜单时无法显示目录 
Merge pull request !369 from zhang.xionghui/master
 2023-02-04 02:13:45 +00:00
xingyu
0bd0bbd536 fix: slot-scope 已过期 ==》 v-slot 2023-01-31 13:28:16 +08:00
xingyu
2ea9027031 mp user => mp mpuser 2023-01-31 13:22:26 +08:00
xingyu
227361661f fix: mp menu error 2023-01-31 09:27:27 +08:00
YunaiV
5bedff605a Merge branch 'feature/vue3-bpm' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 2023-01-30 20:48:29 +08:00
xingyu
08a4de37c2 Merge remote-tracking branch 'origin/master' into feature/springdoc 
# Conflicts:
#	README.md
 2023-01-30 10:08:31 +08:00
YunaiV
c04ef59e81 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/vue3-bpm 2023-01-30 08:11:24 +08:00
YunaiV
ca8bb72417 版本 1.7.0 发布：增加微信公众号、站内信、邮箱、数据脱敏！ 2023-01-30 02:30:42 +08:00
xingyu
68bdaa7854 feat: swagger-ui 2023-01-29 16:25:59 +08:00
YunaiV
91dd4a32b1 站内信模块：vue3 站内信弹板 2023-01-29 09:26:06 +08:00
YunaiV
1943e71e3f 站内信模块：完善注释 2023-01-28 22:59:01 +08:00
YunaiV
ae3ee95cdd 站内信模块：整体功能实现 2023-01-28 20:10:19 +08:00
gexinzhineng/gxzn27
a03f702fa1 修改数据弹出层 2023-01-28 11:28:52 +08:00
YunaiV
143035d798 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/notify 
# Conflicts:
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-ui-admin/src/utils/dict.js
 2023-01-27 23:25:08 +08:00
YunaiV
86a884e3d2 邮箱模块：vue3 邮件模版的管理 2023-01-27 17:10:15 +08:00
YunaiV
4cbf7398e8 邮箱模块：vue3 邮箱账号的管理 2023-01-27 15:11:11 +08:00
YunaiV
2c55d29411 邮箱模块：完善前端的界面 2023-01-27 14:15:45 +08:00
YunaiV
c0b029b244 邮箱模块：完善 template 的单元测试 2023-01-26 23:32:18 +08:00
YunaiV
0895ee7d98 邮箱模块：完善 account 的单元测试 2023-01-26 23:04:26 +08:00
YunaiV
525078abd3 邮箱模块：完善 log 相关的逻辑 2023-01-26 20:39:38 +08:00
YunaiV
ea39dcc5c8 邮箱模块：完善 template 模版的增删改查功能 2023-01-25 20:44:48 +08:00
YunaiV
0262fa5c15 邮箱模块：完善 account 账号的增删改查功能 2023-01-25 17:48:09 +08:00
YunaiV
e9814b129b 492919d：升级element-ui到最新版本2.15.12 2023-01-25 12:32:54 +08:00
YunaiV
9b47dd4a67 b4bdd4f：开启TopNav没有子菜单隐藏侧边栏 2023-01-25 12:25:34 +08:00
YunaiV
b6d90b2244 bpm：流程详情的转派审批人 2023-01-24 18:55:16 +08:00
YunaiV
0aa72b3200 bpm：流程详情的时间轴 2023-01-24 09:20:30 +08:00
YunaiV
2d6fe27b43 bpm：完成流程实例的列表界面 2023-01-23 00:03:56 +08:00
YunaiV
5e9706007e Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp 
# Conflicts:
#	yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/DefaultDatabaseQueryTest.java
 2023-01-18 00:38:55 +08:00
YunaiV
3166cd7063 mp：同步 mp 公众号 SQL 2023-01-17 23:56:27 +08:00
YunaiV
68ef11ee87 mp：完善微信公众号的消息 2023-01-17 23:20:56 +08:00
YunaiV
6fc0b3fc54 mp：增加【自动回复】的后端新增、修改、删除接口 2023-01-17 00:58:35 +08:00
YunaiV
1e402d8063 mp：增加【自动回复】的前端实现 2023-01-17 00:01:07 +08:00
YunaiV
ab41c96641 mp：增加【自动回复】的分页接口 2023-01-16 22:16:23 +08:00
YunaiV
26ca97d2f6 mp：初始化【自动回复】菜单 2023-01-15 23:14:46 +08:00
YunaiV
0e75a67f28 mp：菜单的清空处理 2023-01-15 21:28:04 +08:00
YunaiV
b5815a62fc mp：自定义菜单的图文选择 2023-01-15 21:21:33 +08:00
YunaiV
64fa3a7e47 mp：修复 wx-reply 组件的 tab 切换存在问题 2023-01-15 20:05:25 +08:00
YunaiV
8600214532 mp：优化【菜单】其它类型的处理 2023-01-15 19:52:59 +08:00
YunaiV
3654afedcc mp：修复 WxMaterialSelect 组件的音乐 tab，无法选择图片素材报错 2023-01-15 19:09:13 +08:00
YunaiV
0499226c3d mp：完善【菜单】的回复功能 2023-01-15 18:28:08 +08:00
YunaiV
141e4e4c8b mp：移除 less 使用 scss 适配 2023-01-15 10:37:42 +08:00
YunaiV
2173cf0364 mp：menu 前端接入菜单的保存、清空操作 2023-01-15 00:54:53 +08:00
YunaiV
c0b950257f mp：menu 前端的新增、删除操作的完善 2023-01-14 22:39:29 +08:00
YunaiV
02ec5d455c mp：1）引入 less-loader，解决 menu 的 less 样式；2）接入菜单列表接口 2023-01-14 21:24:14 +08:00
YunaiV
f271ef8c47 mp：初始化菜单的前端 2023-01-14 20:07:18 +08:00
YunaiV
bf5dcdd582 mp：素材管理，增加【语音】【视频】 2023-01-14 16:55:36 +08:00
YunaiV
5a1d02dffd mp：素材管理，增加【图片】 2023-01-14 15:46:35 +08:00
YunaiV
d1cbe0c3fd mp：增加图文草稿箱的删除、发布功能 2023-01-14 10:21:53 +08:00
YunaiV
90ffe5adb7 mp：增加图文草稿箱的修改；优化前端代码 2023-01-14 09:17:01 +08:00
YunaiV
28884ee638 mp：优化 wx-editor 图片的上传 2023-01-14 08:02:31 +08:00
YunaiV
73fac5235f mp：实现 wx-editor 图片的上传 2023-01-14 01:32:53 +08:00
YunaiV
f48276d2bc mp：引入 wx-editor 组件 2023-01-14 00:57:35 +08:00
YunaiV
c0bd3471d5 mp：初步实现【草稿】的前端新增（优化，减少冗余代码） 2023-01-14 00:42:22 +08:00
YunaiV
4080d2de9b mp：初步实现【草稿】的前端新增 2023-01-14 00:17:35 +08:00
YunaiV
bc870434c2 mp：初始化【图文草稿箱】前端界面 2023-01-13 07:54:09 +08:00
YunaiV
1e63198f4a mp：完善【发布功能】的相关代码 2023-01-13 07:33:25 +08:00
YunaiV
9f7b646f6c mp：增加发送【图文】消息 2023-01-13 00:07:13 +08:00
YunaiV
02ccf52d6c mp：增加发送【图文】消息 2023-01-12 23:57:17 +08:00
YunaiV
5901ab6664 mp：增加 server 草稿箱的分页、添加；已发布的分页、提交 2023-01-12 22:49:55 +08:00
YunaiV
267b1790ec mp：支持发送【视频】消息时，支持新建视频 2023-01-12 20:50:13 +08:00
YunaiV
858b4e81a5 mp：优化前端消息发送的缓存逻辑 2023-01-12 20:25:00 +08:00
YunaiV
7ba6a2e385 mp：增加【视频】消息的发送 2023-01-12 19:47:25 +08:00
YunaiV
331af28fe7 mp：增加【语音】【视频】的素材选择 2023-01-12 16:53:13 +08:00
YunaiV
188d880239 mp：增加【图片】素材的选择 2023-01-12 13:51:46 +08:00
YunaiV
431569fd09 mp：后端增加上传永久素材的接口 2023-01-12 11:19:43 +08:00
YunaiV
32f152cc27 mp：支持 wx-reply 发送音乐消息 2023-01-12 09:06:25 +08:00
YunaiV
90e0ebc20f mp：支持 wx-reply 发送音频消息 2023-01-12 00:59:30 +08:00
YunaiV
29cf770457 mp：支持 wx-reply 发送图片消息 2023-01-12 00:24:04 +08:00
YunaiV
ec872c702c mp：增加上传临时素材的接口 2023-01-11 20:13:20 +08:00
zhang.xionghui
c9d242c7e1
fix: 
解决只有一个菜单时无法显示目录

Signed-off-by: zhang.xionghui <13834222683@163.com>
 2023-01-11 02:35:38 +00:00
YunaiV
541ee81300 mp：前端接入发送消息 2023-01-10 23:24:08 +08:00
YunaiV
6325dd288c mp：前端增加 message 消息的展示 2023-01-10 21:01:46 +08:00
YunaiV
9cf88d1929 mp：后端增加发送客服消息接口 2023-01-10 20:31:04 +08:00
zhang.xionghui
5bc61e4858
update yudao-ui-admin/src/styles/index.scss. 
修复tags页签超过屏幕后无法滚动导致无法选择后面的页签

Signed-off-by: zhang.xionghui <13834222683@163.com>
 2023-01-10 03:18:09 +00:00
YunaiV
f8eed5dd3f mp：初始化回复组件 2023-01-10 00:11:03 +08:00
YunaiV
b0386429fe mp：支持 wx-news、wx-location 类型的消息 2023-01-09 23:58:53 +08:00
YunaiV
9e4a978f85 mp：解决 wx-msg 的 css 问题 2023-01-09 12:20:31 +08:00
YunaiV
cc23ca2dcc mp：解决 wx-msg 的 css 问题 2023-01-08 23:45:50 +08:00
YunaiV
2b477a4dfb mp：实现 wx-msg 的消息列表的适配 2023-01-08 23:20:07 +08:00
YunaiV
df5e6161aa mp：重构 wx-msg 前的提交 2023-01-08 22:02:27 +08:00
YunaiV
94178998e5 mp：前端 message 增加 voice 语音的播放 2023-01-08 21:43:40 +08:00
YunaiV
8a5db8c1eb mp：前端 message 增加文本、图片、事件等的展示 2023-01-08 21:16:18 +08:00
YunaiV
18bf098a1a mp：前端 message 增加视频播放的逻辑 2023-01-08 20:18:51 +08:00
YunaiV
9ec2f8b60f mp：梳理 message 的前端和后端代码 2023-01-08 18:57:36 +08:00
YunaiV
2ac2af64d4 mp：实现 user 的 ui 界面 2023-01-08 17:33:11 +08:00
YunaiV
a341c44c4d mp：实现 tag 模块的前端界面 2023-01-08 12:12:31 +08:00
YunaiV
acee075260 mp：调整 tag 模块的整体结构 2023-01-08 10:08:30 +08:00
YunaiV
d6de233a47 mp：完成公众号的数据统计前端界面 2023-01-08 00:36:25 +08:00
YunaiV
d0934510af mp：完成公众号统计的用户累计数据、消息概况数据 2023-01-07 23:49:50 +08:00
YunaiV
09e200c364 mp：完成公众号统计的用户增减数据 2023-01-07 22:35:30 +08:00
YunaiV
b9246d1543 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp 
# Conflicts:
#	yudao-server/src/main/resources/application.yaml
 2023-01-07 18:57:04 +08:00
YunaiV
39b2afd506 mp：完成的公众号的管理界面 2023-01-07 18:31:04 +08:00
芋道源码
c499165fe5
!353 同步 增加webSocket 
Merge pull request !353 from xingyu/dev
 2023-01-07 01:29:03 +00:00
zy
38f9284593 fix:redis监控echarts图表不显示 2023-01-05 20:11:12 +08:00
xingyu
c5f29f18d3 Merge remote-tracking branch 'origin/master' into dev 2023-01-05 09:41:54 +08:00
YunaiV
24f0e4dd1f 1.6.6 发版：完善 Vue3 管理后台、新增 IP & 地区库 2023-01-04 22:36:38 +08:00
芋道源码
4c0275fbf4
!348 增加webSocket连接测试以及文件优化 
Merge pull request !348 from 咱哥丶/dev
 2023-01-04 14:30:40 +00:00
gaibu
29d2aad176 fix: 上传视频无法预览 2023-01-04 16:33:05 +08:00
咱哥丶
2d1ff0aff7 commit 增加webSocket 2023-01-02 22:53:55 +08:00
YunaiV
627cb39517 mp：完善公众号的账号管理 2023-01-01 20:39:47 +08:00
YunaiV
48520a456b Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/wechat-mp 
# Conflicts:
#	pom.xml
#	sql/mysql/ruoyi-vue-pro.sql
#	yudao-dependencies/pom.xml
#	yudao-framework/yudao-spring-boot-starter-biz-weixin/pom.xml
#	yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/sms/SmsCallbackController.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/admin-ui/static/js/4.js
#	yudao-server/src/main/resources/admin-ui/static/js/chunk-vendors.js
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-ui-admin/yarn.lock
 2023-01-01 18:11:23 +08:00
YunaiV
6f8384af70 增加《敏感词》《地区 & IP》文档 2022-12-31 19:30:07 +08:00
YunaiV
a83b8e8fbc 修复报错的单元测试 2022-12-30 00:27:14 +08:00
plimlips
2c02159384
update yudao-ui-admin/src/components/FileUpload/index.vue. 
后台一直使用 0 作为成功，所以前端也不应该使用200

Signed-off-by: plimlips <156839224@qq.com>
 2022-12-28 15:49:03 +00:00
芋道源码
258c1ddb70
!343 同步dev分支 
Merge pull request !343 from xingyu/dev
 2022-12-27 14:37:30 +00:00
xingyu
d86c36a151 vue2 圆角标签栏 2022-12-27 11:18:06 +08:00
YunaiV
92632c046c Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-framework/yudao-spring-boot-starter-web/src/main/java/cn/iocoder/yudao/framework/jackson/config/YudaoJacksonAutoConfiguration.java
#	yudao-module-pay/yudao-module-pay-biz/src/main/java/cn/iocoder/yudao/module/pay/service/notify/PayNotifyServiceImpl.java
#	yudao-ui-admin/src/views/mall/trade/order/index.vue
 2022-12-23 19:12:45 +08:00
YunaiV
7a4a6a3046 product：优化管理后台相关的接口 
area：增加地区列表界面
 2022-12-23 18:47:59 +08:00
xingyu
1bb1da5838 fix: 代码生成日期类型 LocalDateTime 2022-12-22 15:05:49 +08:00
luowenfeng
826a564abd 站内信开发 2022-12-17 16:41:14 +08:00
芋道源码
f9b4874ee9
!320 秒杀活动相关 
Merge pull request !320 from halfninety/feature/1.8.0-uniapp
 2022-12-13 02:04:54 +00:00
YunaiV
4a2cb33cd7 product：优化商品属性值的代码 2022-12-12 23:40:23 +08:00
YunaiV
98ca807d4b product：优化商品属性项的代码 2022-12-12 22:25:31 +08:00
YunaiV
7f131a3853 trade：增加用户 App 的订单分页和详情接口 2022-12-10 23:06:53 +08:00
YunaiV
b7d78a24a4 trade：完成管理后台的订单详情的简单对接 2022-12-10 21:02:32 +08:00
YunaiV
c5408965eb trade：增加管理后台的订单详情接口 2022-12-10 17:53:44 +08:00
YunaiV
fc48ab4928 trade：前端订单管理，联调接口 2022-12-10 17:06:34 +08:00
YunaiV
fc49f000ce trade：前端订单管理，联调接口 2022-12-10 11:52:11 +08:00
YunaiV
fac3e7c726 product：商品规格，调整成商品属性，避免和 sku 概念冲突 2022-12-08 21:12:35 +08:00
xingyu
57bfef8d24 修复 vue2 文字点选验证码 bug 2022-12-06 22:52:33 +08:00
xingyu
bfea385cc1 fix: 恢复默认端口80 2022-12-06 21:45:55 +08:00
xingyu
af0974cfb3 fix: import 2022-12-06 21:41:18 +08:00
xingyu
c720b1dff9 fix: 三方登录未携带租户 2022-12-06 21:30:44 +08:00
halfninety
6808d3c163 完成秒杀时段todo，秒杀时段商品添加timeIds 2022-12-03 15:46:26 +08:00
YunaiV
03c7e60092 发布 v1.6.5 版本！ 2022-12-01 09:30:11 +08:00
xingyu
314323f1ea chore: update vue 2.7.14 2022-11-29 23:50:39 +08:00
xingyu
50f96651c2 feat: 更换为let const 2022-11-29 23:26:58 +08:00
xingyu
b100d41da1 Merge remote-tracking branch 'origin/master' into feature/vue3 2022-11-29 23:25:39 +08:00
halfninety
61c4053cbb 前端修改秒杀相关文件存放地址 2022-11-29 23:25:01 +08:00
halfninety
54baad165d 秒杀时段新增修改时间段冲突校验。 
秒杀活动新增，修改，删除时对秒杀时段的秒杀活动数量进行修改
 2022-11-29 23:25:00 +08:00
halfninety
7bc1ae5f35 秒杀活动增删改查 2022-11-29 23:25:00 +08:00
halfninety
cd62c4d220 秒杀时段相关 2022-11-29 23:25:00 +08:00
halfninety
ea2a57f0a0 修改秒杀时段id 2022-11-29 23:24:59 +08:00
halfninety
83ee1c6129 秒杀活动，添加商品，分页查询 2022-11-29 23:24:59 +08:00
YunaiV
53dbf8d82e ！290 修复三级及以上菜单路由缓存失效问题 2022-11-29 22:33:44 +08:00
xingyu
4e860eb254 perf: 完善类型 2022-11-29 22:26:50 +08:00
YunaiV
d884303df6 trade：【交易售后】查询分页列表 2022-11-20 09:35:06 +08:00