Commit Graph

111 Commits (3860aaef6f41e02aa9bdec5528460b16cc770134)

Author SHA1 Message Date
puhui999 f88b26e3c3 多图上传组件优化 2024-01-20 17:31:10 +08:00
YunaiV 26bb847383 MALL:简化商品分类的 VO 转化 2024-01-13 22:58:32 +08:00
YunaiV d36c4ab36c MALL:去除分销提现的银行配置 2024-01-05 22:46:22 +08:00
xingyu 821c804189 fix: stylelint 2023-11-14 21:56:54 +08:00
YunaiV ac7f1e29fb Merge branch 'dev_tmp' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 2023-11-04 10:50:04 +08:00
风狗 bf418653e4
update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue.
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
2023-11-02 02:08:26 +00:00
puhui999 ca385bc08e 解决列数据中的 table#header 数据不刷新的问题 2023-10-25 11:14:00 +08:00
puhui999 d62bbcdd92 Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
#	package.json
#	src/views/member/user/detail/UserOrderList.vue
2023-10-20 16:40:19 +08:00
YunaiV 2457665b55 code review:门店自提 2023-10-20 09:46:15 +08:00
puhui999 5b3bcecef2 OrderTableColumn: 商品信息列样式调整2 2023-10-19 15:54:23 +08:00
puhui999 094f8e16db OrderTableColumn: 商品信息列样式调整 2023-10-19 11:10:33 +08:00
puhui999 5270c83876 订单列表:完善表头宽度自适应 2023-10-19 10:36:52 +08:00
puhui999 04d88ce1a6 订单列表:自定义列抽离封装为组件 2023-10-18 17:20:13 +08:00
owen ff01effd45 Merge remote-tracking branch 'origin/dev' into dev 2023-10-17 23:26:08 +08:00
owen 431fff28ce 统计卡片修改为全局组件 2023-10-17 23:25:49 +08:00
owen 61b3bdfd4c 交易:核销订单 2023-10-17 23:18:07 +08:00
芋道源码 40ec1b08ae
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
2023-10-17 12:52:28 +00:00
owen 6fc232b758 交易:订单核销 2023-10-17 16:09:36 +08:00
xingyu 1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
xingyu e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00
puhui999 3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
owen 58b6b1ba57 交易:核销 2023-10-04 10:51:35 +08:00
YunaiV 59ab6218ca trade:优化分销界面的 width 列宽度,和一些非空判断 2023-10-03 12:16:24 +08:00
YunaiV ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 2023-10-02 21:18:31 +08:00
YunaiV a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
YunaiV bb08f6f54f trade:完善退款详情 2023-10-02 15:44:26 +08:00
YunaiV 4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00
YunaiV 588ce1c9ae trade:微调 order 列表界面 2023-10-01 23:44:38 +08:00
YunaiV fb94ae9674 trade:退款理由的维护 2023-09-29 13:35:52 +08:00
YunaiV 04e02ffbd2 trade:分佣界面的微调 2023-09-28 16:38:51 +08:00
YunaiV 74de8e9687 trade:优化交易配置的参数校验 2023-09-28 15:29:15 +08:00
芋道源码 b9881f2941
!252 分销:Review代码修改
Merge pull request !252 from 疯狂的世界/brokerage
2023-09-25 00:37:31 +00:00
owen a5dd7f4a81 分销:修正分享海报 2023-09-24 23:18:50 +08:00
owen 2c22ef8ef1 分销:重命名提现类型字段 2023-09-24 22:32:10 +08:00
YunaiV ce78336fca Merge remote-tracking branch 'origin/dev' into dev 2023-09-24 12:10:14 +08:00
YunaiV e489627748 Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
#	src/views/mall/trade/order/index.vue
#	src/views/member/user/detail/index.vue
2023-09-24 12:00:10 +08:00
owen 21c67b1b75 Trade: 完善配置 2023-09-22 22:51:45 +08:00
xingyu 2a58e3f691 style: unocss eslint 2023-09-22 17:49:11 +08:00
芋道源码 df6a384321
!244 trade: 分销业务review代码修改
Merge pull request !244 from 疯狂的世界/brokerage
2023-09-19 17:12:27 +00:00
owen 854acf6e70 trade: 分销业务 - 佣金提现后台管理 2023-09-19 22:03:28 +08:00
owen 18b6c70d1a trade: 分销业务review代码修改 2023-09-19 16:37:50 +08:00
绮梦 245301452c 订单详情页面 请求详情接口改为真实携带的id 2023-09-19 13:57:26 +08:00
芋道源码 de615c2387
!241 完善分销功能
Merge pull request !241 from 疯狂的世界/brokerage
2023-09-12 15:19:33 +00:00
YunaiV 8b65a2866e code review:订单相关的逻辑 2023-09-12 23:14:53 +08:00
owen 2e830d14d5 trade: 分销业务review代码修改 2023-09-11 00:54:11 +08:00
owen 0582d41972 trade: 分销业务后台功能:推广订单列表 2023-09-10 23:30:43 +08:00
owen 2aa372d8f4 trade: 分销业务后台功能:推广用户列表 2023-09-10 22:32:38 +08:00
puhui999 615763d415 order:完善订单聚合搜索 2023-09-09 23:08:28 +08:00
puhui999 7e511d1e4f mall-order:修复 todo 提到的问题 2023-09-09 20:51:33 +08:00
owen 87ca916e69 trade: 分销业务后台功能:佣金格式化 2023-09-09 20:00:56 +08:00