66 Commits

Author SHA1 Message Date
puhui999
6754fe06c2 Merge remote-tracking branch 'yudao/dev' into dev-crm 2024-03-08 21:35:05 +08:00
puhui999
7a8f9b3742 crm-客户:公海抽离,完善跟进
(cherry picked from commit 5151824110335e970188d72a7139378fd04c07af)
2024-03-08 21:30:24 +08:00
shizhong
231ba51650 📖 CRM:产品模块的 review 2024-03-08 21:24:00 +08:00
anhaohao
d352e022b6 新增:产品详情页面
(cherry picked from commit 4f89eb6ba9d832ad616c98c36b74c982f1a31787)
2024-03-08 21:14:46 +08:00
owen
a959935cf8 Review代码修改
(cherry picked from commit 2b8eb49f7115d04f14a09c860f02b309969df8e5)
2024-03-08 21:14:40 +08:00
YunaiV
b890915539 📖 code review:店铺装修逻辑
(cherry picked from commit 9591ed70849c59ae6d8c2bd57cbc63cf9b012191)
2024-03-08 20:53:04 +08:00
zyna
1f22d9ad0b crm联系人init
(cherry picked from commit ed26142bb0d928af1727de1bf1bf6a5fd4a7c140)
2024-03-06 20:32:54 +08:00
Wanwan
f780cf0c7b feat: 客户详情 + review 修改
(cherry picked from commit 23f483ac452c6f140b399351918caaffb54c7129)
2024-03-05 17:42:31 +08:00
owen
d12dcde81d 商城装修
(cherry picked from commit e9ff8d323752dd0df8bebbb71b8c3fe4f6e8caff)
2024-03-05 17:31:22 +08:00
YunaiV
e35ef6fec7 恢复 SSO 界面的路由
(cherry picked from commit e2a08ddbac69a06b346a3f624bf0b0db2242bb8c)
2024-03-05 16:51:13 +08:00
dhb52
f1909bf365 fix: 路由缺少name字段,ts不高兴
(cherry picked from commit 3587d1ef971fae3d05e55fa83b3f72c632558408)
2024-03-05 16:50:37 +08:00
dhb52
5bf9baf456 feat: 社交平台登录
(cherry picked from commit 4d77d7e1366215930bd4661bc3f94b6e6a306bc8)
2024-03-05 16:50:30 +08:00
YunaiV
de47866f49 trade:完善退款详情
(cherry picked from commit bb08f6f54f6ed400e228d5417742ca29e7292a8b)
2024-03-05 15:54:27 +08:00
YunaiV
a83db39abf trade:微调 order 列表界面
(cherry picked from commit 588ce1c9aeb2884b7a1194107e25bc754a445f4a)
2024-03-05 15:53:54 +08:00
YunaiV
1ddd72cc46 product:优化商品发布页
(cherry picked from commit 88677ee12133addf689409e110e8654b4b4dfdfc)
2024-03-05 15:53:35 +08:00
YunaiV
f1900d7717 product:优化商品列表的样式、实现代码
(cherry picked from commit 3a9668d63268576906d8f041cfc78fe42e3ba76b)
2024-03-05 15:53:27 +08:00
shizhong
b80702cd9d refactor: vue3.3 defineOptions 2023-09-26 19:43:55 +08:00
puhui999
45e0f5fb6d 更新订单和售后退款详情页面路由
(cherry picked from commit 264a29e4515c67d011663a70c7ab3f191e20bd4b)
2023-09-20 12:33:33 +08:00
YunaiV
8364e52477 code review:售后详情
(cherry picked from commit 29b8d06ff272f2bde5275a74d4d2b99362e19648)
2023-09-20 12:32:48 +08:00
YunaiV
ed41a9bed6 重构:商品详情界面的路由、文件路径
(cherry picked from commit 8d026f0837db722fb7516564fd4d46d40c6c145d)
2023-09-20 12:30:02 +08:00
xingyu
c3ccd02f9e fix: router
(cherry picked from commit 54c41b44452c1af8f2e00f526f0bf8ec71c1020b)
2023-09-20 12:28:23 +08:00
xingyu
21ac6e0c3e fix: router
(cherry picked from commit 547b1741fc5943e17604139fafaef43c77a56fba)
2023-09-20 12:27:24 +08:00
puhui999
52776c97da 订单售后列表:初始化售后详情
(cherry picked from commit 8a51c9c771472ebe7ccf21ad986d03c4e4b354e4)
2023-09-20 12:25:56 +08:00
puhui999
109e18dba6 订单列表: 修复差异
(cherry picked from commit 8239ca474fa0aa0622df02c0c82067aadddf7263)
2023-09-20 12:25:45 +08:00
YunaiV
b55b9966d6 code review:订单列表
(cherry picked from commit b8ca5800c6adb7225857b7b8756484d04f5ca8eb)
2023-09-20 12:22:48 +08:00
YunaiV
e97a62fe06 code review:用户详情
(cherry picked from commit 1b6c9b2e2939a853e59843d5b9f321652bb38da8)
2023-09-20 12:22:09 +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
绮梦
2804d199c0 会员详情页的跳转携带参数方式改为params
(cherry picked from commit d1bb736973b98b16d73ccecc3b7c285f72e41cef)
2023-09-20 12:17:11 +08:00
YunaiV
92423dc00b code review:用户详情
(cherry picked from commit 55772cbba0d0729fd864f9cf338baabcba1e41d0)
2023-09-20 12:14:21 +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
dhb52
191d149959 feat: 支付功能迁移(初稿)
(cherry picked from commit a6eab3cc9a998cff2120a6db82f6938ab1c2f206)
2023-09-19 20:39:21 +08:00
shizhong
1e8b1c8a1d !165 trade-order 列表和详情初版 Merge pull request !165 from 矿泉水/dev 2023-07-27 19:11:40 +08:00
puhui999
6976c26c37 fix: 完善 SPU 相关路由 review
(cherry picked from commit d31ade7a5fccc98db7e90e41a31564205b393056)
2023-07-27 19:04:38 +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
b9ba1d36c2 20230606 add trade-order and details
(cherry picked from commit 985d764f623e24402b1ba91562d2994b28d1aeec)
2023-07-27 18:54:36 +08:00
puhui999
ce62362982 fix: 优化 spu 相关路由配置
(cherry picked from commit a1b45f80bc72c57b1fd7cfef6b4f314629ed637d)
2023-07-27 18:50:14 +08:00
puhui999
d35ac547ac fix: 完善 SPU 查看详情
(cherry picked from commit 39c92cb944e2b41007d1870d411f5255c9da1d70)
2023-07-27 13:10:58 +08:00
shizhong
c6a9c0c5fb 所有菜单的 name 都加上模块的前缀,避免冲突 2023-07-10 19:11:15 +08:00
puhui999
ea4e2a0bcc fix: 解决商品上一版遗留的各种小bug关键部分已添加fix注释。完成的TODO也已添加fix标记
(cherry picked from commit 4ddba9d454ebfd221f39ba12b375401768ff7f45)
2023-06-13 14:06:16 +08:00
shizhong
82f02cd9f3 !148 【重构】Vue3 管理后台:[基础管理 -> Redis监控] 使用Echart组件实现 2023-06-13 14:05:17 +08:00
Chika
80f1c08951 Redis监控图标使用Echart组件整合
(cherry picked from commit bf629a95549757faa90362b5d3c0c6a2e6a443a4)
2023-06-13 13:59:08 +08:00
YunaiV
7a5993c584 code review 商品管理的实现
(cherry picked from commit e92361ed401771998c6abd6d9ba53801a6e0cfa6)
2023-06-13 13:56:48 +08:00
puhui999
3c220cdb63 商品管理初始界面结构设计
(cherry picked from commit a0014bed6529b15e07cf96413d4702c9904682a8)
2023-06-13 13:48:52 +08:00
shizhong
6bbeeba455 优化 OA 请假,create 和 detail 使用独立路由,可接入工作流 2023-06-13 12:53:51 +08:00
shizhong
e83717e80e 修改 2023-06-13 11:43:05 +08:00
puhui999
1103f8ff39 增加SSO单点登录
(cherry picked from commit 2d019f1bf96b94e879b79ad83e13c5eea12a94bd)
2023-06-13 11:36:09 +08:00
shizhong
fb3a842131 修改 2023-06-13 11:35:06 +08:00