xiaqing
|
19444021ca
|
会员积分和会员签到模块todo修改
|
2023-08-19 14:10:11 +08:00 |
|
puhui999
|
44be35b5ce
|
fix: 完善砍价活动管理对齐后端
|
2023-08-17 10:52:40 +08:00 |
|
YunaiV
|
127e6b202e
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
|
2023-08-13 00:07:04 +08:00 |
|
YunaiV
|
9984de0dc7
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
|
2023-08-12 11:39:29 +08:00 |
|
YunaiV
|
90f22934da
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-08-12 09:43:01 +08:00 |
|
YunaiV
|
1ab7ea0640
|
code review：优化支付通知的实现
|
2023-08-11 07:58:08 +08:00 |
|
YunaiV
|
7625e6757c
|
code review：优化收银台的实现，解决 TODO
|
2023-08-10 23:30:37 +08:00 |
|
YunaiV
|
551ebbd41d
|
Merge branch 'master' of https://gitee.com/dhb52/yudao-ui-admin-vue3
Conflicts:
src/utils/constants.ts
|
2023-08-10 22:21:55 +08:00 |
|
xiaqing
|
de941ec6ba
|
会员积分针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
2023-08-09 20:59:54 +08:00 |
|
xiaqing
|
f310f65842
|
会员签到针对代码格式、功能优化
1.优化todo建议
2.删除无用代码
|
2023-08-09 16:14:00 +08:00 |
|
dhb52
|
a6eab3cc9a
|
feat: 支付功能迁移（初稿）
|
2023-08-06 23:25:07 +08:00 |
|
puhui999
|
79413e0ae2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-06 20:23:19 +08:00 |
|
puhui999
|
4947716983
|
feat: 完善砍价活动管理
|
2023-08-06 18:12:07 +08:00 |
|
YunaiV
|
0139443909
|
Merge remote-tracking branch 'origin/master'
|
2023-08-05 14:32:25 +08:00 |
|
YunaiV
|
ef31ec7aaf
|
bugfix：分配角色菜单时，调用接口 404 问题
|
2023-08-05 14:32:16 +08:00 |
|
芋道源码
|
7c87f94985
|
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
|
2023-08-05 06:20:20 +00:00 |
|
dhb52
|
323417b0d4
|
feat: 支付管理/应用信息(alpha)
|
2023-08-03 23:07:22 +08:00 |
|
puhui999
|
c327f79177
|
fix: combinationActivity 调整
|
2023-08-02 23:58:32 +08:00 |
|
YunaiV
|
ee802d6335
|
登录时，直接从用户信息中，获取菜单。目的：加快首页的加载速度
|
2023-07-29 09:28:45 +08:00 |
|
YunaiV
|
a003b59e39
|
review 秒杀、拼团活动的 CRUD
|
2023-07-26 19:22:26 +08:00 |
|
puhui999
|
dc39ad0cd1
|
fix: 完善拼团活动 CRUD
|
2023-07-14 17:35:35 +08:00 |
|
puhui999
|
3fd9f1b43e
|
fix: mall SeckillConfig
|
2023-07-10 16:39:22 +08:00 |
|
puhui999
|
4057130275
|
fix: mall SeckillActivity and CombinationActivity
|
2023-07-05 18:24:32 +08:00 |
|
puhui999
|
ce3ca7c6ce
|
fix: mall SeckillActivity
|
2023-07-05 17:12:53 +08:00 |
|
puhui999
|
36c0bce184
|
fix: mall SeckillActivity
|
2023-07-05 11:32:32 +08:00 |
|
puhui999
|
b98149f1a7
|
fix: mall SeckillActivity
|
2023-07-03 12:07:19 +08:00 |
|
puhui999
|
a5330958ba
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-07-03 07:59:34 +08:00 |
|
芋道源码
|
032d5a0a06
|
!178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
|
2023-07-02 13:48:08 +00:00 |
|
puhui999
|
2e96b1c984
|
feat: mall CombinationActivity
|
2023-07-02 19:22:57 +08:00 |
|
xiaqing
|
4251dc5d61
|
会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
|
2023-06-28 22:50:31 +08:00 |
|
puhui999
|
51e79f29cc
|
fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
|
2023-06-25 16:43:49 +08:00 |
|
YunaiV
|
5d613e69b3
|
review 营销活动
|
2023-06-24 18:53:57 +08:00 |
|
芋道源码
|
fa71d3e7dd
|
!175 mall seckill
Merge pull request !175 from puhui999/dev-to-dev
|
2023-06-24 04:57:14 +00:00 |
|
puhui999
|
b1e7f14963
|
fix：完善秒杀活动管理①
|
2023-06-24 01:48:07 +08:00 |
|
puhui999
|
3d47d6744e
|
feat：添加秒杀活动管理
|
2023-06-22 17:31:36 +08:00 |
|
xiaobai
|
ca01b16096
|
提交订单列表和详情20230619
|
2023-06-19 15:57:20 +08:00 |
|
xiaobai
|
42a7aec0b5
|
提交订单页面和详情页面 20230619
|
2023-06-19 12:42:43 +08:00 |
|
puhui999
|
f7b195b226
|
feat: 完事秒杀时段管理
|
2023-06-19 10:20:43 +08:00 |
|
puhui999
|
ee698fd8b2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-06-17 21:21:33 +08:00 |
|
puhui999
|
a75720ec06
|
feat: 秒杀时段管理
|
2023-06-17 21:20:28 +08:00 |
|
YunaiV
|
e3f250fff0
|
code review：订单列表
|
2023-06-17 21:02:29 +08:00 |
|
芋道源码
|
867c47de61
|
!165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
|
2023-06-17 11:04:12 +00:00 |
|
YunaiV
|
023539b0db
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
package.json
src/utils/dict.ts
|
2023-06-17 17:40:29 +08:00 |
|
xiaqing
|
1dca8476b3
|
初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
|
2023-06-10 20:57:16 +08:00 |
|
xiaobai
|
e2d795f49d
|
add trade order 20230606
|
2023-06-06 01:36:22 +08:00 |
|
xiaobai
|
ec3b028d55
|
sync dev-20230606
|
2023-06-06 01:25:22 +08:00 |
|
xiaobai
|
985d764f62
|
20230606 add trade-order and details
|
2023-06-06 01:08:38 +08:00 |
|
YunaiV
|
51e76ffd53
|
code review：优惠劵管理
|
2023-06-03 23:15:11 +08:00 |
|
芋道源码
|
7c6d7e8061
|
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
|
2023-06-03 15:02:05 +00:00 |
|
芋道源码
|
541b23c8c1
|
!159 完善商品查看详情，修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
|
2023-06-03 12:09:43 +00:00 |
|
YunaiV
|
60c1604d49
|
code review：门店自提、快递运费
|
2023-06-03 19:52:14 +08:00 |
|
xiaobai
|
505f5cfa0c
|
临时提交
|
2023-06-02 16:10:33 +08:00 |
|
dhb52
|
c5a7d05821
|
style: 添加VO
|
2023-06-01 18:08:23 +08:00 |
|
puhui999
|
91a5f8044c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-06-01 11:55:22 +08:00 |
|
puhui999
|
2ddb605076
|
fix: 完善 SPU 选择快递模版的功能
|
2023-05-31 15:37:26 +08:00 |
|
puhui999
|
39c92cb944
|
fix: 完善 SPU 查看详情
|
2023-05-31 14:42:45 +08:00 |
|
jason
|
000aa95012
|
新增门店自提管理
|
2023-05-30 21:21:04 +08:00 |
|
puhui999
|
e555977757
|
fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示
|
2023-05-30 18:14:40 +08:00 |
|
dhb52
|
c3b0403ade
|
Merge remote-tracking branch 'yudao/dev' into dev
|
2023-05-29 18:23:18 +08:00 |
|
jason
|
70c5082776
|
运费模板区域改成多选
|
2023-05-27 11:32:16 +08:00 |
|
dhb52
|
ed9f042975
|
feat: mall 优惠券 初稿
|
2023-05-26 18:19:39 +08:00 |
|
YunaiV
|
ae49aaffcf
|
Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/mall/product/spu/index.vue
|
2023-05-24 20:31:56 +08:00 |
|
YunaiV
|
0fba3fd503
|
review + mall：商品管理
|
2023-05-24 20:27:45 +08:00 |
|
puhui999
|
d877bfd26e
|
fix: 完善善品导出
|
2023-05-23 12:04:21 +08:00 |
|
jason
|
af2fb4bf5f
|
运费模板性能优化。区域选择使用懒加载
|
2023-05-22 23:10:22 +08:00 |
|
芋道源码
|
855e4d3d02
|
!153 提交商品管理第二版
Merge pull request !153 from puhui999/dev-to-dev
|
2023-05-21 16:01:53 +00:00 |
|
jason
|
4e69f15128
|
mall: 订单中心->运费模板(第一版 性能有问题)
|
2023-05-21 23:41:36 +08:00 |
|
puhui999
|
39e329b8a3
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-05-20 12:06:00 +08:00 |
|
puhui999
|
0c42b76a52
|
fix:解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
|
2023-05-19 17:04:13 +08:00 |
|
jason
|
b0984c9013
|
新增快递公司菜单
|
2023-05-18 23:40:39 +08:00 |
|
puhui999
|
4ddba9d454
|
fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
|
2023-05-17 18:24:34 +08:00 |
|
puhui999
|
52bfc4dac0
|
fix: 进一步完善商品列表，修复TODO
|
2023-05-17 01:17:17 +08:00 |
|
puhui999
|
50b181318b
|
fix: 整合spu，移动相关类型到spu删除对应文件和文件夹
|
2023-05-16 10:53:36 +08:00 |
|
YunaiV
|
16561b1238
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
build/vite/optimize.ts
|
2023-05-15 22:58:36 +08:00 |
|
cxr01
|
a788921d51
|
修复后台”在线用户强退“功能
|
2023-05-14 13:46:09 +08:00 |
|
YunaiV
|
e92361ed40
|
code review 商品管理的实现
|
2023-05-06 22:54:41 +08:00 |
|
puhui999
|
0c6e3a39c9
|
商品管理: 打通所有接口（第一版）
|
2023-05-04 01:38:53 +08:00 |
|
puhui999
|
9ee35fc165
|
商品管理: 调整相关组件优化逻辑,完成表单保存和数据回显
|
2023-05-03 02:28:35 +08:00 |
|
puhui999
|
1116fb278b
|
商品管理: 调整相关组件优化逻辑
|
2023-05-02 02:20:58 +08:00 |
|
puhui999
|
6478d295df
|
商品管理: 调整相关组件优化逻辑
|
2023-05-01 19:01:24 +08:00 |
|
puhui999
|
538d1e0b6c
|
商品管理: fix:根据商品属性动态生成表格值
|
2023-04-30 02:26:35 +08:00 |
|
puhui999
|
61218ae711
|
商品管理: 初步完成相关组件
|
2023-04-29 21:39:25 +08:00 |
|
puhui999
|
ab1685a741
|
商品管理: 完善选择商品分类
|
2023-04-26 17:53:17 +08:00 |
|
puhui999
|
5c52c17227
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-04-26 17:21:46 +08:00 |
|
puhui999
|
c38abc365c
|
商品管理: 完善表单校验，优化信息提示，完成新建、编辑、提交逻辑
|
2023-04-26 17:17:39 +08:00 |
|
芋道源码
|
0ceddc9c91
|
!137 MP模块重构，功能增强
Merge pull request !137 from dhb52/dev
|
2023-04-25 13:38:22 +00:00 |
|
YunaiV
|
9680a204ca
|
调整商品分类的实现
|
2023-04-25 21:02:35 +08:00 |
|
xingyu
|
6b7d092c29
|
fix: api error
|
2023-04-23 19:35:06 +08:00 |
|
dhb52
|
198752868c
|
refactor: mp模块统一accountId未初始化值为-1，删除QueryParams定义
|
2023-04-22 23:43:35 +08:00 |
|
YunaiV
|
e3660e0b20
|
REVIEW 站内信模版的发送
|
2023-04-15 17:07:41 +08:00 |
|
咱哥丶
|
776eb3a7b0
|
重构VUE3【站内信-模板管理】
|
2023-04-15 12:25:11 +08:00 |
|
YunaiV
|
8863d1d080
|
REVIEW 支付应用、支付订单
|
2023-04-11 20:41:20 +08:00 |
|
YunaiV
|
47b5ce2f35
|
REVIEW OA 请假
|
2023-04-09 18:32:26 +08:00 |
|
YunaiV
|
276e82c5a8
|
REVIEW 单点登录界面
|
2023-04-09 00:21:27 +08:00 |
|
芋道源码
|
0f0ba8b8a9
|
!95 新增SSO登录
Merge pull request !95 from puhui999/dev
|
2023-04-08 14:58:56 +00:00 |
|
YunaiV
|
1e0f613449
|
REVIEW 商品品牌
|
2023-04-08 22:49:51 +08:00 |
|
puhui999
|
841040b41e
|
Merge branch 'dev' of gitee.com:yudaocode/yudao-ui-admin-vue3 into dev
Signed-off-by: puhui999 <puhui999@163.com>
|
2023-04-08 14:44:20 +00:00 |
|
芋道源码
|
5f10efbf39
|
!104 新增商品品牌功能
Merge pull request !104 from Aix/dev
|
2023-04-08 14:32:55 +00:00 |
|
YunaiV
|
31dfa86783
|
REVIEW 公众号的粉丝管理
|
2023-04-08 22:32:04 +08:00 |
|
Aix
|
ef4f6bda5c
|
【feature】新增商品品牌功能
|
2023-04-08 20:31:52 +08:00 |
|