root/ludu-admin-vue3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,297 Commits 8 Branches 11 Tags 16 MiB
ba4a848fa8
Commit Graph

1153 Commits

Author SHA1 Message Date
owen
ce5314ab41 营销：优化装修编辑器 
(cherry picked from commit 434aa864da)
 2024-03-05 17:50:00 +08:00
owen
cf9691f993 营销：优化装修编辑器样式 
(cherry picked from commit 0b0ba1f313)
 2024-03-05 17:49:53 +08:00
owen
f526675293 修复页面中心内容区会出现滚动条的问题: 底部版权栏的P标签有默认的margin导致 
(cherry picked from commit 984351fbf0)
 2024-03-05 17:49:36 +08:00
owen
8cb041b57a 营销：装修页面适配搜索框 
(cherry picked from commit aedf014407)
 2024-03-05 17:49:29 +08:00
YunaiV
b2e9e9273d 优化：社交登录、用户的管理 
(cherry picked from commit 4f2f4f72b5)
 2024-03-05 17:49:22 +08:00
ZanGe丶
618cf7459a 【crm:产品及产品分类】 
(cherry picked from commit ff6f05df84)
 2024-03-05 17:49:15 +08:00
shizhong
18e7aea217 优化：社交登录、用户的管理 2024-03-05 17:47:17 +08:00
YunaiV
98fc2fe327 优化：社交登录、用户的管理 
(cherry picked from commit a9b91e7436)
 2024-03-05 17:44:12 +08:00
YunaiV
f575ddacea code review：满减送活动 
(cherry picked from commit f79d31a64a)
 2024-03-05 17:43:11 +08:00
YunaiV
85df91ddab code review：客户管理 
(cherry picked from commit a9faeb1bdb)
 2024-03-05 17:42:57 +08:00
Wanwan
f780cf0c7b feat: 客户详情 + review 修改 
(cherry picked from commit 23f483ac45)
 2024-03-05 17:42:31 +08:00
jason
6949c196d0 转账 - 新增转账订单查询 
(cherry picked from commit 753f5de81e)
 2024-03-05 17:41:57 +08:00
owen
2c485504e7 营销：装修模板，底部导航适配APP 
(cherry picked from commit 3c0f3ceed5)
 2024-03-05 17:41:50 +08:00
风狗
d47a60b18d update src/views/mall/trade/delivery/expressTemplate/ExpressTemplateForm.vue. 
地区选择框placeholder 修改

Signed-off-by: 风狗 <909275705@qq.com>
(cherry picked from commit bf418653e4)
 2024-03-05 17:41:43 +08:00
liuhongfeng
044ad7740e 【新增】负责人 
【修改】规范命名：期数：indexNo-》period

(cherry picked from commit 3d54ad3a6a)
 2024-03-05 17:41:35 +08:00
owen
0d5e6c4098 营销：装修编辑器样式优化 
(cherry picked from commit 9bd33355e2)
 2024-03-05 17:41:26 +08:00
dongshanshan
525e511670 feat: 会员商品收藏 
(cherry picked from commit 9a3253ad20)
 2024-03-05 17:41:11 +08:00
owen
97a94cd29f 营销：完善商城装修 
1. 拆分页面设计用的属性修改接口
2. 增加模板的页面保存
3. 增加唯一名称校验
4. 增加页面编辑器，默认选中组件判断

(cherry picked from commit 881c4f3a29)
 2024-03-05 17:41:01 +08:00
xingyu
d172595f14 fix: types 
(cherry picked from commit 10483577b7)
 2024-03-05 17:40:50 +08:00
xingyu
de9e45ba43 fix: props 
(cherry picked from commit 52755b38a9)
 2024-03-05 17:40:33 +08:00
shizhong
b0e4735936 fix: title name 2024-03-05 17:40:03 +08:00
xingyu
28485eaf61 fix: name warn 
(cherry picked from commit ce93c8d4e9)
 2024-03-05 17:35:30 +08:00
xingyu
1d518c2826 chore: wh-full 
(cherry picked from commit 7321ff2136)
 2024-03-05 17:35:17 +08:00
xingyu
709f3cfbd6 feat: coding 
(cherry picked from commit 80e72fd924)
 2024-03-05 17:34:25 +08:00
xingyu
5eea8d1681 feat: add useTagsView hooks 
(cherry picked from commit 2a029ba35b)
 2024-03-05 17:34:14 +08:00
xingyu
ea3249c421 feat: add useNow hooks 
(cherry picked from commit 57e8256e9a)
 2024-03-05 17:34:10 +08:00
xingyu
3a402d51dc perf: useValidator hooks 
(cherry picked from commit bdcef303ff)
 2024-03-05 17:34:04 +08:00
xingyu
56e3a69188 feat: add useNetwork hooks 
(cherry picked from commit f8fdebffe6)
 2024-03-05 17:34:00 +08:00
xingyu
2d0d8eadd8 perf: use driver.js 
(cherry picked from commit 4ba264e00d)
 2024-03-05 17:33:51 +08:00
xingyu
8b8d7451e0 feat: unocss add shortcuts 
(cherry picked from commit f26a4cae10)
 2024-03-05 17:33:45 +08:00
liuhongfeng
bccd02a53f 【新增】负责人 
【修改】规范命名：期数：indexNo-》period

(cherry picked from commit 2b84de7e09)
 2024-03-05 17:33:13 +08:00
lzy
fae715c01f update src/layout/components/Message/src/Message.vue. 
fix:  处理站内信内容过多回显问题

Signed-off-by: lzy <7783739+lzyyd@user.noreply.gitee.com>
(cherry picked from commit c269cab6b2)
 2024-03-05 17:33:00 +08:00
jason
18cd9dde6e 转账 - 管理后台新增转账示例 
(cherry picked from commit 55a961e862)
 2024-03-05 17:32:29 +08:00
YunaiV
ef7156cc97 code review：客户表的实现 
(cherry picked from commit 0c81a0d96a)
 2024-03-05 17:31:37 +08:00
owen
d12dcde81d 商城装修 
(cherry picked from commit e9ff8d3237)
 2024-03-05 17:31:22 +08:00
YunaiV
ce97304056 code review：客户表的实现 
(cherry picked from commit dc5cf9f24c)
 2024-03-05 17:31:18 +08:00
Wanwan
40e64ecaf3 feat: 调整客户表的字段 
(cherry picked from commit 60d53126c4)
 2024-03-05 17:30:15 +08:00
Wanwan
7923078e17 feat: 调整客户表的字段 
(cherry picked from commit 59cf0c29f0)
 2024-03-05 17:30:11 +08:00
Wanwan
ed9ae42ba8 feat: 调整客户表的字段 
(cherry picked from commit 4cdab6fb3e)
 2024-03-05 17:30:07 +08:00
YunaiV
3d5fcaf50b code review：客户表的实现 
(cherry picked from commit b9ab22dad1)
 2024-03-05 17:29:53 +08:00
puhui999
0cddb9c370 三方应用新增授权方的网页应用 agentId 属性 
(cherry picked from commit a624db04e9)
 2024-03-05 17:29:45 +08:00
puhui999
68b2571c0c 解决钉钉绑定失败的问题 
(cherry picked from commit 88a22d90e5)
 2024-03-05 17:29:36 +08:00
puhui999
ca7c311f88 新增社交用户 RUD 
(cherry picked from commit 6ee2492ff1)
 2024-03-05 17:25:31 +08:00
puhui999
212d40f290 新增社交客户端 CRUD 
(cherry picked from commit 8935188a82)
 2024-03-05 17:24:58 +08:00
puhui999
5359c4c862 解决列数据中的 table#header 数据不刷新的问题 
(cherry picked from commit ca385bc08e)
 2024-03-05 17:24:50 +08:00
xingyu
16e0486768 fix: ElLoading need import 
(cherry picked from commit 238537df83)
 2024-03-05 17:24:10 +08:00
Wanwan
c0a10146d6 feat: 客户表的 crud 
(cherry picked from commit 044754cdb4)
 2024-03-05 17:23:20 +08:00
YunaiV
9bc0638598 修复 banner 返回字段不对 
(cherry picked from commit 539352f598)
 2024-03-05 17:22:51 +08:00
YunaiV
6ca92b9251 code review：banner 逻辑 
(cherry picked from commit e5d6a9dae1)
 2024-03-05 17:22:30 +08:00
puhui999
11bc949309 优惠卷模版样式调整 
(cherry picked from commit 95d7d1eb42)
 2024-03-05 17:22:21 +08:00
puhui999
8c5cdd0ea5 商品 spu 脱离优惠卷模块 
(cherry picked from commit 75135e1e4f)
 2024-03-05 17:22:16 +08:00
puhui999
1298c3dd52 完善 banner 管理 
(cherry picked from commit a7439ee08b)
 2024-03-05 17:22:09 +08:00
KONGDY-PC\Kongdy
5a67f1c051 满减页面布局 
(cherry picked from commit 7c8f7d570f)
 2024-03-05 17:22:06 +08:00
YunaiV
eecf209aad code review：banner 逻辑 
(cherry picked from commit 2dbfa77bee)
 2024-03-05 17:21:37 +08:00
YunaiV
b7c81fb37d code review：限时折扣 
(cherry picked from commit 423ea319e0)
 2024-03-05 17:21:27 +08:00
kehaiyou
6bffc7991f fix: 【工作流】--加签减签review修改接口地址 
(cherry picked from commit 5cfb67d047)
 2024-03-05 17:21:22 +08:00
jason
16aba063d1 钱包 - 优化 
支付应用 - 证书模式增加应用私钥

(cherry picked from commit bb5945958b)
 2024-03-05 17:21:11 +08:00
puhui999
4fcdd63e51 新增 banner 管理 
(cherry picked from commit 491b3a5018)
 2024-03-05 17:21:03 +08:00
913752709@qq.com
772ded7eca feat: crm 线索表完善 review 提到的问题 
(cherry picked from commit fb90a85e43)
 2024-03-05 17:20:59 +08:00
liuhongfeng
47f948f26b 【新增】回款计划 功能 
(cherry picked from commit 26780c3525)
 2024-03-05 17:20:37 +08:00
liuhongfeng
7b020781f0 【新增】回款管理 功能 
(cherry picked from commit 7ad1457f79)
 2024-03-05 17:20:32 +08:00
puhui999
ea546e4831 完善文章管理 review 提到的问题 
(cherry picked from commit 0730e215d8)
 2024-03-05 17:20:29 +08:00
zhangshuai
9f04b8e34b 限时折扣 
(cherry picked from commit 9f77514c17)
 2024-03-05 17:20:00 +08:00
puhui999
139f45003d SPU: 新增完善活动优先级拖拽排序 
(cherry picked from commit 1e8945de63)
 2024-03-05 17:16:39 +08:00
puhui999
ccec7ad410 SPU: 完善优惠卷选择 
(cherry picked from commit 01d78429cc)
 2024-03-05 17:15:16 +08:00
puhui999
de53601fcb SPU: 完善优惠卷选择 
(cherry picked from commit 18df708b49)
 2024-03-05 17:14:29 +08:00
YunaiV
801ea4c176 code review：门店自提 
(cherry picked from commit 2457665b55)
 2024-03-05 17:14:23 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择 
(cherry picked from commit 3464bb9c74)
 2024-03-05 17:12:24 +08:00
puhui999
b8b549462d OrderTableColumn: 商品信息列样式调整2 
(cherry picked from commit 5b3bcecef2)
 2024-03-05 17:12:20 +08:00
puhui999
a313663c99 OrderTableColumn: 商品信息列样式调整 
(cherry picked from commit 094f8e16db)
 2024-03-05 17:12:15 +08:00
puhui999
067c89d987 UserOrderList 重构完善 
(cherry picked from commit 70778fd9e6)
 2024-03-05 17:12:09 +08:00
puhui999
9dae60b597 订单列表：完善表头宽度自适应 
(cherry picked from commit 5270c83876)
 2024-03-05 17:11:37 +08:00
913752709@qq.com
a5f21a9b9f feat: CRM 线索表 crud 
(cherry picked from commit 7af2a3bcc3)
 2024-03-05 17:11:33 +08:00
puhui999
bb18f469de 订单列表：自定义列抽离封装为组件 
(cherry picked from commit 04d88ce1a6)
 2024-03-05 17:11:17 +08:00
puhui999
432620ffec 营销文章：新增表单属性移除浏览量 
(cherry picked from commit d1a3fe5d5a)
 2024-03-05 17:10:30 +08:00
owen
d04c1f0213 统计卡片修改为全局组件 
(cherry picked from commit 431fff28ce)
 2024-03-05 17:08:22 +08:00
owen
174b95fdef 交易：核销订单 
(cherry picked from commit 61b3bdfd4c)
 2024-03-05 17:07:35 +08:00
YunaiV
56b7e35d49 code review：crm 合同流程 
(cherry picked from commit 8832eafaae)
 2024-03-05 17:07:27 +08:00
1163996518@qq.com
0e0456d4f8 支付渠道配置--修复权限 
(cherry picked from commit 533b4e5006)
 2024-03-05 17:07:21 +08:00
1163996518@qq.com
6721122bc2 支付渠道配置--修复权限 
(cherry picked from commit d5328918ab)
 2024-03-05 17:07:17 +08:00
YunaiV
231285a4ef code review：修复工作流的审批界面报错问题 
(cherry picked from commit c27685285a)
 2024-03-05 17:06:53 +08:00
owen
18b7dd3b7e 交易：订单核销 
(cherry picked from commit 6fc232b758)
 2024-03-05 17:06:12 +08:00
dhb52
d85494bf05 feat: CRM/合同 crud 
(cherry picked from commit dced551698)
 2024-03-05 17:05:58 +08:00
jason
1d602e0a31 钱包 - 钱包余额流水 
(cherry picked from commit c3f06f5fbe)
 2024-03-05 17:03:59 +08:00
jason
b3b9fbc201 钱包 - 钱包余额流水 
(cherry picked from commit 8626bccc4c)
 2024-03-05 17:03:54 +08:00
owen
aaead6c2b9 统计：修复错误 
(cherry picked from commit e3a0cfe5e9)
 2024-03-05 17:03:47 +08:00
owen
1dba566d1d 统计：trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 
(cherry picked from commit 6204ce6c1b)
 2024-03-05 17:03:42 +08:00
owen
25a1e27a12 统计：Review修改 
(cherry picked from commit cd4b4cd322)
 2024-03-05 17:03:35 +08:00
YunaiV
e3f1c21e53 code review：文章管理 
(cherry picked from commit 66ec610801)
 2024-03-05 17:03:19 +08:00
xingyu
16eb97e366 perf: is utils 
(cherry picked from commit 8c18ad941e)
 2024-03-05 17:03:10 +08:00
xingyu
5ef9a14f3a perf: propTypes 
(cherry picked from commit 5da9b660bd)
 2024-03-05 17:02:56 +08:00
xingyu
d02f5570f5 style: stylelint 
(cherry picked from commit 1a1b70a350)
 2024-03-05 16:59:51 +08:00
owen
35803ba77a 统计：会员终端统计，处理未知终端情况 
(cherry picked from commit edfd03903f)
 2024-03-05 16:53:34 +08:00
owen
d46adb0683 统计：处理会员性别统计，存在未知的情况 
(cherry picked from commit 2bfc9c3b13)
 2024-03-05 16:53:25 +08:00
owen
eddac7c9be 统计：修复错误 
(cherry picked from commit 661e72bcfd)
 2024-03-05 16:53:16 +08:00
owen
3c51e98682 统计：Review修改 
(cherry picked from commit e1a72779d4)
 2024-03-05 16:53:07 +08:00
YunaiV
f0542fef06 code review：文章管理 
(cherry picked from commit 99172ea088)
 2024-03-05 16:52:46 +08:00
owen
230d073fb8 商城：增加商城首页 
(cherry picked from commit 3802fee661)
 2024-03-05 16:52:31 +08:00
YunaiV
e35ef6fec7 恢复 SSO 界面的路由 
(cherry picked from commit e2a08ddbac)
 2024-03-05 16:51:13 +08:00
jason
e5f043c24b 钱包- 钱包余额查询 
(cherry picked from commit 90d6f4da9f)
 2024-03-05 16:51:04 +08:00
puhui999
7c41ce1796 营销活动：新增文章管理。 
(cherry picked from commit befffb3f7d)
 2024-03-05 16:50:47 +08:00
dhb52
50197497b3 fix: 删除SSOLogin.vue组建，解决登录界面不停重定向问题 
(cherry picked from commit 89417ac393)
 2024-03-05 16:50:43 +08:00
dhb52
f1909bf365 fix: 路由缺少name字段，ts不高兴 
(cherry picked from commit 3587d1ef97)
 2024-03-05 16:50:37 +08:00
dhb52
5bf9baf456 feat: 社交平台登录 
(cherry picked from commit 4d77d7e136)
 2024-03-05 16:50:30 +08:00
puhui999
54e1a8843b 营销活动：新增文章分类管理 
(cherry picked from commit 36bb90fbb8)
 2024-03-05 16:50:22 +08:00
jason
7162525bc7 钱包-充值套餐 
(cherry picked from commit f9d0c1aa1c)
 2024-03-05 16:49:58 +08:00
xingyu
46bce2750f fix: unocss eslint 
(cherry picked from commit e04ca7aac7)
 2024-03-05 16:49:25 +08:00
YunaiV
721fc5c026 code review：拼团记录列表 
(cherry picked from commit 855b37c1ab)
 2024-03-05 16:48:59 +08:00
puhui999
d4d41701ab 营销活动：完善 review 提到的问题，添加拼团列表查看弹窗 
(cherry picked from commit b08e0e5ab2)
 2024-03-05 16:48:39 +08:00
puhui999
848e0b7023 营销活动：完善 review 提到的问题，添加拼团列表查看弹窗 
(cherry picked from commit 3500a20630)
 2024-03-05 16:33:41 +08:00
youkehai
dbcefcca9b fix: 减签按钮显示和api地址修改 
(cherry picked from commit 62a953815d)
 2024-03-05 16:33:32 +08:00
owen
c4e6163437 统计：会员统计 
(cherry picked from commit 22adab8590)
 2024-03-05 16:32:14 +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 aa5f27bec7)
 2024-03-05 16:05:34 +08:00
YunaiV
a06369d427 code review：拼团记录列表 
(cherry picked from commit 86323f970b)
 2024-03-05 16:05:22 +08:00
天痕
abca5a7669 修复，刷新菜单缓存失效问题 
Signed-off-by: 天痕 <614891294@qq.com>
(cherry picked from commit fff4cfd012)
 2024-03-05 16:05:13 +08:00
puhui999
9f836ad25b 拼团记录：优化页面布局，添加日期快捷选项 
(cherry picked from commit 5b4983a3e9)
 2024-03-05 16:04:54 +08:00
puhui999
799ec653dd 拼团活动：表单添加虚拟成团控制按钮 
(cherry picked from commit 8c347e5990)
 2024-03-05 16:04:45 +08:00
puhui999
22449ed21a 拼团记录：接口对接 
(cherry picked from commit c445173855)
 2024-03-05 16:04:39 +08:00
YunaiV
edfc7e7c01 promotion：调整拼团活动的界面 
(cherry picked from commit 24fc36e23a)
 2024-03-05 16:04:34 +08:00
puhui999
8346717986 拼团记录： 完成 UI 部分 
(cherry picked from commit eee3d0fef5)
 2024-03-05 16:04:27 +08:00
owen
e30e0e2d32 统计：交易统计Review修改 
(cherry picked from commit 2a58b04a98)
 2024-03-05 16:03:05 +08:00
YunaiV
2b4c192423 promotion：调整拼团活动的界面 
(cherry picked from commit 78062dd474)
 2024-03-05 16:03:00 +08:00
YunaiV
be2f92754b promotion：新增记录记录列表 
(cherry picked from commit cf7ac2cb10)
 2024-03-05 15:58:09 +08:00
YunaiV
d9ec3f6e61 promotion：新增砍价记录列表 
(cherry picked from commit 860872a890)
 2024-03-05 15:58:04 +08:00
YunaiV
171bf0154a promotion：优化砍价活动的管理 
(cherry picked from commit 42f0bf07f0)
 2024-03-05 15:57:52 +08:00
owen
cbba91dac5 交易：核销 
(cherry picked from commit 58b6b1ba57)
 2024-03-05 15:57:14 +08:00
YunaiV
e92709da70 promotion：优化秒杀活动的界面 
(cherry picked from commit 7c491ff62a)
 2024-03-05 15:57:09 +08:00
YunaiV
517d4ac28e promotion：优化优惠劵的界面 
(cherry picked from commit 40f44fc78e)
 2024-03-05 15:55:09 +08:00
YunaiV
72681f209b trade：优化分销界面的 width 列宽度，和一些非空判断 
(cherry picked from commit 59ab6218ca)
 2024-03-05 15:55:05 +08:00
YunaiV
f98f79235e trade：优化门店的 list 列表，新增是否自提的配置项 
(cherry picked from commit ab95d87c68)
 2024-03-05 15:54:54 +08:00
YunaiV
7d44b98116 trade：优化运费模版的实现 
(cherry picked from commit a9bbbc7b0a)
 2024-03-05 15:54:35 +08:00
YunaiV
de47866f49 trade：完善退款详情 
(cherry picked from commit bb08f6f54f)
 2024-03-05 15:54:27 +08:00
owen
d4a9f844dc 对齐面包屑的图标和文字 
(cherry picked from commit 4c077711a1)
 2024-03-05 15:54:04 +08:00
YunaiV
6a8aa02960 trade：完善订单详情 
(cherry picked from commit 4fddbccea1)
 2024-03-05 15:53:59 +08:00
YunaiV
a83db39abf trade：微调 order 列表界面 
(cherry picked from commit 588ce1c9ae)
 2024-03-05 15:53:54 +08:00
YunaiV
23c4bde627 product：优化商品评论 
(cherry picked from commit 17c31978f7)
 2024-03-05 15:53:47 +08:00
YunaiV
41b30ed659 product：优化属性列表 
(cherry picked from commit 8b7543acd5)
 2024-03-05 15:53:43 +08:00
YunaiV
74a43565f6 product：优化分类列表 
(cherry picked from commit 5f80d1611c)
 2024-03-05 15:53:39 +08:00
YunaiV
1ddd72cc46 product：优化商品发布页 
(cherry picked from commit 88677ee121)
 2024-03-05 15:53:35 +08:00
YunaiV
f1900d7717 product：优化商品列表的样式、实现代码 
(cherry picked from commit 3a9668d632)
 2024-03-05 15:53:27 +08:00
owen
e05b749e4d 会员：会员配置的积分相关字段加上point前缀 
(cherry picked from commit 3a96812d47)
 2024-03-05 15:53:20 +08:00
owen
24a650d89b 会员：积分配置改为会员配置 
(cherry picked from commit 3ab1ed707f)
 2024-03-05 15:53:16 +08:00
owen
6b6c9f5f02 签到：签到后增加用户积分、经验 
(cherry picked from commit 0066d79876)
 2024-03-05 15:52:41 +08:00
owen
18bdea83be 会员详情，修改会员积分 
(cherry picked from commit 4b7e57e67d)
 2024-03-05 15:52:21 +08:00
owen
f9ff762977 会员：会员详情-推广用户列表 
(cherry picked from commit 940a102546)
 2024-03-05 15:52:12 +08:00
owen
5a2d22d285 会员：会员详情-优惠券列表 
(cherry picked from commit b48f19c646)
 2024-03-05 15:52:06 +08:00
owen
05e6668322 会员详情，查询钱包信息 
(cherry picked from commit 675f3df5cb)
 2024-03-05 15:50:46 +08:00
owen
9b4bb4025b 统计：交易统计 
(cherry picked from commit c322fb3d0d)
 2024-03-05 15:50:37 +08:00
owen
7412d02e67 fix eslint problems 
(cherry picked from commit 150c77cff0)
 2024-03-05 15:50:20 +08:00
YunaiV
106e6ceada trade：退款理由的维护 
(cherry picked from commit fb94ae9674)
 2024-03-05 15:50:03 +08:00
YunaiV
8d57126589 trade：分佣界面的微调 
(cherry picked from commit 04e02ffbd2)
 2024-03-05 13:19:36 +08:00
YunaiV
bf4ab7e58b trade：优化交易配置的参数校验 
(cherry picked from commit 74de8e9687)
 2024-03-05 13:17:57 +08:00
YunaiV
d299ad9395 增加 user detail 的 todo 
(cherry picked from commit c6031ba2b2)
 2024-03-05 13:17:30 +08:00
owen
75e0a701f3 分销：修正分享海报 
(cherry picked from commit a5dd7f4a81)
 2024-03-05 13:14:55 +08:00
owen
28d312c857 分销：重命名提现类型字段 
(cherry picked from commit 2c22ef8ef1)
 2024-03-05 13:14:11 +08:00
shizhong
6be1aac0af BUG 2024-02-19 22:33:40 +08:00
shizhong
e89c48933f feat: 【工作流】--委派 2023-10-02 12:54:22 +08:00
shizhong
1b9bdf851c feat: 【工作流】--委派 2023-09-27 16:22:37 +08:00
shizhong
842ca8f672 feat: 【工作流】--委派 2023-09-27 16:13:42 +08:00
shizhong
76f8f9d942 feat: 【工作流】--委派 2023-09-27 16:00:40 +08:00
shizhong
3e08217c0d feat: 【工作流】--委派 2023-09-27 11:22:19 +08:00
youkehai
1b30ca07ed feat: 对齐后端-工作流委派的参数 
(cherry picked from commit 0fba0d9a6a)
 2023-09-26 19:57:05 +08:00
shizhong
2c74888712 feat: 【工作流】--委派 2023-09-26 19:56:57 +08:00
shizhong
b80702cd9d refactor: vue3.3 defineOptions 2023-09-26 19:43:55 +08:00
shizhong
37a5531132 解决import问题 2023-09-25 17:39:25 +08:00
shizhong
0670facae4 解决处理顶级非目录路由的组件名称逻辑缺失的问题 2023-09-25 15:08:24 +08:00
YunaiV
d46b9deb18 code review：驳回逻辑 
(cherry picked from commit 245147223f)
 2023-09-25 13:32:48 +08:00
shizhong
715cf6c85f fix: 【工作流】--回退的高亮和api地址更换 2023-09-25 13:32:35 +08:00
kehaiyou
0bef9924fe fix: 【工作流】--回退的高亮和api地址更换 
(cherry picked from commit f40d1de62a)
 2023-09-25 13:30:17 +08:00
shizhong
05e3f9ad02 修复 member 详情无法展示的问题 2023-09-25 13:29:16 +08:00
YunaiV
fa3acb21b0 修复 member 详情无法展示的问题 
(cherry picked from commit 539f8a5bb5)
 2023-09-25 13:24:41 +08:00
shizhong
3542b50f7d feat: 支持回退按钮 2023-09-25 13:23:11 +08:00
kehaiyou
6888fd90d1 feat: 支持回退按钮 
(cherry picked from commit de79e79d91)
 2023-09-25 13:15:55 +08:00
owen
417be9f6ae Trade: 完善配置 
(cherry picked from commit 21c67b1b75)
 2023-09-25 13:14:23 +08:00
shizhong
969155c6cf style: unocss eslint 2023-09-25 13:14:05 +08:00
owen
36f6745ecb trade: 分销业务 - 佣金提现后台管理 
(cherry picked from commit 854acf6e70)
 2023-09-25 12:48:07 +08:00
owen
3f127d4d44 trade: 分销业务review代码修改 
(cherry picked from commit 18b6c70d1a)
 2023-09-25 12:48:04 +08:00
绮梦
8d06ee2b39 订单详情页面 请求详情接口改为真实携带的id 
(cherry picked from commit 245301452c)
 2023-09-25 12:47:58 +08:00
YunaiV
96a96b1a5d 增加 404 的说明 
(cherry picked from commit 1be57ea8d3)
 2023-09-25 12:47:49 +08:00
YunaiV
da5ea7c43b code review：订单相关的逻辑 
(cherry picked from commit 8b65a2866e)
 2023-09-25 12:46:49 +08:00
owen
52def241f8 trade: 分销业务review代码修改 
(cherry picked from commit 2e830d14d5)
 2023-09-25 12:43:29 +08:00
owen
4d1ecf7161 trade: 分销业务后台功能：推广订单列表 
(cherry picked from commit 0582d41972)
 2023-09-25 12:43:25 +08:00
owen
9117f56533 trade: 分销业务后台功能：推广用户列表 
(cherry picked from commit 2aa372d8f4)
 2023-09-25 12:43:19 +08:00
puhui999
9607127897 spu：分佣属性和分佣保持一致 
(cherry picked from commit 5dc0c6e3da)
 2023-09-25 12:43:15 +08:00
puhui999
4dda8d2ab7 order：完善订单聚合搜索 
(cherry picked from commit 615763d415)
 2023-09-25 12:43:09 +08:00
puhui999
2e4cad38bb mall-order：修复 todo 提到的问题 
(cherry picked from commit 7e511d1e4f)
 2023-09-25 12:42:27 +08:00
owen
fc77eb3b89 trade: 分销业务后台功能：佣金格式化 
(cherry picked from commit 87ca916e69)
 2023-09-25 12:42:13 +08:00
owen
ad35b40a76 trade: 分销业务后台功能：修改上级推广人 
(cherry picked from commit 5ed909263a)
 2023-09-25 12:42:08 +08:00
owen
9dbf4feeae trade: 分销业务后台功能：清除推广员、修改推广资格 
(cherry picked from commit 7ea3571356)
 2023-09-25 12:42:04 +08:00
puhui999
3f0ec5cf16 登录界面：姐姐点击登录后界面疯狂闪动的问题 
(cherry picked from commit a79f1452b3)
 2023-09-25 12:41:45 +08:00
YunaiV
ca0ec86913 code review：会员详情 
(cherry picked from commit 0e2ea39591)
 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
YunaiV
58f01a8bc5 code review：完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 3c315cf287)
 2023-09-25 12:38:53 +08:00
owen
ba8840de4f trade: 分销员表格佣金字段格式化 
(cherry picked from commit dbb87e3850)
 2023-09-25 12:38:37 +08:00
owen
f0d95e4a93 trade: 优化分销用户佣金字段名称 
(cherry picked from commit e9d5027e72)
 2023-09-25 12:38:25 +08:00
owen
91ab91fdbb trade: 优化分销用户绑定用户编号、绑定时间字段名称 
(cherry picked from commit 7263315412)
 2023-09-25 12:38:22 +08:00
owen
eab116cfce trade: 分销用户管理 
(cherry picked from commit 34ce7f7ec5)
 2023-09-25 12:38:18 +08:00
puhui999
241f4ec092 完善订单详情 
(cherry picked from commit b3639977a7)
 2023-09-25 12:38:06 +08:00
puhui999
69eb2c0f3a 完善订单详情和售后退款 TODO 提到的问题 
(cherry picked from commit 73628d3930)
 2023-09-25 12:30:24 +08:00
owen
b398062102 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 1e2120806d)
 2023-09-25 12:30:17 +08:00
owen
d33f42a525 trade: 分销业务从 member 模块 转移到 trade模块 
(cherry picked from commit 2ed5d12be8)
 2023-09-25 12:30:13 +08:00
owen
f5804431a3 trade: 增加交易中心配置表 
(cherry picked from commit 35664d1f32)
 2023-09-25 12:30:09 +08:00
绮梦
9295030153 新增用户详情下订单页面 
(cherry picked from commit 2318f176a6)
 2023-09-25 12:29:17 +08:00
绮梦
b58b8bb6ea 新增用户详情下成长值页面。 
(cherry picked from commit fe6cf7ce98)
 2023-09-25 12:26:40 +08:00
owen
4d0f941f7c member: 佣金记录 
(cherry picked from commit 73f8cef3b4)
 2023-09-25 12:25:28 +08:00
owen
c2f411607e member: 分销配置 
(cherry picked from commit 5a9764c08c)
 2023-09-25 12:25:23 +08:00
puhui999
c960ba1e20 完善订单详情和售后退款日志展示样式重构 
(cherry picked from commit 46fd154e3a)
 2023-09-25 12:24:59 +08:00
shizhong
b6e6b2c49d chore: stylelint(use pnpm lint:style) 2023-09-22 14:43:10 +08:00
shizhong
5cfe65b87a refactor: 统一 setup 格式 2023-09-22 14:25:05 +08:00
shizhong
7e5ad60d1d refactor: vue3.3 defineOptions 2023-09-22 14:00:50 +08:00
shizhong
20f483f561 refactor: vue3.3 defineOptions 2023-09-22 12:49:25 +08:00
shizhong
ee44bef034 样式 2023-09-20 17:36:08 +08:00
shizhong
ec76b555a3 解决合并出现的问题 2023-09-20 16:53:38 +08:00
xingyu
e2040244cf fix: eslint 
(cherry picked from commit 5494756a66)
 2023-09-20 12:42:48 +08:00
xingyu
ba6544a8c3 fix: #I7WY9N 
(cherry picked from commit 56a71f64e7)
 2023-09-20 12:42:42 +08:00
xingyu
0b7593fbd4 fix: avatar 
(cherry picked from commit 9a6d29b295)
 2023-09-20 12:42:31 +08:00
AKING
62aa0e794f update src/components/Dialog/src/Dialog.vue. 
解决了弹窗默认top为0的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit d74f96fe17)
 2023-09-20 12:39:34 +08:00
owen
117577d9d1 mall：修复优惠券模板，固定日期范围保存失败 
(cherry picked from commit 7887be6e92)
 2023-09-20 12:39:18 +08:00
owen
6f8dc79283 promotion: 优惠券模板 productSpuIds 改成 productScopeValues 
(cherry picked from commit 5f557c7be5)
 2023-09-20 12:39:13 +08:00
owen
2707c5fadc mall：修复优惠券发券弹窗样式 
(cherry picked from commit a68acb096f)
 2023-09-20 12:39:07 +08:00
YunaiV
fd501a1f5b code review：优惠劵逻辑 
(cherry picked from commit d10530c9f5)
 2023-09-20 12:39:02 +08:00
YunaiV
2a280e8267 code review：优惠劵逻辑 
(cherry picked from commit 4f7d6793fd)
 2023-09-20 12:38:39 +08:00
owen
842c922855 mall：优惠券发送优化 
(cherry picked from commit 76c4644b4b)
 2023-09-20 12:38:35 +08:00
YunaiV
04a16dbb7d code review：订单列表 
(cherry picked from commit 0743e4941c)
 2023-09-20 12:38:27 +08:00
puhui999
d740a4d894 订单管理：完善订单详情 
(cherry picked from commit f0249e94a5)
 2023-09-20 12:34:53 +08:00
puhui999
d44c616ecd 售后退款：完善售后管理（列表、详情） 
(cherry picked from commit 07a0530fc9)
 2023-09-20 12:34:48 +08:00
puhui999
ad2c6654c1 fix: 修正合并差异 
(cherry picked from commit 3e7945e437)
 2023-09-20 12:34:38 +08:00
YunaiV
27bdeb9b50 code review 
(cherry picked from commit 3918fab1ec)
 2023-09-20 12:34:16 +08:00
puhui999
a2a343ac2e fix: 1、修复营销活动相关页面打不开的问题 2、修复 spu 添加失败的问题 2、重构 spu 的 sku 校验方式为通用配置的方式 
(cherry picked from commit f9780b636c)
 2023-09-20 12:33:46 +08:00
puhui999
45e0f5fb6d 更新订单和售后退款详情页面路由 
(cherry picked from commit 264a29e451)
 2023-09-20 12:33:33 +08:00
puhui999
e777f77ba9 订单列表：添加配送方式筛选 
(cherry picked from commit 688dad319e)
 2023-09-20 12:33:30 +08:00
puhui999
ca94a1f274 商品列表：修复添加属性时会返回已存在属性值的问题 
(cherry picked from commit 5c7796ca6f)
 2023-09-20 12:33:25 +08:00
puhui999
95f0a06667 订单售后列表：完善部分 TODO 
(cherry picked from commit f5a1772464)
 2023-09-20 12:33:19 +08:00
AKING
7ea15cc0d7 update src/hooks/web/useCrudSchemas.ts. 
解决了当使用默认的dict选项时，form中事件不能触发的问题

Signed-off-by: AKING <2734339436@qq.com>
(cherry picked from commit 3e67f3bc4c)
 2023-09-20 12:33:10 +08:00
YunaiV
8364e52477 code review：售后详情 
(cherry picked from commit 29b8d06ff2)
 2023-09-20 12:32:48 +08:00
owen
c999b72692 mall：优惠券 商品适用范围，增加商品分类 
(cherry picked from commit 27219e1833)
 2023-09-20 12:30:42 +08:00
owen
404bb00dbf mall：优惠券 商品选择组件 
(cherry picked from commit 60d2e3114b)
 2023-09-20 12:30:37 +08:00
puhui999
c738fd417a 订单售后列表：完善售后详情及相关操作 
(cherry picked from commit ed739aec55)
 2023-09-20 12:30:14 +08:00
YunaiV
ed41a9bed6 重构：商品详情界面的路由、文件路径 
(cherry picked from commit 8d026f0837)
 2023-09-20 12:30:02 +08:00
xingyu
c3ccd02f9e fix: router 
(cherry picked from commit 54c41b4445)
 2023-09-20 12:28:23 +08:00
xingyu
21ac6e0c3e fix: router 
(cherry picked from commit 547b1741fc)
 2023-09-20 12:27:24 +08:00
puhui999
52776c97da 订单售后列表：初始化售后详情 
(cherry picked from commit 8a51c9c771)
 2023-09-20 12:25:56 +08:00
puhui999
875211e24f 订单售后列表：重构列表 
(cherry picked from commit 4f81468695)
 2023-09-20 12:25:50 +08:00
puhui999
109e18dba6 订单列表： 修复差异 
(cherry picked from commit 8239ca474f)
 2023-09-20 12:25:45 +08:00
owen
529ac7d347 mall: 完善后台发送优惠券 
(cherry picked from commit beef6a0a94)
 2023-09-20 12:25:36 +08:00
YunaiV
b9c0d4ffa5 code review：商品评论 
(cherry picked from commit 5cd01903e4)
 2023-09-20 12:24:24 +08:00
YunaiV
4ffc150701 code review：会员中心 
(cherry picked from commit 2d8d323767)
 2023-09-20 12:23:45 +08:00
绮梦
48a230aac4 账户信息组件 增加等级、成长值和积分的显示。 
增加一些配套的svg 图标。
增加tab 的懒加载。

(cherry picked from commit 45a6b3bcc7)
 2023-09-20 12:23:26 +08:00
绮梦
a5046fd527 调整icon的大小 
(cherry picked from commit afaf7749c2)
 2023-09-20 12:23:17 +08:00