huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-11-23 15:51:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,802 Commits 1 Branch 0 Tags 176 MiB
2f6092005b
Commit Graph

666 Commits

Author SHA1 Message Date
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
YunaiV
00e66216c5 trade：【交易售后】查询分页列表的前端 2022-11-20 01:05:03 +08:00
YunaiV
af71a19241 trade：【商品】sku 表增加 spu_name 字段，冗余 2022-11-19 12:25:53 +08:00
LAPTOP-CNV4CMCJ\cheng
b3cea2d4bf Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-19 00:40:19 +08:00
LAPTOP-CNV4CMCJ\cheng
78ae018320 新增退款列表页 调整商品列表页的tab切换 2022-11-19 00:40:13 +08:00
xingyu4j
7083d991fe refactor: verify 2022-11-17 10:37:23 +08:00
xingyu4j
042c4e8390 Merge remote-tracking branch 'origin/master' into feature/vue3 2022-11-14 09:15:19 +08:00
YunaiV
38d6b51fcc v3.8.4:优化页面内嵌iframe切换tab不刷新数据 2022-11-13 19:53:59 +08:00
xingyu4j
89bd2f6d9e Merge remote-tracking branch 'origin/master' into feature/vue3 2022-11-13 15:53:47 +08:00
xingyu4j
bdc988e5b7 fix: search 2022-11-13 13:16:21 +08:00
YunaiV
afc76973ce Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
# Conflicts:
#	yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/util/date/DateUtils.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponPageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/coupon/vo/CouponRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteBaseVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExcelVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteExportReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempletePageReqVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/controller/admin/templete/vo/CouponTempleteRespVO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/CouponTemplete/CouponTempleteDO.java
#	yudao-module-mall/yudao-module-coupon-biz/src/main/java/cn/iocoder/yudao/module/coupon/dal/dataobject/coupon/CouponDO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuPageReqVO.java
#	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/controller/admin/spu/vo/ProductSpuRespVO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/discount/DiscountProductDO.java
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/dal/dataobject/reward/RewardActivityDO.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/app/order/AppTradeOrderController.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/dal/dataobject/cart/TradeCartItemDO.java
#	yudao-module-member/yudao-module-member-api/src/main/java/cn/iocoder/yudao/module/member/api/user/dto/UserInfoDTO.java
#	yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/user/MemberUserServiceImpl.java
#	yudao-server/pom.xml
#	yudao-server/src/main/resources/application-local.yaml
#	yudao-server/src/main/resources/application.yaml
#	yudao-ui-admin/src/views/mall/CouponTemplete/index.vue
#	yudao-ui-admin/src/views/mall/product/property/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/index.vue
#	yudao-ui-admin/src/views/mall/product/spu/save.vue
#	yudao-ui-admin/src/views/system/role/index.vue
 2022-11-13 12:07:59 +08:00
YunaiV
85f83b9760 v3.8.4:修复table中更多按钮切换主题色未生效修复问题 2022-11-13 10:52:23 +08:00
YunaiV
2c43a72fcf v3.8.4:修复主题颜色在Drawer组件不会加载问题(I5VCF0)去除某些svg图标的fill="#bfbfbf"属性，避免菜单激活无法修改其填充颜色。 2022-11-13 10:46:37 +08:00
YunaiV
10d8607893 v3.8.4:修复主题颜色在Drawer组件不会加载问题(I5VCF0) 2022-11-13 10:44:38 +08:00
YunaiV
803bd5e3c4 v3.8.4:修复多文件上传报错出现的异常问题 2022-11-13 10:40:27 +08:00
YunaiV
1a60d0ceb3 v3.8.4:优化页面内嵌iframe切换tab不刷新数据 2022-11-13 10:31:02 +08:00
YunaiV
1999ac4ea9 v3.8.4:修复图片预览组件src属性为null值控制台报错问题(I5KBAS) 2022-11-13 10:21:45 +08:00
YunaiV
78f7e8a952 3.8.4:优化表格上右侧工具条（搜索按钮显隐&右侧样式凸出） 2022-11-13 10:14:49 +08:00
YunaiV
3310b766bc 【修复】工作流程-流程管理-流程模型，在发布完流程后，点击激活状态的按钮，显示“是否确认挂起流程名字为‘xxx’‘的数据项“，点击取消，前端显示的激活状态改变，但是数据库没有更新，报错 2022-11-12 19:09:43 +08:00
YunaiV
9e39356512 【修复】数据字典列表的 status 下拉无数据的情况 2022-11-12 17:39:50 +08:00
YunaiV
e4036842de 【修复】自定义 ICON 不生效的问题 2022-11-12 17:32:13 +08:00
YunaiV
7093ed3997 【修复】钉钉登录时，重定向后 type 丢失导致报错的问题 2022-11-12 13:27:46 +08:00
YunaiV
1dfb37b11f 修复用户直接点击登录界面的三方登录，报“租户的请求未传递，请进行排查”的错误 2022-11-12 11:12:38 +08:00
YunaiV
3fbb0b4c54 修复滑块验证码，存在失败的情况 2022-11-11 20:47:45 +08:00
YunaiV
93b8a2b6c1 1. 修复滑块验证码，存在失败的情况 
2. 重新构建 demo 预览项目
 2022-11-11 20:02:11 +08:00
芋道源码
c022755ec5
!278 调整前端配置管理中参数分类显示 
Merge pull request !278 from huzhibo/N/A
 2022-11-10 13:12:18 +00:00
YunaiV
d3b6a0ca69 1. 修复 refund/index.vue 的报错 
2. 优化 DateUtils 的工具类的方法命名
 2022-11-10 12:55:26 +08:00
xingyu4j
423256c0db fix 滑块验证码error 2022-11-10 09:47:10 +08:00
xingyu4j
18e11a56b5 回退sass版本 2022-11-10 09:27:00 +08:00
xingyu4j
0f40947721 升级部分依赖 2022-11-08 13:43:39 +08:00
xingyu4j
011dc23699 替换var 为const/let 
删除未使用import
替换 == 为 ===
 2022-11-08 13:31:08 +08:00
xingyu4j
c9e11e7636 fix slot-scope 2022-11-08 12:54:57 +08:00
xingyu4j
d730c50dee 修复代码警告 2022-11-08 12:26:06 +08:00
xingyu4j
fd30368628 update vue 2.7.0 2022-11-08 12:23:15 +08:00
xingyu4j
3fa8e69af0 update element-ui 2.15.10 2022-11-08 11:13:48 +08:00
LAPTOP-CNV4CMCJ\cheng
fb45f22533 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-08 00:16:15 +08:00
LAPTOP-CNV4CMCJ\cheng
ea5e6b2c0e 新增了订单详情 2022-11-08 00:16:08 +08:00
YunaiV
941782fb10 promotion：完善限时折扣的修改逻辑 2022-11-06 12:38:13 +08:00
YunaiV
6d48bd1ed8 promotion：完善限时折扣的添加逻辑 2022-11-06 00:48:07 +08:00
YunaiV
d4b7f4aaa0 promotion：增加限时折扣的基础代码 2022-11-05 19:13:43 +08:00
YunaiV
00f90e75d9 promotion：增加满减送活动的关闭功能 2022-11-05 10:52:09 +08:00
YunaiV
74b6ff1eef promotion：增加满减送活动的前端 50% 2022-11-05 00:14:02 +08:00
YunaiV
873b530652 promotion：增加优惠劵的回收操作 2022-11-04 21:17:37 +08:00
YunaiV
47c2dfa623 promotion：增加优惠劵的前端分页界面 100% 2022-11-04 19:17:17 +08:00
YunaiV
86b6b85934 promotion：增加优惠劵的前端分页界面 80% 2022-11-04 00:27:37 +08:00
YunaiV
8ae8a4a652 promotion：完善优惠劵模板的单元测试、禁用功能 2022-11-02 22:44:37 +08:00
YunaiV
e3a700b2d2 Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-11-02 22:19:40 +08:00
YunaiV
bd661296c0 promotion：完善优惠劵模板的功能 2022-11-02 22:19:33 +08:00
LAPTOP-CNV4CMCJ\cheng
63cb9eb47e Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-11-02 10:46:58 +08:00
LAPTOP-CNV4CMCJ\cheng
89fefc5f81 处理了商品订单的TODO 2022-11-02 10:46:42 +08:00
YunaiV
2aaeb7af88 promotion：实现部分优惠劵模板的前端表单 80% 2022-11-02 00:35:53 +08:00
YunaiV
dc51a93533 promotion：实现部分优惠劵模板的前端列表 2022-11-01 22:31:07 +08:00
YunaiV
3c10058dbd promotion：实现部分优惠劵模板的前端逻辑 2022-11-01 00:37:07 +08:00
YunaiV
035c2cf28c promotion：完善 优惠劵模板 表~ 2022-10-31 21:19:18 +08:00
YunaiV
cca27636b7 code review 订单列表.vue 界面 2022-10-31 10:09:10 +08:00
LAPTOP-CNV4CMCJ\cheng
e035e66ffd Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-27 16:49:53 +08:00
LAPTOP-CNV4CMCJ\cheng
dcb3f1c8f0 新增订单管理页面 2022-10-27 16:49:47 +08:00
luowenfeng
7dd12a3e81 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-27 10:30:27 +08:00
YunaiV
e1d5cfe8fe 微调 trade 交易表的设计 2022-10-26 21:25:29 +08:00
luowenfeng
20c79b7053 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-10-26 14:57:45 +08:00
YunaiV
356642ecea review 商品的 save 界面 2022-10-25 22:13:31 +08:00
luowenfeng
d92d257619 Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/dal/mysql/sku/ProductSkuMapper.java
	yudao-module-mall/yudao-module-product-biz/src/main/java/cn/iocoder/yudao/module/product/service/sku/ProductSkuServiceImpl.java
 2022-10-25 11:15:17 +08:00
YunaiV
7bf37fcb64 优化管理后台的商品分页的查询 2022-10-24 22:12:47 +08:00
YunaiV
c00ded3ed3 优化商品的 index 界面 2022-10-24 21:27:13 +08:00
luowenfeng
dc4e3fcd6e feature(商城): 商城review改 2022-10-24 10:30:47 +08:00
YunaiV
2bd2cb56a1 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	yudao-module-mall/yudao-module-trade-biz/pom.xml
 2022-10-23 22:16:54 +08:00
YunaiV
3cee922e69 优化 permission 相关的注释 2022-10-23 20:21:10 +08:00
YunaiV
a13fb61359 优化 pom.xml 文件，减少无用的多租户引用 2022-10-18 23:32:42 +08:00
luowenfeng
31f5b27d01 feature(uniapp分类): review 2022-10-17 19:55:46 +08:00
huzhibo
66cef17fa1
调整前端配置管理中参数分类显示 
Signed-off-by: huzhibo <527188553@qq.com>
 2022-10-13 10:57:13 +00:00
YunaiV
6b79788b5a 完善 oauth2.0 的注释 2022-10-06 20:00:38 +08:00
YunaiV
585d2a523b 修复登录的 redirect 地址，存在参数时，登录成功回跳的时候地址不正确的问题 2022-10-01 21:37:45 +08:00
YunaiV
ff54f16907 完成 yudao-sso-demo-by-code 刷新访问令牌 2022-10-01 20:49:11 +08:00
zhijiantianya@gmail.com
c25791047f mall: 商品的代码 review 2022-09-30 08:30:04 +00:00
YunaiV
2b784d180e 调整 sso 界面，移除多租户的选择 2022-09-29 21:17:08 +08:00
YunaiV
d26c78a0df Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-09-24 12:55:05 +08:00
luowenfeng
c7a2ed4a0b feature(管理后台): 商品管理 2022-09-22 11:40:19 +08:00
luowenfeng
77a676ee07 feature(管理后台): 商品列表 2022-09-21 19:40:07 +08:00
luowenfeng
fdb2d7339f feature(管理后台): 商品列表 2022-09-21 15:57:32 +08:00
luowenfeng
f122c0c509 feature(管理后台): 商品添加视频 2022-09-21 10:42:07 +08:00
luowenfeng
e2cd336a22 feature(管理后台): 规格值添加 2022-09-20 10:27:49 +08:00
luowenfeng
e1e55dc841 feature(商品添加): 规格调整连带商品调整 2022-09-14 11:57:30 +08:00
芋道源码
7643ed5a4b
!264 定时任务-调度日志-详细里面”执行时长“显示异常问题 
Merge pull request !264 from Vmo/master
 2022-09-10 13:48:02 +00:00
idevmo
378067fce7 定时任务-调度日志-详细里面”执行时长“显示异常的问题 2022-09-09 10:16:44 +08:00
YunaiV
9632c33d27 mall：优化商品的分类、品牌的代码 2022-09-05 20:03:13 +08:00
YunaiV
1bd1c79ff3 mall：code review 商品模块的代码 2022-09-05 00:14:17 +08:00
YunaiV
37e948cc1b Merge remote-tracking branch 'origin/feature/1.8.0-uniapp' into feature/1.8.0-uniapp 2022-09-04 23:15:36 +08:00
wuxiran
02aede0417 1、修改coupon的页面、以及增加coupon的enum 2022-09-04 22:52:28 +08:00
YunaiV
833fd33844 Merge branch 'master' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 
 Conflicts:
	sql/optional/mall/mall.sql
 2022-09-04 21:06:28 +08:00
芋道源码
dd6dc2ac3d
!246 集成aj-captcha 
Merge pull request !246 from xingyu/master
 2022-09-04 09:45:54 +00:00
YunaiV
1a48301cee vue2 验证码，增加开关、修复对社交登录的支持 2022-09-04 12:18:12 +08:00
芋道源码
d918b14e90
!260 增加servicetask的完成和todo高亮，增加servicetask节点的hover显示内容 
Merge pull request !260 from FinalFinancialFreedom/N/A
 2022-09-03 02:25:58 +00:00
luowenfeng
ab6fd30551 feature(uniapp商品): 商品功能完善 2022-09-01 15:28:05 +08:00
luowenfeng
198b1189e8 feature(uniapp商品): 商品修改 2022-09-01 11:00:40 +08:00
luowenfeng
4207b2b61d feature(uniapp商品): 商品加载 2022-08-31 18:52:26 +08:00
FinalFinancialFreedom
4c8b0ef430
增加servicetask的完成和todo高亮，增加servicetask节点的hover显示内容 
Signed-off-by: FinalFinancialFreedom <li.acerphoenix@gmail.com>
 2022-08-29 08:43:12 +00:00
wangjun
e25b73b7d9 修复不退出模拟直接保存模型，后续分配规则报错 2022-08-26 09:33:53 +08:00
luowenfeng
edfe379848 feature(uniapp商品): 多规格新增 2022-08-23 21:06:59 +08:00
luowenfeng
8ad1439fda feature(uniapp商品): 新增商品 2022-08-23 20:27:39 +08:00
YunaiV
185ea9e861 发布 1.6.4 版本：新增 uniapp 管理后台、数据报表设计器 2022-08-23 08:41:20 +08:00
luowenfeng
8de29d302c feature(uniapp商品): 新增商品数据 2022-08-22 21:20:49 +08:00
luowenfeng
617573a59b feature(uniapp分类): 商品创建功能以及查询功能正常使用 2022-08-22 20:43:12 +08:00
xingyu
020535ab3a Merge branch 'master' of gitee.com:zhijiantianya/ruoyi-vue-pro into master 
Signed-off-by: xingyu <xingyu4j@vip.qq.com>
 2022-08-22 00:57:43 +00:00
芋道源码
b5d458f1c4
!143 decodeFields 增加表单初始化能力, 完美支持子级元素 
Merge pull request !143 from ziv/master
 2022-08-19 12:20:20 +00:00
CorrectRoadH
c691c440bd 解决没有isObjectObject这个函数的问题 2022-08-19 15:00:54 +08:00
CorrectRoadH
b604cbedb9 拿不到数据的问题 2022-08-19 14:58:18 +08:00
luowenfeng
de27f4c2db Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp 2022-08-18 22:39:48 +08:00
luowenfeng
07e5e1b59f feature(管理后台): 商品弹窗 2022-08-18 22:38:51 +08:00
ycak47
74f12e0b9f 优化el-dialog 
1.设置默认点击背景不关闭dialog（这个很容易误操作，体验较差）
2.el-dialog内容较多时，滚动条限定在内部而不撑开父页面的滚动条
3.代码生成的el-dialog默认添加 v-dialogDrag属性（可拖拽移动）
 2022-08-16 17:07:07 +08:00
wuxiran
d505b64b8f mall:还原 2022-08-16 00:38:22 +08:00
wuxiran
c8ec5c8952 mall:上传enum类，做后端模板添加判定、前端页面添加 2022-08-16 00:26:44 +08:00
xingyu4j
066f0cf652 压缩图片尺寸 2022-08-07 21:50:17 +08:00
luowenfeng
10caa6e824 fix(管理后台菜单): 控制台异常 2022-08-06 11:15:28 +08:00
luowenfeng
55bc9b0616 feature(uniapp商品): 全局函数 2022-08-03 15:55:32 +08:00
xingyu
da0ab98fae revert 2022-08-03 13:38:02 +08:00
xingyu
e477179cd5 refactor: store action name 2022-08-03 13:38:02 +08:00
xingyu
9ca4b49b17 vue2 增加 AJ-Captcha 二次验证 2022-08-03 13:38:02 +08:00
xingyu
b78378ce44 AJ-Captcha vue2 增加验证码二次校验 2022-08-03 13:38:02 +08:00
xingyu
02224ad6b5 vue2 端口 2022-08-03 13:38:02 +08:00