YunaiV
|
13706de227
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
|
2024-10-13 21:46:38 +08:00 |
|
YunaiV
|
dcf1ad6b38
|
【代码优化】商城：门店自提的员工绑定
|
2024-10-13 09:47:12 +08:00 |
|
骄傲的熊
|
1d9532ca5a
|
余额权限修改
|
2024-10-04 23:18:02 +08:00 |
|
YunaiV
|
3e55015d77
|
Merge branch 'dev' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
# Conflicts:
# src/components/DiyEditor/components/mobile/PromotionCombination/index.vue
# src/views/ai/mindmap/manager/index.vue
|
2024-09-07 16:53:40 +08:00 |
|
preschooler
|
8c0380506c
|
🐞 fix:修复el-input、el-select、el-date-picker宽度
|
2024-08-31 17:39:48 +08:00 |
|
YunaiV
|
814f9ba9c6
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/promotion/rewardActivity/RewardForm.vue
|
2024-08-23 09:08:16 +08:00 |
|
puhui999
|
c45a5228e1
|
【代码优化】MALL: 会员修改余额
|
2024-08-22 11:27:51 +08:00 |
|
preschooler
|
de7a9a484c
|
🎈 perf:el-radio的label属性修改为value以兼容下个版本
|
2024-08-22 01:18:36 +08:00 |
|
芋道源码
|
1d07068806
|
回退 'Pull Request !505 : 【修复】el-input、el-select、el-date-picker宽度；el-radio的label属性兼容下个版本；优化iframe布局'
|
2024-08-21 13:41:32 +00:00 |
|
preschooler
|
d3dc508171
|
🐞 fix:修复搜索工具栏中el-input、el-select、el-date-picker宽度
|
2024-08-20 22:40:17 +08:00 |
|
preschooler
|
dea9ef8cd1
|
🎈 perf:el-radio的label属性修改为value以兼容下个版本
|
2024-08-20 22:40:13 +08:00 |
|
YunaiV
|
5dc11f844d
|
【代码评审】会员：会员详情的 TODO
|
2024-08-19 22:15:00 +08:00 |
|
puhui999
|
43ad93cd20
|
【代码优化】MALL: 会员修改余额
|
2024-08-19 18:04:46 +08:00 |
|
puhui999
|
ffdd3325dd
|
【代码优化】分支合并
|
2024-08-19 16:38:15 +08:00 |
|
芋道源码
|
fc5e37dd21
|
Merge pull request #78 from GoldenZqqq/Feature_MemberDetail
会员详情-余额tab页面开发
|
2024-08-19 13:07:35 +08:00 |
|
puhui999
|
231bdd1dd0
|
【新增】MALL: 会员列表增加修改余额操作
|
2024-08-19 11:54:29 +08:00 |
|
puhui999
|
b9c2d311ba
|
【新增】MALL: 会员详情增加售后管理界面
|
2024-08-19 10:50:10 +08:00 |
|
puhui999
|
ab7064037b
|
【新增】MALL: 会员详情增加钱包流水界面
|
2024-08-19 10:23:08 +08:00 |
|
GoldenZqqqq
|
687c96bb0e
|
feat: 会员详情-余额tab页面初始化；将查询会员账户信息接口调用逻辑抽取到父组件，方便余额tab页面使用
|
2024-08-18 21:42:00 +08:00 |
|
YunaiV
|
254d1e0322
|
【功能新增】商城：售后分页查询，支持 userId 过滤
|
2024-08-18 13:02:21 +08:00 |
|
黄兆琦
|
61fb71c010
|
chore: 增加TODO注释
|
2024-08-16 09:15:59 +08:00 |
|
黄兆琦
|
bcfb98cb37
|
feat: 初始化会员详情-售后管理页面
|
2024-08-15 16:28:35 +08:00 |
|
OnPeaceOfMind
|
6e7812a11b
|
fix: 🐞 修复会员和售后退款中订和单明细查询传递参数错误
Signed-off-by: OnPeaceOfMind <onpeaceofmind@qq.com>
|
2024-06-26 11:44:07 +00:00 |
|
YunaiV
|
249fe126ee
|
✨ 完善 MALL、CRM、ERP 文档说明
|
2024-02-26 20:23:14 +08:00 |
|
niou233
|
084009f7f2
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3
|
2023-11-08 17:30:04 +08:00 |
|
niou233
|
f2c71d5836
|
refactor: 会员商品收藏
|
2023-11-08 17:29:57 +08:00 |
|
dongshanshan
|
9a3253ad20
|
feat: 会员商品收藏
|
2023-10-31 16:53:44 +08:00 |
|
puhui999
|
ca385bc08e
|
解决列数据中的 table#header 数据不刷新的问题
|
2023-10-25 11:14:00 +08:00 |
|
puhui999
|
75135e1e4f
|
商品 spu 脱离优惠卷模块
|
2023-10-24 16:57:20 +08:00 |
|
芋道源码
|
4709c18a6e
|
!284 完善 SPU，订单列表：完善表头宽度自适应
Merge pull request !284 from puhui999/dev-to-dev
|
2023-10-21 11:08:44 +00:00 |
|
jason
|
bb5945958b
|
钱包 - 优化
支付应用 - 证书模式增加应用私钥
|
2023-10-21 15:33:31 +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 |
|
puhui999
|
70778fd9e6
|
UserOrderList 重构完善
|
2023-10-19 10:54:10 +08:00 |
|
YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 19:03:02 +08:00 |
|
jason
|
90d6f4da9f
|
钱包- 钱包余额查询
|
2023-10-15 17:47:36 +08:00 |
|
xingyu
|
e04ca7aac7
|
fix: unocss eslint
|
2023-10-13 10:34:01 +08:00 |
|
YunaiV
|
588ce1c9ae
|
trade：微调 order 列表界面
|
2023-10-01 23:44:38 +08:00 |
|
owen
|
3a96812d47
|
会员：会员配置的积分相关字段加上point前缀
|
2023-10-01 10:41:20 +08:00 |
|
owen
|
3ab1ed707f
|
会员：积分配置改为会员配置
|
2023-10-01 10:25:18 +08:00 |
|
owen
|
0066d79876
|
签到：签到后增加用户积分、经验
|
2023-10-01 09:53:52 +08:00 |
|
owen
|
4b7e57e67d
|
会员详情，修改会员积分
|
2023-09-30 15:50:12 +08:00 |
|
owen
|
940a102546
|
会员：会员详情-推广用户列表
|
2023-09-30 14:10:15 +08:00 |
|
owen
|
b48f19c646
|
会员：会员详情-优惠券列表
|
2023-09-30 13:55:42 +08:00 |
|
owen
|
675f3df5cb
|
会员详情，查询钱包信息
|
2023-09-30 12:40:21 +08:00 |
|
YunaiV
|
c6031ba2b2
|
增加 user detail 的 todo
|
2023-09-27 23:30:09 +08:00 |
|
YunaiV
|
539f8a5bb5
|
修复 member 详情无法展示的问题
|
2023-09-24 12:10:03 +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 |
|
xingyu
|
2a58e3f691
|
style: unocss eslint
|
2023-09-22 17:49:11 +08:00 |
|
xingyu
|
5494756a66
|
fix: eslint
|
2023-09-11 17:08:39 +08:00 |
|
YunaiV
|
0e2ea39591
|
code review：会员详情
|
2023-09-09 10:06:32 +08:00 |
|