56 Commits

Author SHA1 Message Date
YunaiV
affd0c52f2 crm:增加合同 List 组件
(cherry picked from commit 31a42fc3f72a11f06b0900541f095e763fbe222b)
2024-03-06 21:21:29 +08:00
YunaiV
993cb4f216 crm:完善数据权限的界面
(cherry picked from commit 5f26c4afe9b4cc0617856d3d04598d896e324a34)
2024-03-06 21:21:11 +08:00
YunaiV
98c046ecd7 crm:code review 成员
(cherry picked from commit eb97447bb764b49e2d88f83e8a6ebd0b9c37c127)
2024-03-06 21:03:22 +08:00
puhui999
6da65b76d0 crm-数据权限:完善团队成员公共组件
(cherry picked from commit 19a0a83054f73c84a2d5600ef6a1c22e1c68e134)
2024-03-06 20:53:41 +08:00
ZanGe丶
618cf7459a 【crm:产品及产品分类】
(cherry picked from commit ff6f05df84c223f6df7676f1ffd2a5da09813c18)
2024-03-05 17:49:15 +08:00
YunaiV
98fc2fe327 优化:社交登录、用户的管理
(cherry picked from commit a9b91e743645b8510dd585ac7772794f32638548)
2024-03-05 17:44:12 +08:00
jason
18cd9dde6e 转账 - 管理后台新增转账示例
(cherry picked from commit 55a961e86265a1c2b37874dfd076b60935de6964)
2024-03-05 17:32:29 +08:00
Wanwan
7923078e17 feat: 调整客户表的字段
(cherry picked from commit 59cf0c29f09e8a21987cce4c1adc7bc42ec5a19c)
2024-03-05 17:30:11 +08:00
puhui999
212d40f290 新增社交客户端 CRUD
(cherry picked from commit 8935188a820c70c843780df0321008d83c407ee5)
2024-03-05 17:24:58 +08:00
YunaiV
6ca92b9251 code review:banner 逻辑
(cherry picked from commit e5d6a9dae1caa66053f1a98fb0373bccf4fe98e8)
2024-03-05 17:22:30 +08:00
puhui999
1298c3dd52 完善 banner 管理
(cherry picked from commit a7439ee08b59d47ef1162e0b1db93e94d2f3cb45)
2024-03-05 17:22:09 +08:00
liuhongfeng
7b020781f0 【新增】回款管理 功能
(cherry picked from commit 7ad1457f799cf7af8252316dc6cda36165062a53)
2024-03-05 17:20:32 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74a0f3de9efc6ee5a4c42bac81c67485)
2024-03-05 17:12:24 +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
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
52def241f8 trade: 分销业务review代码修改
(cherry picked from commit 2e830d14d55b65a859306f4cc6982b9ee9ac9d14)
2023-09-25 12:43:29 +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
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
b55b9966d6 code review:订单列表
(cherry picked from commit b8ca5800c6adb7225857b7b8756484d04f5ca8eb)
2023-09-20 12:22:48 +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
23fa3fe14c review 积分配置
(cherry picked from commit 4571f893ed93d3a012635a22137ecaff0ae34949)
2023-07-27 19:37:26 +08:00
xiaqing
195ae79bfc 会员中心代码
1.合并积分模块只member module
3.添加会员中/会员积分、会员签到/xxx层级目录
4.删除无用的接口代码

(cherry picked from commit 4251dc5d6167db0befecfacf2402511314eda6ec)
2023-07-27 19:36:28 +08:00
YunaiV
8bf1f04044 code review:订单列表
(cherry picked from commit e3f250fff07ee496c54050d1ed28041c9786d0fd)
2023-07-27 19:11:50 +08:00
shizhong
1e8b1c8a1d !165 trade-order 列表和详情初版 Merge pull request !165 from 矿泉水/dev 2023-07-27 19:11:40 +08:00
YunaiV
d4902558e6 code review:会员积分配置
(cherry picked from commit 5eaf054646d4eb701f1ce54d566cce16549dde98)
2023-07-27 19:09:38 +08:00
shizhong
7a35f7fe6e Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev 2023-07-27 19:08:57 +08:00
YunaiV
24a4ed134a code review:处理字典数据的冲突
(cherry picked from commit 8666307d472cd1b335b0102af9a8fede76823919)
2023-07-27 19:07:23 +08:00
xiaqing
98c977a732 初始化积分模块
1.积分设置管理
2.积分签到规则管理
3.用户积分记录管理
4.用户签到积分管理

(cherry picked from commit 1dca8476b35962c278124075acc731319fca60cb)
2023-07-27 19:06:34 +08:00
puhui999
2d88367e61 fix: review
(cherry picked from commit b89db1af55127fef5b558e2fdcd6f8401ccdc7df)
2023-07-27 19:02:19 +08:00
shizhong
274d85010f add trade order 20230606 2023-07-27 19:01:41 +08:00
shizhong
45bf152dd2 sync dev-20230606 2023-07-27 19:00:31 +08:00
xiaobai
a29421dd41 临时提交
(cherry picked from commit 505f5cfa0c543f779abe43d6d77f260991486fdf)
2023-07-27 18:44:50 +08:00
jason
90ccc11006 mall: 订单中心->运费模板(第一版 性能有问题)
(cherry picked from commit 4e69f15128b3d93958cc4082cff91c7230feb410)
2023-06-13 14:10:52 +08:00
puhui999
2152573c5e 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 1116fb278bc5799839d7102322c0b5558374e70e)
2023-06-13 13:55:48 +08:00
puhui999
72fd0b8ed5 商品管理: 调整相关组件优化逻辑
(cherry picked from commit 6478d295dfc0b7a01c46abf3eb0dbc1b633f4f27)
2023-06-13 13:55:44 +08:00