569 Commits (3fd9f1b43e42a10feb6fd04b2d9dbc2ab5f6edd6)

Author SHA1 Message Date
puhui999 3fd9f1b43e fix: mall SeckillConfig 3 years ago
puhui999 b67fabcf1f fix: mall SeckillActivity 3 years ago
puhui999 4057130275 fix: mall SeckillActivity and CombinationActivity 3 years ago
puhui999 ce3ca7c6ce fix: mall SeckillActivity 3 years ago
puhui999 36c0bce184 fix: mall SeckillActivity 3 years ago
puhui999 b98149f1a7 fix: mall SeckillActivity 3 years ago
puhui999 a5330958ba Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
YunaiV 4571f893ed review 积分配置 3 years ago
芋道源码 032d5a0a06
!178 会员中心(积分、签到)优化
Merge pull request !178 from QingX/dev
3 years ago
YunaiV b1ce2672e4 review 秒杀活动 3 years ago
puhui999 2e96b1c984 feat: mall CombinationActivity 3 years ago
xiaqing 4251dc5d61 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码
3 years ago
puhui999 341303b014 fix: 完善 mall seckillActivity add 3 years ago
puhui999 51e79f29cc fix: 封装 SpuSelect SpuAndSkuList 为商品活动商品选择商品编辑通用组件 3 years ago
puhui999 76ccc54a35 fix: 修复 spu 详情查看错误,同步 mall seckill 组件 name 配置方式 3 years ago
YunaiV 5d613e69b3 review 营销活动 3 years ago
芋道源码 fa71d3e7dd
!175 mall seckill
Merge pull request !175 from puhui999/dev-to-dev
3 years ago
puhui999 c9ae0fbdbe Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 b1e7f14963 fix:完善秒杀活动管理① 3 years ago
YunaiV 0395b8f138 review 订单 3 years ago
芋道源码 70a6d28edd
!174 订单列表和详情 页面
Merge pull request !174 from 矿泉水/dev
3 years ago
YunaiV e1b1c134d9 合并 master 代码的冲突 3 years ago
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
3 years ago
puhui999 3d47d6744e feat:添加秒杀活动管理 3 years ago
xingyu c1a4edf7b1 refactor: 统一 setup 格式 3 years ago
xingyu d639401646 fix: style lint 3 years ago
xingyu 922f83d99c refactor: vue3.3 defineOptions 3 years ago
xiaobai ca01b16096 提交订单列表和详情20230619 3 years ago
xiaobai 42a7aec0b5 提交订单页面和详情页面 20230619 3 years ago
puhui999 f7b195b226 feat: 完事秒杀时段管理 3 years ago
puhui999 ee698fd8b2 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 3 years ago
puhui999 a75720ec06 feat: 秒杀时段管理 3 years ago
YunaiV 91c53e2e3f code review:订单详情 3 years ago
YunaiV e3f250fff0 code review:订单列表 3 years ago
芋道源码 867c47de61
!165 trade-order 列表和详情初版
Merge pull request !165 from 矿泉水/dev
3 years ago
芋道源码 226cc03d65
!167 修复授权类型选项bug
Merge pull request !167 from wangzhaoqiang/dev_
3 years ago
YunaiV 467256cece 修复 SmsChannelForm.vue 排版报错问题 3 years ago
YunaiV ae69492b53 code review:spu todo 去掉 3 years ago
芋道源码 8ed92bcd46
!166 短信渠道提交失败
Merge pull request !166 from 圆梦巨人/master
3 years ago
YunaiV 7908160e68 Merge branch 'dev-to-dev' of https://gitee.com/puhui999/yudao-ui-admin-vue3 into dev
 Conflicts:
	src/utils/dict.ts
3 years ago
YunaiV 023539b0db Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
 Conflicts:
	package.json
	src/utils/dict.ts
3 years ago
xiaqing 1dca8476b3 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理
3 years ago
wangzhaoqiang 119b499a92 修复授权类型选项bug 3 years ago
puhui999 d31ade7a5f fix: 完善 SPU 相关路由 review 3 years ago
lwf bc34a73c9e 短信渠道提交失败 3 years ago
puhui999 20f3f72670 fix: 数组操作添加 ? 可选操作符,避免属性值为 null 时报错 3 years ago
puhui999 b89db1af55 fix: review 3 years ago
xiaobai e2d795f49d add trade order 20230606 3 years ago
xiaobai ec3b028d55 sync dev-20230606 3 years ago
xiaobai 985d764f62 20230606 add trade-order and details 3 years ago