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
|
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
|
922f83d99c
|
refactor: vue3.3 defineOptions
|
2023-06-21 19:14:34 +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 |
|
YunaiV
|
ae69492b53
|
code review：spu todo 去掉
|
2023-06-17 18:48:49 +08:00 |
|
puhui999
|
d31ade7a5f
|
fix: 完善 SPU 相关路由 review
|
2023-06-07 18:31:28 +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 |
|
puhui999
|
a1b45f80bc
|
fix: 优化 spu 相关路由配置
|
2023-06-03 21:21:43 +08:00 |
|
YunaiV
|
158585670c
|
code review：商品管理
|
2023-06-03 20:50:07 +08: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
|
7fb6258bed
|
fix: 修复善品测试发现的问题
|
2023-06-01 11:54:39 +08:00 |
|
puhui999
|
6a10a81f58
|
fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患
|
2023-05-31 15:58:35 +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
|
b12aefe46e
|
review + mall：快递公司管理
|
2023-05-24 23:40:46 +08:00 |
|
YunaiV
|
349a39e72f
|
review + mall：商品管理
|
2023-05-24 20:32:38 +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
|
c296c9e53d
|
运费模板表格样式调整
|
2023-05-22 23:57:41 +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
|
38545e89c6
|
fix: 优化相关逻辑，修复遗留bug
|
2023-05-20 12:05:18 +08:00 |
|