104 Commits

Author SHA1 Message Date
puhui999
d4d41701ab 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
(cherry picked from commit b08e0e5ab275269cb8f2e391fd9019e9a2507400)
2024-03-05 16:48:39 +08:00
puhui999
848e0b7023 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
(cherry picked from commit 3500a20630463947c147f8fc4b99c1abf0d785db)
2024-03-05 16:33:41 +08:00
shizhong
f0cdee8e9a fix: 【工作流】--加签减签 2024-03-05 16:31:04 +08:00
风狗
a2c4cb22f4 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit aa5f27bec73a5c36a9f5baf612ed8a3ed177bcc3)
2024-03-05 16:05:34 +08:00
puhui999
9f836ad25b 拼团记录:优化页面布局,添加日期快捷选项
(cherry picked from commit 5b4983a3e97fe921fae06b3fa4d7fdb8fee09f42)
2024-03-05 16:04:54 +08:00
puhui999
8346717986 拼团记录: 完成 UI 部分
(cherry picked from commit eee3d0fef5e7b4cbfcd141b0835f6a0d60217a4c)
2024-03-05 16:04:27 +08:00
YunaiV
d9ec3f6e61 promotion:新增砍价记录列表
(cherry picked from commit 860872a8908db18fa2c87e3c5096bfc1c287f5a6)
2024-03-05 15:58:04 +08:00
owen
cbba91dac5 交易:核销
(cherry picked from commit 58b6b1ba578c1f869a82bfd028e86543092419e9)
2024-03-05 15:57:14 +08:00
YunaiV
6a8aa02960 trade:完善订单详情
(cherry picked from commit 4fddbccea17327c11f2a00be57b35a6495d219b6)
2024-03-05 15:53:59 +08:00
YunaiV
f1900d7717 product:优化商品列表的样式、实现代码
(cherry picked from commit 3a9668d63268576906d8f041cfc78fe42e3ba76b)
2024-03-05 15:53:27 +08:00
owen
05e6668322 会员详情,查询钱包信息
(cherry picked from commit 675f3df5cbc8623058ae75ef5a4ca4a92334b8d0)
2024-03-05 15:50:46 +08:00
owen
9b4bb4025b 统计:交易统计
(cherry picked from commit c322fb3d0d6624907fca85a2454a10e7bcc87083)
2024-03-05 15:50:37 +08:00
YunaiV
bf4ab7e58b trade:优化交易配置的参数校验
(cherry picked from commit 74de8e96874e12bccff57d7dcb6477b80bd3f14e)
2024-03-05 13:17:57 +08:00
shizhong
0670facae4 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:08:24 +08:00
owen
417be9f6ae Trade: 完善配置
(cherry picked from commit 21c67b1b75a965ad1de726f2c5760b69eb50858d)
2023-09-25 13:14:23 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理
(cherry picked from commit 854acf6e703c238056bd7a91a2f1f117ef5d5eea)
2023-09-25 12:48:07 +08:00
owen
3f127d4d44 trade: 分销业务review代码修改
(cherry picked from commit 18b6c70d1a2354f930cea3f388a1c28903ef1f1a)
2023-09-25 12:48:04 +08:00
owen
52def241f8 trade: 分销业务review代码修改
(cherry picked from commit 2e830d14d55b65a859306f4cc6982b9ee9ac9d14)
2023-09-25 12:43:29 +08:00
owen
4d1ecf7161 trade: 分销业务后台功能:推广订单列表
(cherry picked from commit 0582d41972cedcf4932348f64032cf0b9e43712c)
2023-09-25 12:43:25 +08:00
owen
9117f56533 trade: 分销业务后台功能:推广用户列表
(cherry picked from commit 2aa372d8f4319959fb6a4b660034c9905668562e)
2023-09-25 12:43:19 +08:00
YunaiV
ca0ec86913 code review:会员详情
(cherry picked from commit 0e2ea3959164c2b5719bb906ee5408e92890981b)
2023-09-25 12:41:27 +08:00
shizhong
fa0c84da02 Merge branch 'dev' of https://gitee.com/ls0/yudao-ui-admin-vue3 into dev 2023-09-25 12:40:29 +08:00
owen
ba8840de4f trade: 分销员表格佣金字段格式化
(cherry picked from commit dbb87e385038eacfa3b4a2ce7dd6f9c42dbb0c6f)
2023-09-25 12:38:37 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题
(cherry picked from commit 73628d39309854e7c086a660efe7dc866a7faceb)
2023-09-25 12:30:24 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。
(cherry picked from commit fe6cf7ce98d475039aedf296c426e164d53e6220)
2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录
(cherry picked from commit 73f8cef3b44569f48eef2c2fb2bef3b87864a36f)
2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置
(cherry picked from commit 5a9764c08c0a2c12cabd0416638313f9f4942db7)
2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构
(cherry picked from commit 46fd154e3a77189b9ad748e57e13ab7f2b6aae93)
2023-09-25 12:24:59 +08:00
YunaiV
fd501a1f5b code review:优惠劵逻辑
(cherry picked from commit d10530c9f5d731d3419e9adee60c4a7b3cb4213c)
2023-09-20 12:39:02 +08:00
YunaiV
2a280e8267 code review:优惠劵逻辑
(cherry picked from commit 4f7d6793fd09296d15c0c20e057619c477450ac2)
2023-09-20 12:38:39 +08:00
owen
842c922855 mall:优惠券发送优化
(cherry picked from commit 76c4644b4b9d292643672666fa06363e0c6c8908)
2023-09-20 12:38:35 +08:00
owen
c999b72692 mall:优惠券 商品适用范围,增加商品分类
(cherry picked from commit 27219e1833f49fa60acc2d7809f2f7497230a2e4)
2023-09-20 12:30:42 +08:00
YunaiV
b55b9966d6 code review:订单列表
(cherry picked from commit b8ca5800c6adb7225857b7b8756484d04f5ca8eb)
2023-09-20 12:22:48 +08:00
绮梦
72e494c532 重命名组件名称,增加用户地址查看api和页面、统一组件的props userId 变量名。
(cherry picked from commit 28951fb31d05de22ff264d1734852fa6013d0aa5)
2023-09-20 12:19:00 +08:00
puhui999
9d9ccaa1b8 完善 code review 提到的问题
(cherry picked from commit 7db6c121bb6e788bf4b05a0772a510cdcb3d9ed1)
2023-09-20 12:18:16 +08:00
YunaiV
46ab58ddf0 code review:订单列表、订单详情
(cherry picked from commit cfbc2ed74cd2854266746c88545affb85fb79551)
2023-09-20 12:14:05 +08:00
puhui999
99ef6f83ba 订单列表:列表重构: 完善订单发货、修改地址、订单调价、订单备注
(cherry picked from commit be143ea21b70f2281c3f302fbacfd7dc07ab3ed4)
2023-09-20 12:12:52 +08:00
puhui999
c89d08e22a 订单列表:列表重构 ② and 完善订单详情
(cherry picked from commit 345c09ee6ce5a3c8893bef56c8334573fb0d9bf8)
2023-09-20 12:10:57 +08:00
YunaiV
f48c55a0b6 code review:积分记录
(cherry picked from commit 4bc3f15571d7d5d5646e510744a444964ea767b5)
2023-09-19 21:04:10 +08:00
dhb52
149a463a6b fix: 支付管理/退款订单 对标 vue2
(cherry picked from commit 620a2009c3bd146ebda815bc7805fe369474cbb7)
2023-09-19 20:51:33 +08:00
YunaiV
db1e2beaf0 code review:优化收银台的实现,解决 TODO
(cherry picked from commit 7625e6757c92e5dc5cf76fdc33e31ff3625268d5)
2023-09-19 20:44:38 +08:00
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a998cff2120a6db82f6938ab1c2f206)
2023-09-19 20:39:21 +08:00
YunaiV
544adb9811 支付应用:模拟支付的添加代码优化
(cherry picked from commit a2fdff47df15822410ce53e7f6b9bfd5214e5bb9)
2023-09-19 20:32:24 +08:00
dhb52
3f479ecffc feat: 支付管理/应用信息(alpha)
(cherry picked from commit 323417b0d4afac0aa6aede6aae3c5d865efa47cb)
2023-09-19 20:25:26 +08:00
shizhong
b376e8e2a8 增加部门和菜单的详情,解决个人中心无法上传图片的问题 2023-08-22 17:33:04 +08:00
puhui999
0394f81dab fix: mall SeckillActivity and CombinationActivity
(cherry picked from commit 40571302753292182bb8a7052aae1fb6f3117503)
2023-07-27 19:41:21 +08:00
YunaiV
23fa3fe14c review 积分配置
(cherry picked from commit 4571f893ed93d3a012635a22137ecaff0ae34949)
2023-07-27 19:37:26 +08:00
puhui999
22f869db89 feat: mall CombinationActivity
(cherry picked from commit 2e96b1c9840b7adfbc8110eb3a36bd2b406dc392)
2023-07-27 19:36:45 +08:00
xiaqing
195ae79bfc 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d6167db0befecfacf2402511314eda6ec)
2023-07-27 19:36:28 +08:00
YunaiV
a22eea8e90 review 营销活动
(cherry picked from commit 5d613e69b3d651806f7710eebb2b14e5c7034097)
2023-07-27 19:34:54 +08:00