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 |
|