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 |
|
YunaiV
|
4571f893ed
|
review 积分配置
|
2023-07-02 23:18:45 +08:00 |
|
芋道源码
|
032d5a0a06
|
!178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
|
2023-07-02 13:48:08 +00:00 |
|
YunaiV
|
b1ce2672e4
|
review 秒杀活动
|
2023-07-02 21:46:04 +08: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
|
341303b014
|
fix: 完善 mall seckillActivity add
|
2023-06-25 17:16:26 +08:00 |
|
puhui999
|
51e79f29cc
|
fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件
|
2023-06-25 16:43:49 +08:00 |
|
puhui999
|
76ccc54a35
|
fix: 修复 spu 详情查看错误，同步 mall seckill 组件 name 配置方式
|
2023-06-25 09:35:20 +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
|
c9ae0fbdbe
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-06-24 01:48:36 +08:00 |
|
puhui999
|
b1e7f14963
|
fix：完善秒杀活动管理①
|
2023-06-24 01:48:07 +08:00 |
|
YunaiV
|
0395b8f138
|
review 订单
|
2023-06-23 21:28:41 +08:00 |
|
芋道源码
|
70a6d28edd
|
!174 订单列表和详情 页面
Merge pull request !174 from 矿泉水/dev
|
2023-06-23 13:23:02 +00:00 |
|
YunaiV
|
e1b1c134d9
|
合并 master 代码的冲突
|
2023-06-23 14:08:09 +08:00 |
|
YunaiV
|
b159240824
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
Conflicts:
src/views/infra/build/index.vue
src/views/mall/product/spu/components/DescriptionForm.vue
src/views/mall/product/spu/components/OtherSettingsForm.vue
src/views/mall/product/spu/components/ProductPropertyAddForm.vue
src/views/mall/product/spu/components/SkuList.vue
|
2023-06-23 13:54:43 +08:00 |
|
puhui999
|
3d47d6744e
|
feat：添加秒杀活动管理
|
2023-06-22 17:31:36 +08:00 |
|
xingyu
|
c1a4edf7b1
|
refactor: 统一 setup 格式
|
2023-06-21 19:35:11 +08:00 |
|
xingyu
|
d639401646
|
fix: style lint
|
2023-06-21 19:26:14 +08:00 |
|
xingyu
|
922f83d99c
|
refactor: vue3.3 defineOptions
|
2023-06-21 19:14:34 +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
|
91c53e2e3f
|
code review：订单详情
|
2023-06-17 21:12:20 +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 |
|
芋道源码
|
226cc03d65
|
!167 修复授权类型选项bug
Merge pull request !167 from wangzhaoqiang/dev_
|
2023-06-17 10:57:00 +00:00 |
|
YunaiV
|
467256cece
|
修复 SmsChannelForm.vue 排版报错问题
|
2023-06-17 18:54:57 +08:00 |
|
YunaiV
|
ae69492b53
|
code review：spu todo 去掉
|
2023-06-17 18:48:49 +08:00 |
|
芋道源码
|
8ed92bcd46
|
!166 短信渠道提交失败
Merge pull request !166 from 圆梦巨人/master
|
2023-06-17 10:48:26 +00:00 |
|
YunaiV
|
7908160e68
|
Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
Conflicts:
src/utils/dict.ts
|
2023-06-17 18:45:05 +08: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 |
|
wangzhaoqiang
|
119b499a92
|
修复授权类型选项bug
|
2023-06-08 16:25:32 +08:00 |
|
puhui999
|
d31ade7a5f
|
fix: 完善 SPU 相关路由 review
|
2023-06-07 18:31:28 +08:00 |
|
lwf
|
bc34a73c9e
|
短信渠道提交失败
|
2023-06-07 13:45:33 +08:00 |
|
puhui999
|
20f3f72670
|
fix: 数组操作添加 ? 可选操作符，避免属性值为 null 时报错
|
2023-06-07 08:59:03 +08:00 |
|
puhui999
|
b89db1af55
|
fix: review
|
2023-06-06 16:22:58 +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 |
|
puhui999
|
7fe8dee9ed
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-06-05 08:35:39 +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 |
|