1042 Commits

Author SHA1 Message Date
xingyu
345c2443be chore: stylelint config
(cherry picked from commit bf2c59c6e04bb05a933691c368bc318bca3dffe3)
2024-03-05 17:23:53 +08:00
xingyu
0ed18fde8a chore: eslint config
(cherry picked from commit 50f1ae9524a09916f5dced435803fdd18181500c)
2024-03-05 17:23:48 +08:00
xingyu
bdcdadfd20 chore: vscode setting
(cherry picked from commit 96db6ab53880f97585f163981f71d7143f0c8823)
2024-03-05 17:23:43 +08:00
xingyu
1c86d00991 chore: update vue v3.3.7
(cherry picked from commit b8403c1b90deb364632f043d2692f7064706f667)
2024-03-05 17:23:34 +08:00
Wanwan
c0a10146d6 feat: 客户表的 crud
(cherry picked from commit 044754cdb4cd78543ce9550d8b45923dd82ef8bf)
2024-03-05 17:23:20 +08:00
YunaiV
2f6202d76b 1.8.3 版本发布
(cherry picked from commit ef334dfc6601d0804f826e3c1a5c3349103e87cd)
2024-03-05 17:22:57 +08:00
YunaiV
9bc0638598 修复 banner 返回字段不对
(cherry picked from commit 539352f598503dfe35f04c66ba9f0cfb7ea482e3)
2024-03-05 17:22:51 +08:00
YunaiV
6ca92b9251 code review:banner 逻辑
(cherry picked from commit e5d6a9dae1caa66053f1a98fb0373bccf4fe98e8)
2024-03-05 17:22:30 +08:00
puhui999
11bc949309 优惠卷模版样式调整
(cherry picked from commit 95d7d1eb426151e70f0bc41a8b2b129c5ebd0ebe)
2024-03-05 17:22:21 +08:00
puhui999
8c5cdd0ea5 商品 spu 脱离优惠卷模块
(cherry picked from commit 75135e1e4f8bc44aa9cadb81f1acce3093cf931b)
2024-03-05 17:22:16 +08:00
puhui999
1298c3dd52 完善 banner 管理
(cherry picked from commit a7439ee08b59d47ef1162e0b1db93e94d2f3cb45)
2024-03-05 17:22:09 +08:00
KONGDY-PC\Kongdy
5a67f1c051 满减页面布局
(cherry picked from commit 7c8f7d570f4e5027f604dd15a561525891ac0378)
2024-03-05 17:22:06 +08:00
YunaiV
eecf209aad code review:banner 逻辑
(cherry picked from commit 2dbfa77bee275031d732112bc178232ecaa2c33d)
2024-03-05 17:21:37 +08:00
YunaiV
b7c81fb37d code review:限时折扣
(cherry picked from commit 423ea319e006c1da3c6ffe6d4d64ab75fd084f3d)
2024-03-05 17:21:27 +08:00
kehaiyou
6bffc7991f fix: 【工作流】--加签减签review修改接口地址
(cherry picked from commit 5cfb67d0472ccf3bcaecc0d9a4d6cadc6116e3b5)
2024-03-05 17:21:22 +08:00
jason
16aba063d1 钱包 - 优化
支付应用 - 证书模式增加应用私钥

(cherry picked from commit bb5945958bfa27c9d1668c71b8397ada1bcefb23)
2024-03-05 17:21:11 +08:00
puhui999
4fcdd63e51 新增 banner 管理
(cherry picked from commit 491b3a5018db069f0237473441b1189273ee0f0d)
2024-03-05 17:21:03 +08:00
913752709@qq.com
772ded7eca feat: crm 线索表完善 review 提到的问题
(cherry picked from commit fb90a85e43aca87705699425409e5bc2a3e6d659)
2024-03-05 17:20:59 +08:00
liuhongfeng
47f948f26b 【新增】回款计划 功能
(cherry picked from commit 26780c3525405b9e9109854edea2cee6f75c3d93)
2024-03-05 17:20:37 +08:00
liuhongfeng
7b020781f0 【新增】回款管理 功能
(cherry picked from commit 7ad1457f799cf7af8252316dc6cda36165062a53)
2024-03-05 17:20:32 +08:00
puhui999
ea546e4831 完善文章管理 review 提到的问题
(cherry picked from commit 0730e215d89c7de7f5f5e67bffdf61074f855cd1)
2024-03-05 17:20:29 +08:00
zhangshuai
9f04b8e34b 限时折扣
(cherry picked from commit 9f77514c17cc5a45726db905d1c415948cce1a6e)
2024-03-05 17:20:00 +08:00
puhui999
139f45003d SPU: 新增完善活动优先级拖拽排序
(cherry picked from commit 1e8945de63f398fd2284843c5a70283b3ea18bf6)
2024-03-05 17:16:39 +08:00
puhui999
ccec7ad410 SPU: 完善优惠卷选择
(cherry picked from commit 01d78429cc68139d87138c66db93f85aec94dc14)
2024-03-05 17:15:16 +08:00
puhui999
de53601fcb SPU: 完善优惠卷选择
(cherry picked from commit 18df708b49ca43690622ecb12aead6d3b59e1b1d)
2024-03-05 17:14:29 +08:00
YunaiV
801ea4c176 code review:门店自提
(cherry picked from commit 2457665b55e75fa2ede8c83d551ea05d9bf08abf)
2024-03-05 17:14:23 +08:00
puhui999
e9da54b100 SPU: 新增优惠卷选择
(cherry picked from commit 3464bb9c74a0f3de9efc6ee5a4c42bac81c67485)
2024-03-05 17:12:24 +08:00
puhui999
b8b549462d OrderTableColumn: 商品信息列样式调整2
(cherry picked from commit 5b3bcecef2355e2b30f0251c0d52b07c487c74e8)
2024-03-05 17:12:20 +08:00
puhui999
a313663c99 OrderTableColumn: 商品信息列样式调整
(cherry picked from commit 094f8e16db9f09586ba359b1d9043dbc84c820d0)
2024-03-05 17:12:15 +08:00
puhui999
067c89d987 UserOrderList 重构完善
(cherry picked from commit 70778fd9e6142d615fee800b53ac060733ef915a)
2024-03-05 17:12:09 +08:00
puhui999
9dae60b597 订单列表:完善表头宽度自适应
(cherry picked from commit 5270c83876980719f3c6127d4f13bb9dd77835bf)
2024-03-05 17:11:37 +08:00
913752709@qq.com
a5f21a9b9f feat: CRM 线索表 crud
(cherry picked from commit 7af2a3bcc31dcfdc65db4fec968008b3a834bd2e)
2024-03-05 17:11:33 +08:00
puhui999
bb18f469de 订单列表:自定义列抽离封装为组件
(cherry picked from commit 04d88ce1a61cacbf613f7d77565334bc15abfd12)
2024-03-05 17:11:17 +08:00
puhui999
432620ffec 营销文章:新增表单属性移除浏览量
(cherry picked from commit d1a3fe5d5a91ea5f782d1c83abb7b6a111ec0a14)
2024-03-05 17:10:30 +08:00
owen
d04c1f0213 统计卡片修改为全局组件
(cherry picked from commit 431fff28ce84f281b619d432eaae06df0ee54287)
2024-03-05 17:08:22 +08:00
owen
174b95fdef 交易:核销订单
(cherry picked from commit 61b3bdfd4c8d06e88341cb4f40b16f736485c1f2)
2024-03-05 17:07:35 +08:00
YunaiV
56b7e35d49 code review:crm 合同流程
(cherry picked from commit 8832eafaae327cf11e2918991cbe3c9939eeb386)
2024-03-05 17:07:27 +08:00
1163996518@qq.com
0e0456d4f8 支付渠道配置--修复权限
(cherry picked from commit 533b4e5006c13892eba5e5b4e9cbd8840b65a35d)
2024-03-05 17:07:21 +08:00
1163996518@qq.com
6721122bc2 支付渠道配置--修复权限
(cherry picked from commit d5328918ab91235de633fe252591ad2831a68b86)
2024-03-05 17:07:17 +08:00
YunaiV
231285a4ef code review:修复工作流的审批界面报错问题
(cherry picked from commit c27685285a6dfac271b4337f46ab6c5067624cee)
2024-03-05 17:06:53 +08:00
owen
18b7dd3b7e 交易:订单核销
(cherry picked from commit 6fc232b758f5d540389be60367b6866ded7ec5aa)
2024-03-05 17:06:12 +08:00
dhb52
d85494bf05 feat: CRM/合同 crud
(cherry picked from commit dced551698dd133b87acda47d8e2724e8d01077e)
2024-03-05 17:05:58 +08:00
jason
1d602e0a31 钱包 - 钱包余额流水
(cherry picked from commit c3f06f5fbe343b954f4f25ef2010a6c694f3dcf3)
2024-03-05 17:03:59 +08:00
jason
b3b9fbc201 钱包 - 钱包余额流水
(cherry picked from commit 8626bccc4c7258a3676ef6174de3262a8f88397a)
2024-03-05 17:03:54 +08:00
owen
aaead6c2b9 统计:修复错误
(cherry picked from commit e3a0cfe5e934f2d4863012821545864c845cdbf2)
2024-03-05 17:03:47 +08:00
owen
1dba566d1d 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】
(cherry picked from commit 6204ce6c1b70c5c878f3e21de6d286935ed8ef15)
2024-03-05 17:03:42 +08:00
owen
25a1e27a12 统计:Review修改
(cherry picked from commit cd4b4cd3228a95fcc827ddfdccaf3949d2546a7c)
2024-03-05 17:03:35 +08:00
YunaiV
e3f1c21e53 code review:文章管理
(cherry picked from commit 66ec61080171302caa77f06145d835bb6c2ba7fe)
2024-03-05 17:03:19 +08:00
xingyu
16eb97e366 perf: is utils
(cherry picked from commit 8c18ad941e5cd308cffa16cb55a634f5d53ffa0d)
2024-03-05 17:03:10 +08:00
xingyu
5ef9a14f3a perf: propTypes
(cherry picked from commit 5da9b660bdfebf1d6e59f651952b59ff7f28602c)
2024-03-05 17:02:56 +08:00