Commit Graph

230 Commits

Author SHA1 Message Date
owen
9b15c04efc 会员:后台调整会员等级
(cherry picked from commit 7bef240926)
2023-09-20 12:08:53 +08:00
YunaiV
e27733aed8 code review:签到记录
(cherry picked from commit be485cc4ab)
2023-09-19 21:04:40 +08:00
YunaiV
57df63dc35 code review:签到配置
(cherry picked from commit 82628ce780)
2023-09-19 21:04:29 +08:00
owen
8006325621 会员:增加会员等级增删改查
(cherry picked from commit f1735a4010)
2023-09-19 21:04:04 +08:00
YunaiV
5a0579e087 code review:会员签到配置
(cherry picked from commit 76a63e01c9)
2023-09-19 21:03:59 +08:00
puhui999
21643274cb 订单列表:列表重构 ①
(cherry picked from commit 2eb740765e)
2023-09-19 21:03:26 +08:00
owen
bcb0ed847e 会员:
1.增加会员标签功能

(cherry picked from commit 334962fe09)
2023-09-19 20:59:58 +08:00
YunaiV
779c6c760c 会员中心:会员管理 50%
(cherry picked from commit 4fd9dfd1f8)
2023-09-19 20:57:35 +08:00
xiaqing
a7f0c8d3a2 会员积分和会员签到模块todo修改
(cherry picked from commit 19444021ca)
2023-09-19 20:57:26 +08:00
puhui999
1854e891cb fix: 完善砍价活动管理对齐后端
(cherry picked from commit 44be35b5ce)
2023-09-19 20:53:01 +08:00
YunaiV
81d8e36ccc 商城:
1. 修复拼团活动,修改商品的拼团价格,会存在 *100 的问题

(cherry picked from commit 127e6b202e)
2023-09-19 20:50:49 +08:00
YunaiV
0fd07c0cbc 商城:
1. 调整优惠劵的目录
2. 简化秒杀时间配置

(cherry picked from commit 9984de0dc7)
2023-09-19 20:50:06 +08:00
YunaiV
a7610dbab3 code review:优化支付通知的实现
(cherry picked from commit 1ab7ea0640)
2023-09-19 20:45:22 +08:00
YunaiV
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c)
2023-09-19 20:44:38 +08:00
xiaqing
817548c825 会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码

(cherry picked from commit de941ec6ba)
2023-09-19 20:41:09 +08:00
xiaqing
0991528c17 会员签到针对代码格式、功能优化
1.优化todo建议
 2.删除无用代码

(cherry picked from commit f310f65842)
2023-09-19 20:40:40 +08:00
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a)
2023-09-19 20:39:21 +08:00
puhui999
541fc97796 feat: 完善砍价活动管理
(cherry picked from commit 4947716983)
2023-09-19 20:36:04 +08:00
YunaiV
f9be77efd4 bugfix:分配角色菜单时,调用接口 404 问题
(cherry picked from commit ef31ec7aaf)
2023-09-19 20:35:42 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4)
2023-09-19 20:25:26 +08:00
puhui999
da5ad39251 fix: combinationActivity 调整
(cherry picked from commit c327f79177)
2023-09-19 20:24:40 +08:00
YunaiV
4cef3e3e5f 登录时,直接从用户信息中,获取菜单。目的:加快首页的加载速度
(cherry picked from commit ee802d6335)
2023-09-19 19:59:19 +08:00
shizhong
74aac991bc 发布 1.8.0 版本 2023-07-27 20:53:52 +08:00
YunaiV
2104de6a71 review 秒杀、拼团活动的 CRUD
(cherry picked from commit a003b59e39)
2023-07-27 19:51:42 +08:00
puhui999
84d538ad69 fix: 完善拼团活动 CRUD
(cherry picked from commit dc39ad0cd1)
2023-07-27 19:45:36 +08:00
puhui999
85cc7cdb46 fix: mall SeckillConfig
(cherry picked from commit 3fd9f1b43e)
2023-07-27 19:43:51 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 4057130275)
2023-07-27 19:41:21 +08:00
puhui999
d1cc7d134b fix: mall SeckillActivity
(cherry picked from commit ce3ca7c6ce)
2023-07-27 19:41:03 +08:00
puhui999
de53abb249 fix: mall SeckillActivity
(cherry picked from commit 36c0bce184)
2023-07-27 19:40:57 +08:00
puhui999
1ab348f8df fix: mall SeckillActivity
(cherry picked from commit b98149f1a7)
2023-07-27 19:40:48 +08:00
puhui999
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c984)
2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d61)
2023-07-27 19:36:28 +08:00
puhui999
1d0d9d24ad fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
(cherry picked from commit 51e79f29cc)
2023-07-27 19:35:12 +08:00
YunaiV
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3)
2023-07-27 19:34:54 +08:00
puhui999
70c2fe409c fix:完善秒杀活动管理①
(cherry picked from commit b1e7f14963)
2023-07-27 19:33:06 +08:00
puhui999
7da1b04ae2 feat:添加秒杀活动管理
(cherry picked from commit 3d47d6744e)
2023-07-27 19:27:44 +08:00
xiaobai
1b5c983d1d 提交订单页面和详情页面 20230619
(cherry picked from commit 42a7aec0b5)
2023-07-27 19:15:56 +08:00
puhui999
0f9629707f feat: 完事秒杀时段管理
(cherry picked from commit f7b195b226)
2023-07-27 19:14:57 +08:00
puhui999
a233d16dbb feat: 秒杀时段管理
(cherry picked from commit a75720ec06)
2023-07-27 19:14:47 +08:00
YunaiV
8bf1f04044 code review:订单列表
(cherry picked from commit e3f250fff0)
2023-07-27 19:11:50 +08:00
xiaqing
98c977a732 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b3)
2023-07-27 19:06:34 +08:00
xiaobai
b9ba1d36c2 20230606 add trade-order and details
(cherry picked from commit 985d764f62)
2023-07-27 18:54:36 +08:00
YunaiV
f641785df9 code review:优惠劵管理
(cherry picked from commit 51e76ffd53)
2023-07-27 18:53:49 +08:00
shizhong
0d0b2265c6 !164 优惠券迁移vue3 Merge pull request !164 from dhb52/dev 2023-07-27 18:53:17 +08:00
YunaiV
16c518e18a code review:门店自提、快递运费
(cherry picked from commit 60c1604d49)
2023-07-27 18:46:14 +08:00
xiaobai
a29421dd41 临时提交
(cherry picked from commit 505f5cfa0c)
2023-07-27 18:44:50 +08:00
dhb52
e2faf6a2a4 style: 添加VO
(cherry picked from commit c5a7d05821)
2023-07-27 18:42:44 +08:00
puhui999
144be6ef44 fix: 完善 SPU 选择快递模版的功能
(cherry picked from commit 2ddb605076)
2023-07-27 13:11:05 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944)
2023-07-27 13:10:58 +08:00
jason
9e7fe34ae8 新增门店自提管理
(cherry picked from commit 000aa95012)
2023-07-27 13:10:46 +08:00
puhui999
cf7f4ff89e fix: 修改 review 提到的问题,完善分类选择层级校验、完整层级展示
(cherry picked from commit e555977757)
2023-07-27 13:09:36 +08:00
周建
b07cc98619 接口命名统一 2023-06-21 13:22:47 +08:00
jason
88439669c0 运费模板区域改成多选
(cherry picked from commit 70c5082776)
2023-06-13 14:15:44 +08:00
YunaiV
4cd4327bc8 review + mall:商品管理
(cherry picked from commit 0fba3fd503)
2023-06-13 14:13:55 +08:00
puhui999
4eacb6dd8c fix: 完善善品导出
(cherry picked from commit d877bfd26e)
2023-06-13 14:12:49 +08:00
jason
bbe9e667c4 运费模板性能优化。区域选择使用懒加载
(cherry picked from commit af2fb4bf5f)
2023-06-13 14:12:41 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题)
(cherry picked from commit 4e69f15128)
2023-06-13 14:10:52 +08:00
puhui999
4410bdd93c fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 0c42b76a52)
2023-06-13 14:07:22 +08:00
jason
4ec3d3fe72 新增快递公司菜单
(cherry picked from commit b0984c9013)
2023-06-13 14:06:19 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 4ddba9d454)
2023-06-13 14:06:16 +08:00
puhui999
74d926172c fix: 进一步完善商品列表,修复TODO
(cherry picked from commit 52bfc4dac0)
2023-06-13 14:05:48 +08:00
puhui999
478f02fa7c fix: 整合spu,移动相关类型到spu删除对应文件和文件夹
(cherry picked from commit 50b181318b)
2023-06-13 14:05:43 +08:00
shizhong
e81f8c51cb 修复后台”在线用户强退“功能 2023-06-13 14:03:52 +08:00
YunaiV
7a5993c584 code review 商品管理的实现
(cherry picked from commit e92361ed40)
2023-06-13 13:56:48 +08:00
puhui999
b9fd7b7753 商品管理: 打通所有接口(第一版)
(cherry picked from commit 0c6e3a39c9)
2023-06-13 13:56:04 +08:00
puhui999
263ca68ff1 商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显
(cherry picked from commit 9ee35fc165)
2023-06-13 13:55:51 +08:00
puhui999
2152573c5e 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 1116fb278b)
2023-06-13 13:55:48 +08:00
puhui999
72fd0b8ed5 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 6478d295df)
2023-06-13 13:55:44 +08:00
puhui999
4bb39f2578 商品管理: fix:根据商品属性动态生成表格值
(cherry picked from commit 538d1e0b6c)
2023-06-13 13:54:58 +08:00
puhui999
1a2d7a2f0e 商品管理: 初步完成相关组件
(cherry picked from commit 61218ae711)
2023-06-13 13:54:08 +08:00
puhui999
7a1a4e82d0 商品管理: 完善选择商品分类
(cherry picked from commit ab1685a741)
2023-06-13 13:53:11 +08:00
puhui999
083a0c4760 商品管理: 完善表单校验,优化信息提示,完成新建、编辑、提交逻辑
(cherry picked from commit c38abc365c)
2023-06-13 13:52:42 +08:00
YunaiV
6e604f9e07 调整商品分类的实现
(cherry picked from commit 9680a204ca)
2023-06-13 13:50:37 +08:00
dhb52
a737b267a8 refactor: mp模块统一accountId未初始化值为-1,删除QueryParams定义
(cherry picked from commit 198752868c)
2023-06-13 13:44:29 +08:00
shizhong
9b00e33ddb REVIEW 支付应用、支付订单 2023-06-13 12:22:27 +08:00
shizhong
c33a40623c REVIEW OA 请假 2023-06-13 12:11:09 +08:00
shizhong
68981b9153 REVIEW 单点登录界面 2023-06-13 12:02:05 +08:00
YunaiV
4f89c1edfe REVIEW 商品品牌
(cherry picked from commit 1e0f613449)
2023-06-13 12:00:03 +08:00
YunaiV
f9d0d5d38b REVIEW 公众号的粉丝管理
(cherry picked from commit 31dfa86783)
2023-06-13 11:59:55 +08:00
Aix
7992cd951e 【feature】新增商品品牌功能
(cherry picked from commit ef4f6bda5c)
2023-06-13 11:59:25 +08:00
shizhong
e83717e80e 修改 2023-06-13 11:43:05 +08:00
puhui999
fbff879504 完善SSO单点登录
(cherry picked from commit e22363d061)
2023-06-13 11:37:51 +08:00
puhui999
1103f8ff39 增加SSO单点登录
(cherry picked from commit 2d019f1bf9)
2023-06-13 11:36:09 +08:00
shizhong
47eac89d1e 1. 统一化代码 2. 增加 DocAlert 关联文档 2023-06-13 11:24:37 +08:00
Chika
8be4f31a1b 流程-已办任务路由中增加详情Model
(cherry picked from commit c1e760da6d)
2023-06-13 10:58:46 +08:00
gexinzhineng/gxzn27
b967c4e01e 错误提交 2023-04-03 16:11:12 +08:00
gexinzhineng/gxzn27
0e578f8d0a 回退vxe版本 2023-04-03 15:26:56 +08:00
YunaiV
a56a2f6099 REVIEW OAuth2 客户端 2023-04-02 11:05:51 +08:00
YunaiV
a319d090bb REVIEW 支付商户 2023-04-02 10:24:03 +08:00
YunaiV
5a5202d483 REVIEW 商品属性 2023-04-02 01:25:31 +08:00
芋道源码
616243a0ab
!83 商品属性模块
Merge pull request !83 from 孔思宇/feat/mall-product-property
2023-04-01 16:25:24 +00:00
芋道源码
59c44d9819
!82 商品分类管理
Merge pull request !82 from 孔思宇/feat/mall-product-category
2023-04-01 14:49:58 +00:00
YunaiV
7b700d875c REVIEW 角色管理(设置数据权限) 2023-04-01 22:30:02 +08:00
YunaiV
ecde723fa2 REVIEW 角色管理(设置菜单权限) 2023-04-01 17:45:31 +08:00
YunaiV
8810cb953e REVIEW 定时日志 2023-04-01 14:26:29 +08:00
YunaiV
cebe6f93db REVIEW 用户管理(导入用户) 2023-04-01 00:04:28 +08:00
YunaiV
0a69041602 REVIEW 用户管理(修改用户) 2023-03-31 23:34:19 +08:00
YunaiV
7d84f86081 REVIEW 用户管理(分配用户角色) 2023-03-31 13:40:57 +08:00
YunaiV
643b387367 REVIEW 用户管理(列表) 2023-03-31 07:54:33 +08:00
Siyu Kong
4906cecd14 feat: 新增商品属性api 2023-03-30 16:57:27 +08:00