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 |