puhui999
|
58502b1241
|
订单列表：优化订单列表页面结构
|
2023-08-24 14:34:35 +08:00 |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
2023-08-23 15:04:46 +08:00 |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
2023-08-23 00:43:40 +08:00 |
|
puhui999
|
5dceda614a
|
订单列表：列表重构 添加门店、物流检索条件
|
2023-08-22 18:47:31 +08:00 |
|
puhui999
|
83e780da06
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
2023-08-22 17:42:20 +08:00 |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
2023-08-22 17:36:47 +08:00 |
|
puhui999
|
ebcbe63d9b
|
订单列表：列表重构 ④ 移除测试数据
|
2023-08-22 11:01:20 +08:00 |
|
puhui999
|
71f9337d82
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-08-22 00:39:11 +08:00 |
|
puhui999
|
0d202a7a85
|
订单列表：列表重构 ③ 添加备注表单和发货表单
|
2023-08-22 00:38:44 +08:00 |
|
puhui999
|
345c09ee6c
|
订单列表：列表重构 ② and 完善订单详情
|
2023-08-21 22:39:21 +08:00 |
|
YunaiV
|
1db98698bd
|
优化商品属性的编辑按钮
|
2023-08-21 10:34:10 +08:00 |
|
puhui999
|
2eb740765e
|
订单列表：列表重构 ①
|
2023-08-20 02:16:13 +08:00 |
|
puhui999
|
44be35b5ce
|
fix: 完善砍价活动管理对齐后端
|
2023-08-17 10:52:40 +08:00 |
|
YunaiV
|
7bf3e41c61
|
商城：
1. 微调砍价活动的代码
|
2023-08-13 00:49:17 +08:00 |
|
YunaiV
|
127e6b202e
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
|
2023-08-13 00:07:04 +08:00 |
|
YunaiV
|
ff8bde207d
|
商城：
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
|
2023-08-12 16:25:05 +08:00 |
|
YunaiV
|
9984de0dc7
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
|
2023-08-12 11:39:29 +08:00 |
|
YunaiV
|
815897ca8b
|
商城：优惠劵的前端完善
|
2023-08-12 11:09:12 +08:00 |
|
YunaiV
|
98477ef433
|
修复时间检索，value format 错误，导致无法搜索的问题
|
2023-08-12 10:13:32 +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 |
|
芋道源码
|
7c87f94985
|
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
|
2023-08-05 06:20:20 +00:00 |
|
xingyu
|
003751a41c
|
fix: dialog
|
2023-08-04 21:44:55 +08:00 |
|
xingyu
|
784a1be8a1
|
chore: stylelint(use pnpm lint:style)
|
2023-08-04 21:33:00 +08:00 |
|
puhui999
|
c327f79177
|
fix: combinationActivity 调整
|
2023-08-02 23:58:32 +08:00 |
|
puhui999
|
0b06f36aa2
|
Merge remote-tracking branch 'yudao/master' into dev-to-dev
|
2023-08-02 21:14:06 +08:00 |
|
puhui999
|
73b918b4e9
|
fix: 修正 combinationActivity.data.ts
|
2023-08-01 10:23:15 +08:00 |
|
xingyu
|
8e78975521
|
fix: eslint
|
2023-07-29 12:55:51 +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
|
b67fabcf1f
|
fix: mall SeckillActivity
|
2023-07-05 22:26:18 +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 |
|
YunaiV
|
b1ce2672e4
|
review 秒杀活动
|
2023-07-02 21:46:04 +08:00 |
|
puhui999
|
2e96b1c984
|
feat: mall CombinationActivity
|
2023-07-02 19:22:57 +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
|
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 |
|
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 |
|
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 |
|