huangge1199/vue-pro
1
0
Fork 0
mirror of https://gitee.com/huangge1199_admin/vue-pro.git synced 2024-12-05 05:31:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,183 Commits 1 Branch 0 Tags 176 MiB
383439f902
Commit Graph

5183 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
YunaiV
1452f6b231 mall + trade：增肌爱 TradeCouponPriceCalculator 的单元测试 2023-06-03 11:53:40 +08:00
YunaiV
636b14ccce mall + trade：创建订单逻辑，接入新的价格接口 2023-06-03 09:14:51 +08:00
YunaiV
2a9a869e01 mall + trade：获得订单结算信息，接入支付接口 2023-06-03 00:46:56 +08:00
zbk
51cf5b7c67
富文本编辑器自动聚焦问题 update yudao-ui-admin/src/components/Editor/index.vue. 
修复富文本编辑器自动聚焦问题；
思路：初始化时初始化只读模式的编辑器，因为只读模式的编辑器不会因为聚焦问题带跑滚动条，然后根据传递的是否只读参数设置编辑器是否启用。

Signed-off-by: zbk <540064991@qq.com>
 2023-06-01 03:57:13 +00:00
puhui999
e41935ea1d Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	yudao-module-mall/yudao-module-promotion-biz/src/main/java/cn/iocoder/yudao/module/promotion/api/price/PriceApiImpl.java
#	yudao-module-mall/yudao-module-trade-biz/src/main/java/cn/iocoder/yudao/module/trade/controller/admin/delivery/vo/expresstemplate/DeliveryExpressTemplateSimpleRespVO.java
 2023-06-01 11:44:16 +08:00
puhui999
8d2bcc57aa fix: 完善商品管理 2023-06-01 11:41:26 +08:00
YunaiV
5de8fa2e42 mall + trade：解决报错问题 2023-05-31 21:17:35 +08:00
puhui999
e86214015d fix: 完善商品管理 2023-05-31 16:39:43 +08:00
YunaiV
e34eddc386 mall + trade：review 自提代码 2023-05-31 09:18:24 +08:00
jason
894b19b8ec 新增自提门店管理 2023-05-30 21:18:30 +08:00
jason
f8db53896f review 修改 2023-05-30 21:17:51 +08:00
puhui999
35daee84e7 fix: 解决合并代码后项目运行失败的问题，相关问题已标注 TODO 2023-05-30 10:26:42 +08:00
puhui999
fcaa92d406 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 2023-05-30 09:46:31 +08:00
YunaiV
382c3a4699 v1.7.3 版本发布啦~~~ 2023-05-29 23:13:45 +08:00
芋道源码
151f659c99
!490 MailLogServiceImpl编译报错 
Merge pull request !490 from PeterChina/master
 2023-05-29 13:23:52 +00:00
JiangQi
8004a11036 master代码错误 2023-05-29 09:17:11 +08:00
YunaiV
406f69e21d Merge remote-tracking branch 'origin/master' 2023-05-29 00:05:14 +08:00
YunaiV
cc049566d1 修复邮件日志 sendTime 类型不一致（应该为 LocalDateTime） 2023-05-29 00:05:06 +08:00
芋道源码
5ffed46288
!489 bugfix:解决公众号粉丝同步api配置错误 
Merge pull request !489 from VT1996/master
 2023-05-28 15:53:48 +00:00
YunaiV
6bdc31a315 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product 2023-05-28 23:16:18 +08:00
YunaiV
0631c51d93 mall + trade：review 配置管理列表 2023-05-28 23:16:11 +08:00
YunaiV
6a9146ff8d mall + trade：调整价格计算的逻辑 2023-05-28 20:09:51 +08:00
VT1996
22c70df111 bugfix:解决公众号粉丝同步api配置错误 2023-05-28 14:56:41 +08:00
jason
55dbff7570 运费模板 review 修改. 运费模块可以选择多个区域 2023-05-27 11:20:43 +08:00
YunaiV
02fa6fc5c6 mall + trade：调整价格字段，更易懂 2023-05-26 23:58:26 +08:00
YunaiV
0083d12404 mall：review + mall：快递费用 2023-05-25 22:51:38 +08:00
puhui999
b065a2a741 fix:修复商品 review 提到的问题 2023-05-25 09:23:38 +08:00
YunaiV
53e9be733f mall：review + mall：快递公司管理 2023-05-24 23:40:55 +08:00
YunaiV
c62da6a056 mall：review 商品接口 2023-05-23 23:27:15 +08:00
芋道源码
fb7915c917
!487 完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试 
Merge pull request !487 from puhui999/feature/mall_product
 2023-05-23 12:32:05 +00:00
puhui999
a70c7ca855 fix:完善 mall.sql 2023-05-23 11:59:48 +08:00
puhui999
d08b9530a2 Merge remote-tracking branch 'yudao/feature/mall_product' into feature/mall_product 
# Conflicts:
#	sql/mysql/optional/mall.sql
 2023-05-23 11:08:32 +08:00
puhui999
cac5545762 fix：完善商品管理, 完善 mall.sql, 完善 product 测试相关sql, 完善 ProductSpuServiceImplTest 测试 2023-05-23 11:01:40 +08:00
jason
16956a6501 运费模板，区域选择使用懒加载优化性能 2023-05-22 23:08:21 +08:00
YunaiV
3672c217f8 mall：售后分页接口的 mock 2023-05-22 00:03:11 +08:00
芋道源码
7bfb426a9d
!484 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 
Merge pull request !484 from Rundeepin/feature/mall_product
 2023-05-21 15:38:48 +00:00
芋道源码
3b92042d4b
!485 发送邮件逻辑优化，邮件标题支持模版参数 
Merge pull request !485 from 傲世孤尘/feature/20230519
 2023-05-21 15:35:37 +00:00
jason
01a67289a9 mall: 订单中心新增运费模板功能 2023-05-21 23:35:07 +08:00
芋道源码
02e22c664d
Merge pull request #274 from alexli0707/fix/easyexcel-bug 
fix: 修复easyexecl3.3.0 bug引起导出表格异常(java.lang.NoClassDefFoundError: com…
 2023-05-21 23:23:05 +08:00
YunaiV
e942b52a67 mall：订单详情：调整售后字段 2023-05-21 12:18:52 +08:00
YunaiV
e745bb6675 mall：订单列表：增加订单类型的接入 2023-05-20 11:22:43 +08:00
YunaiV
be7c664e07 mall：订单统计接口 2023-05-20 10:11:38 +08:00
YunaiV
83aa656bda mall：增加订单评论字段 2023-05-19 23:55:02 +08:00
杨文
e25099a49e 发送邮件逻辑优化，邮件标题支持模版参数 2023-05-19 11:08:56 +08:00
崔家辉
fbeaa06100 bugfix: 解决不同模块错误码区间冲突、部分错误码重复错误 2023-05-19 10:47:23 +08:00
jason
3da2eb89b2 新增快递公司功能 2023-05-18 23:37:56 +08:00
walker_lee
39e52cb145 fix: 修复easyexecl3.3.0 bug引起导出表格异常(java.lang.NoClassDefFoundError: com/alibaba/excel/support/util/CollectionUtils),详见https://github.com/alibaba/easyexcel/issues/3174 2023-05-18 17:30:54 +08:00
YunaiV
f129eab36f REVIEW 物流配送管理表 2023-05-16 21:41:40 +08:00
YunaiV
db73ddc942 REVIEW 物流配送管理表 2023-05-16 19:17:25 +08:00
YunaiV
8ed52701fd 调整商品收藏的命名 2023-05-16 19:14:00 +08:00