puhui999
|
615763d415
|
order：完善订单聚合搜索
|
3 years ago |
|
puhui999
|
7e511d1e4f
|
mall-order：修复 todo 提到的问题
|
3 years ago |
owen
|
87ca916e69
|
trade: 分销业务后台功能：佣金格式化
|
3 years ago |
|
owen
|
5ed909263a
|
trade: 分销业务后台功能：修改上级推广人
|
3 years ago |
|
owen
|
7ea3571356
|
trade: 分销业务后台功能：清除推广员、修改推广资格
|
3 years ago |
YunaiV
|
0e2ea39591
|
code review：会员详情
|
3 years ago |
|
芋道源码
|
e3b9a15c26
|
!239 分销员表格佣金字段格式化
Merge pull request !239 from 疯狂的世界/brokerage
|
3 years ago |
|
YunaiV
|
3c315cf287
|
code review：完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
|
芋道源码
|
dbfabcbbb5
|
!238 完善订单详情和售后退款 TODO 提到的问题
Merge pull request !238 from puhui999/dev-to-dev
|
3 years ago |
|
owen
|
dbb87e3850
|
trade: 分销员表格佣金字段格式化
|
3 years ago |
|
owen
|
e9d5027e72
|
trade: 优化分销用户佣金字段名称
|
3 years ago |
|
owen
|
7263315412
|
trade: 优化分销用户绑定用户编号、绑定时间字段名称
|
3 years ago |
|
owen
|
34ce7f7ec5
|
trade: 分销用户管理
|
3 years ago |
|
puhui999
|
b3639977a7
|
完善订单详情
|
3 years ago |
|
puhui999
|
f44688d61c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
73628d3930
|
完善订单详情和售后退款 TODO 提到的问题
|
3 years ago |
|
owen
|
2ed5d12be8
|
trade: 分销业务从 member 模块 转移到 trade模块
|
3 years ago |
|
owen
|
35664d1f32
|
trade: 增加交易中心配置表
|
3 years ago |
|
puhui999
|
46fd154e3a
|
完善订单详情和售后退款日志展示样式重构
|
3 years ago |
|
owen
|
7887be6e92
|
mall：修复优惠券模板，固定日期范围保存失败
|
3 years ago |
|
owen
|
5f557c7be5
|
promotion: 优惠券模板 productSpuIds 改成 productScopeValues
|
3 years ago |
|
owen
|
a68acb096f
|
mall：修复优惠券发券弹窗样式
|
3 years ago |
|
YunaiV
|
d10530c9f5
|
code review：优惠劵逻辑
|
3 years ago |
|
芋道源码
|
9aa7ba3578
|
!230 mall：优惠券发送优化
Merge pull request !230 from 疯狂的世界/mall_coupon_send
|
3 years ago |
|
YunaiV
|
4f7d6793fd
|
code review：优惠劵逻辑
|
3 years ago |
|
owen
|
76c4644b4b
|
mall：优惠券发送优化
|
3 years ago |
|
芋道源码
|
190c6e384c
|
!225 优惠券
Merge pull request !225 from 疯狂的世界/owen_dev
|
3 years ago |
|
YunaiV
|
0743e4941c
|
code review：订单列表
|
3 years ago |
|
puhui999
|
f0249e94a5
|
订单管理：完善订单详情
|
3 years ago |
|
puhui999
|
07a0530fc9
|
售后退款：完善售后管理（列表、详情）
|
3 years ago |
|
puhui999
|
3e7945e437
|
fix: 修正合并差异
|
3 years ago |
|
puhui999
|
5035fc77e7
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# src/views/mall/product/spu/components/index.ts
# src/views/mall/product/spu/form/BasicInfoForm.vue
|
3 years ago |
|
YunaiV
|
3918fab1ec
|
code review
|
3 years ago |
|
puhui999
|
f9780b636c
|
fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式
|
3 years ago |
|
puhui999
|
264a29e451
|
更新订单和售后退款详情页面路由
|
3 years ago |
|
puhui999
|
688dad319e
|
订单列表：添加配送方式筛选
|
3 years ago |
|
puhui999
|
5c7796ca6f
|
商品列表：修复添加属性时会返回已存在属性值的问题
|
3 years ago |
|
puhui999
|
f5a1772464
|
订单售后列表：完善部分 TODO
|
3 years ago |
|
YunaiV
|
29b8d06ff2
|
code review：售后详情
|
3 years ago |
|
owen
|
27219e1833
|
mall：优惠券 商品适用范围，增加商品分类
|
3 years ago |
|
owen
|
60d2e3114b
|
mall：优惠券 商品选择组件
|
3 years ago |
|
puhui999
|
eea285b141
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
ed739aec55
|
订单售后列表：完善售后详情及相关操作
|
3 years ago |
|
YunaiV
|
8d026f0837
|
重构：商品详情界面的路由、文件路径
|
3 years ago |
|
puhui999
|
8a51c9c771
|
订单售后列表：初始化售后详情
|
3 years ago |
|
puhui999
|
4f81468695
|
订单售后列表：重构列表
|
3 years ago |
|
puhui999
|
8239ca474f
|
订单列表： 修复差异
|
3 years ago |
|
owen
|
beef6a0a94
|
mall: 完善后台发送优惠券
|
3 years ago |
|
YunaiV
|
5cd01903e4
|
code review：商品评论
|
3 years ago |
|
owen
|
3a15390090
|
商品评论：回复表单提取到单独的组件中
|
3 years ago |
|
owen
|
15971b6feb
|
商品评论：
1.移除scores，由后端自动计算
2.SPU、SKU选择组件，放到SPU组件目录下
|
3 years ago |
|
YunaiV
|
b8ca5800c6
|
code review：订单列表
|
3 years ago |
|
芋道源码
|
2605cb7de5
|
!217 完善 TODO 提到的问题，优化订单列表相关页面结构
Merge pull request !217 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
84c5eb9942
|
code review：商品评论
|
3 years ago |
|
owen
|
814b4631c9
|
商品：完善后台商品评论功能
|
3 years ago |
|
puhui999
|
58502b1241
|
订单列表：优化订单列表页面结构
|
3 years ago |
|
puhui999
|
7db6c121bb
|
完善 code review 提到的问题
|
3 years ago |
|
YunaiV
|
cfbc2ed74c
|
code review：订单列表、订单详情
|
3 years ago |
|
puhui999
|
5dceda614a
|
订单列表：列表重构 添加门店、物流检索条件
|
3 years ago |
|
puhui999
|
83e780da06
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
puhui999
|
be143ea21b
|
订单列表：列表重构: 完善订单发货、修改地址、订单调价、订单备注
|
3 years ago |
|
puhui999
|
ebcbe63d9b
|
订单列表：列表重构 ④ 移除测试数据
|
3 years ago |
|
puhui999
|
71f9337d82
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
0d202a7a85
|
订单列表：列表重构 ③ 添加备注表单和发货表单
|
3 years ago |
|
puhui999
|
345c09ee6c
|
订单列表：列表重构 ② and 完善订单详情
|
3 years ago |
|
YunaiV
|
1db98698bd
|
优化商品属性的编辑按钮
|
3 years ago |
|
puhui999
|
2eb740765e
|
订单列表：列表重构 ①
|
3 years ago |
|
puhui999
|
44be35b5ce
|
fix: 完善砍价活动管理对齐后端
|
3 years ago |
|
YunaiV
|
7bf3e41c61
|
商城：
1. 微调砍价活动的代码
|
3 years ago |
|
YunaiV
|
127e6b202e
|
商城：
1. 修复拼团活动，修改商品的拼团价格，会存在 *100 的问题
|
3 years ago |
|
YunaiV
|
ff8bde207d
|
商城：
1. 修复秒杀活动，修改商品的秒杀价格，会存在 *100 的问题
|
3 years ago |
|
YunaiV
|
9984de0dc7
|
商城：
1. 调整优惠劵的目录
2. 简化秒杀时间配置
|
3 years ago |
|
YunaiV
|
815897ca8b
|
商城：优惠劵的前端完善
|
3 years ago |
|
YunaiV
|
98477ef433
|
修复时间检索，value format 错误，导致无法搜索的问题
|
3 years ago |
|
puhui999
|
79413e0ae2
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
4947716983
|
feat: 完善砍价活动管理
|
3 years ago |
|
芋道源码
|
7c87f94985
|
!187 修正合并代码后前端不能正常启动的问题
Merge pull request !187 from puhui999/dev-to-dev
|
3 years ago |
xingyu
|
003751a41c
|
fix: dialog
|
3 years ago |
|
xingyu
|
784a1be8a1
|
chore: stylelint(use pnpm lint:style)
|
3 years ago |
|
puhui999
|
c327f79177
|
fix: combinationActivity 调整
|
3 years ago |
|
puhui999
|
0b06f36aa2
|
Merge remote-tracking branch 'yudao/master' into dev-to-dev
|
3 years ago |
|
puhui999
|
73b918b4e9
|
fix: 修正 combinationActivity.data.ts
|
3 years ago |
|
xingyu
|
8e78975521
|
fix: eslint
|
3 years ago |
|
YunaiV
|
a003b59e39
|
review 秒杀、拼团活动的 CRUD
|
3 years ago |
|
puhui999
|
dc39ad0cd1
|
fix: 完善拼团活动 CRUD
|
3 years ago |
|
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
|
b1ce2672e4
|
review 秒杀活动
|
3 years ago |
|
puhui999
|
2e96b1c984
|
feat: mall CombinationActivity
|
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
|
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 |
|
YunaiV
|
ae69492b53
|
code review：spu todo 去掉
|
3 years ago |
|
puhui999
|
d31ade7a5f
|
fix: 完善 SPU 相关路由 review
|
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 |
|
puhui999
|
7fe8dee9ed
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
YunaiV
|
51e76ffd53
|
code review：优惠劵管理
|
3 years ago |
|
芋道源码
|
7c6d7e8061
|
!164 优惠券迁移vue3
Merge pull request !164 from dhb52/dev
|
3 years ago |
|
puhui999
|
a1b45f80bc
|
fix: 优化 spu 相关路由配置
|
3 years ago |
|
YunaiV
|
158585670c
|
code review：商品管理
|
3 years ago |
|
芋道源码
|
541b23c8c1
|
!159 完善商品查看详情，修改了一些问题
Merge pull request !159 from puhui999/dev-to-dev
|
3 years ago |
|
YunaiV
|
60c1604d49
|
code review：门店自提、快递运费
|
3 years ago |
|
xiaobai
|
505f5cfa0c
|
临时提交
|
3 years ago |
dhb52
|
c5a7d05821
|
style: 添加VO
|
3 years ago |
|
puhui999
|
91a5f8044c
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
3 years ago |
|
puhui999
|
7fb6258bed
|
fix: 修复善品测试发现的问题
|
3 years ago |
|
puhui999
|
6a10a81f58
|
fix: 引入 v-dompurify-html 指令解决 v-html 的安全隐患
|
3 years ago |
|
puhui999
|
2ddb605076
|
fix: 完善 SPU 选择快递模版的功能
|
3 years ago |
|
puhui999
|
39c92cb944
|
fix: 完善 SPU 查看详情
|
3 years ago |
jason
|
000aa95012
|
新增门店自提管理
|
3 years ago |
|
puhui999
|
e555977757
|
fix: 修改 review 提到的问题，完善分类选择层级校验、完整层级展示
|
3 years ago |
|
dhb52
|
c3b0403ade
|
Merge remote-tracking branch 'yudao/dev' into dev
|
3 years ago |
|
jason
|
70c5082776
|
运费模板区域改成多选
|
3 years ago |
|
dhb52
|
ed9f042975
|
feat: mall 优惠券 初稿
|
3 years ago |
|
YunaiV
|
b12aefe46e
|
review + mall：快递公司管理
|
3 years ago |
|
YunaiV
|
349a39e72f
|
review + mall：商品管理
|
3 years ago |
|
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
|
3 years ago |
|
YunaiV
|
0fba3fd503
|
review + mall：商品管理
|
3 years ago |
|
puhui999
|
d877bfd26e
|
fix: 完善善品导出
|
3 years ago |
|
jason
|
c296c9e53d
|
运费模板表格样式调整
|
3 years ago |
|
jason
|
af2fb4bf5f
|
运费模板性能优化。区域选择使用懒加载
|
3 years ago |
|
芋道源码
|
855e4d3d02
|
!153 提交商品管理第二版
Merge pull request !153 from puhui999/dev-to-dev
|
3 years ago |