Commit Graph

1258 Commits (4ddf19a60184c296ed0432efaeb0c7621022e72c)

Author SHA1 Message Date
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
xingyu 874793867e chore: update deps
(cherry picked from commit 42c8db4f34)
2024-03-05 16:56:04 +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
xingyu 7f73ec7147 docs: element plus 2.4.0
(cherry picked from commit a2ded16718)
2024-03-05 16:52:58 +08:00
xingyu acfa2b3bfc chore: update deps
(cherry picked from commit de3fa7a765)
2024-03-05 16:52:53 +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
YunaiV a276be386e 同步最新 README.md 功能列表
(cherry picked from commit 470fb23ae1)
2024-03-05 16:49:40 +08:00
xingyu 71a674a1c9 docs: update deps
(cherry picked from commit 9b09304c50)
2024-03-05 16:49:30 +08:00
xingyu 46bce2750f fix: unocss eslint
(cherry picked from commit e04ca7aac7)
2024-03-05 16:49:25 +08:00
xingyu 612803f6b2 chore: update deps
(cherry picked from commit 73b2030c7f)
2024-03-05 16:49:16 +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