Commit Graph

938 Commits (c6e1cc060a11303d6dbee793173b39d7dbc447d2)

Author SHA1 Message Date
lemon橪 12839eee8d 解决秒杀活动可能在首页出现的bug 2022-07-08 11:12:13 +08:00
Chopper 601a2e8d33 PC端分销用户绑定关系接口问题处理 2022-07-08 09:34:45 +08:00
mhhhh a3fe3a3743 修改隐私协议的判断 2022-07-07 18:25:27 +08:00
lemon橪 86fa39d7af 合并master 2022-07-06 17:33:08 +08:00
lemon橪 a785718715 修改回收站不能修改用户信息问题 2022-07-06 17:31:12 +08:00
OceansDeep d4eb17e573
!24 优化逻辑
Merge pull request !24 from OceansDeep/dev-gl
2022-07-06 08:43:21 +00:00
paulGao 994b700892 优化逻辑 2022-07-06 16:18:09 +08:00
mhhhh 317bf1cd47 增加商家后台打印发货单 2022-07-06 15:18:56 +08:00
lemon橪 8327639c23 优化看到的富文本大小问题 2022-07-05 18:27:01 +08:00
lemon橪 c1830df1a2 修改优化 2022-07-05 18:24:14 +08:00
lemon橪 590ceaf641 合并merge 2022-07-05 18:04:22 +08:00
lemon橪 c7b739e546 更换editor,可支持拖拽式上传 2022-07-05 18:04:04 +08:00
OceansDeep 42db858d61
!23 优化订单投诉显示
Merge pull request !23 from OceansDeep/dev-gl
2022-07-05 01:58:13 +00:00
paulGao 85349a197f 优化订单投诉显示 2022-07-04 18:36:05 +08:00
lemon橪 8ef3510c4b 修改pc显示商品详情图片问题 2022-07-04 18:33:40 +08:00
mhhhh 8d6fa2f19f 去掉隐私协议中的排序,分类 2022-06-30 10:25:38 +08:00
Chopper711 af975b9f46
update README.md. 2022-06-23 01:45:56 +00:00
OceansDeep 3de928ee14
!22 优化管理端促销相关文本,操作条件;优化k8s部署提交
Merge pull request !22 from OceansDeep/dev-gl
2022-06-22 02:56:27 +00:00
paulGao 0a5563e5e2 优化管理端促销相关文本,操作条件 2022-06-22 10:55:17 +08:00
paulGao f4b7068cd6 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl 2022-06-22 10:20:06 +08:00
lemon橪 2cb6f04465 更改统计图关键字 2022-06-21 16:57:32 +08:00
lemon橪 037a307ed1 pc端分销问题 2022-06-21 16:51:39 +08:00
lemon橪 cd81a6afb1 合并master 2022-06-17 18:50:54 +08:00
lemon橪 f930d73a6a 商品选择器显示零售商品批发商品 2022-06-17 18:50:30 +08:00
paulGao 23bae9efd5 优化k8s部署提交 2022-06-16 14:08:46 +08:00
OceansDeep 2880c21a26
!21 优化代码
Merge pull request !21 from OceansDeep/dev-gl
2022-06-16 01:24:18 +00:00
paulGao 274ac3f155 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl 2022-06-16 09:21:29 +08:00
paulGao c85d488de4 优化代码 2022-06-16 09:21:14 +08:00
lemon橪 92d58ea7e5 合并paulGao代码 2022-06-15 18:49:34 +08:00
lemon橪 9a3d202524 优化统计图显示 2022-06-15 18:48:43 +08:00
OceansDeep ba71eaeaaf
!20 适配优化的sql,将平台id改为0
Merge pull request !20 from OceansDeep/dev-gl
2022-06-08 08:16:55 +00:00
paulGao 273fdf2e84 适配优化的sql,将平台id改为0 2022-06-08 15:40:23 +08:00
lemon橪 59cfa0efb0 合并master 更改并提交内容 2022-06-07 10:22:42 +08:00
lemon橪 14d720beed 商家端刷新token 路径修改 2022-06-07 10:22:11 +08:00
Chopper 2dcfacd431 适配minio 2022-06-07 09:37:53 +08:00
mhhhh 71690cfd8f 修改title闪现undefined 2022-06-06 16:08:58 +08:00
Chopper d2c2da25b4 消费积分设置问题 2022-06-02 09:29:19 +08:00
mhhhh c3c29af8c7 吧配送模版费用为0的限制去掉 2022-06-01 13:56:29 +08:00
mhhhh e5f9f81ef7 解决冲突 2022-06-01 10:26:41 +08:00
mhhhh 0c0c903529 修改商家logo没有更换的问题 2022-06-01 10:13:53 +08:00
OceansDeep 115fa87ff2
!19 管理端商品详情增加批发商品信息展示
Merge pull request !19 from OceansDeep/dev-gl
2022-06-01 01:15:27 +00:00
paulGao bb40364aed 管理端商品详情增加批发商品信息展示 2022-06-01 09:04:36 +08:00
lemon橪 0e921de6c3 合并master 2022-05-31 11:17:29 +08:00
lemon橪 58eeed4bbd 解决商品分类控件-添加一个品种后重复添加问题 2022-05-31 11:17:05 +08:00
mhhhh 21289f5a92 修改logo缓存 2022-05-31 11:04:40 +08:00
mhhhh 0aec486291 修改logo接口缓存 2022-05-31 09:51:43 +08:00
OceansDeep 5c34245ba4
!18 修复编辑sku时,单独编辑的sku图片没有保存问题
Merge pull request !18 from OceansDeep/dev-gl
2022-05-30 06:45:42 +00:00
paulGao 3d0a202cbe 修复编辑sku时,单独编辑的sku图片没有保存问题 2022-05-30 14:44:36 +08:00
OceansDeep 66143deb0d
!17 增加批发商品的标识
Merge pull request !17 from OceansDeep/dev-gl
2022-05-27 10:28:17 +00:00
paulGao 2111020f62 Merge branch 'master' of gitee.com:beijing_hongye_huicheng/lilishop-ui into dev-gl 2022-05-27 18:27:20 +08:00