Commit Graph

1455 Commits

Author SHA1 Message Date
owen
e3a0cfe5e9 统计:修复错误 2023-10-16 22:18:51 +08:00
owen
6204ce6c1b 统计:trade_statistics 字段【order_wallet_pay_price】改为【wallet_pay_price】 2023-10-16 22:09:20 +08:00
owen
cd4b4cd322 统计:Review修改 2023-10-16 22:03:36 +08:00
YunaiV
66ec610801 code review:文章管理 2023-10-16 21:55:11 +08:00
芋道源码
7b9ea62e6b
!273 商城首页
Merge pull request !273 from 疯狂的世界/dev
2023-10-16 12:11:23 +00:00
xingyu
8c18ad941e perf: is utils 2023-10-16 15:09:47 +08:00
xingyu
5da9b660bd perf: propTypes 2023-10-16 15:09:13 +08:00
xingyu
1a1b70a350 style: stylelint 2023-10-16 15:04:05 +08:00
xingyu
42c8db4f34 chore: update deps 2023-10-16 15:03:55 +08:00
owen
edfd03903f 统计:会员终端统计,处理未知终端情况 2023-10-16 14:26:04 +08:00
owen
2bfc9c3b13 统计:处理会员性别统计,存在未知的情况 2023-10-16 13:25:15 +08:00
owen
661e72bcfd 统计:修复错误 2023-10-16 13:15:17 +08:00
owen
8dec8edc6a Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 13:01:02 +08:00
owen
e1a72779d4 统计:Review修改 2023-10-16 13:00:13 +08:00
xingyu
a2ded16718 docs: element plus 2.4.0 2023-10-16 10:25:24 +08:00
xingyu
de3fa7a765 chore: update deps 2023-10-16 10:24:35 +08:00
YunaiV
99172ea088 code review:文章管理 2023-10-16 09:57:46 +08:00
owen
195309dbb6 Merge remote-tracking branch 'origin/dev' into dev 2023-10-16 09:52:35 +08:00
owen
3802fee661 商城:增加商城首页 2023-10-16 09:51:19 +08:00
芋道源码
cbb0cfefdb
!272 营销活动:新增文章管理,文章分类管理
Merge pull request !272 from puhui999/dev-to-dev
2023-10-15 14:04:48 +00:00
YunaiV
e2a08ddbac 恢复 SSO 界面的路由 2023-10-15 21:58:19 +08:00
芋道源码
04e83e268a
!271 添加社交登录页面,修复登录多次重定向问题
Merge pull request !271 from dhb52/master
2023-10-15 13:37:55 +00:00
jason
90d6f4da9f 钱包- 钱包余额查询 2023-10-15 17:47:36 +08:00
puhui999
50e43e4028 Merge remote-tracking branch 'yudao/dev' into dev-to-dev 2023-10-15 16:14:32 +08:00
puhui999
befffb3f7d 营销活动:新增文章管理。 2023-10-15 16:14:09 +08:00
dhb52
89417ac393 fix: 删除SSOLogin.vue组建,解决登录界面不停重定向问题 2023-10-15 14:58:13 +08:00
dhb52
3587d1ef97 fix: 路由缺少name字段,ts不高兴 2023-10-15 14:29:16 +08:00
dhb52
4d77d7e136 feat: 社交平台登录 2023-10-15 14:26:20 +08:00
puhui999
36bb90fbb8 营销活动:新增文章分类管理 2023-10-15 00:54:28 +08:00
芋道源码
889334bc37
!266 修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Merge pull request !266 from 风狗/N/A
2023-10-14 10:19:37 +00:00
芋道源码
b57b45c96f
!255 站内信测试增加 Member 用户类型支持
Merge pull request !255 from 风狗/dev
2023-10-14 10:18:54 +00:00
芋道源码
fa71f85221
!265 修复,刷新菜单缓存失效问题
Merge pull request !265 from 天痕/N/A
2023-10-14 10:15:13 +00:00
jason
8b6ca3028a Merge remote-tracking branch 'origin/dev' into dev 2023-10-14 11:33:15 +08:00
jason
f9d0c1aa1c 钱包-充值套餐 2023-10-14 11:32:54 +08:00
YunaiV
529a821cdb Merge remote-tracking branch 'origin/master' 2023-10-13 18:44:27 +08:00
YunaiV
470fb23ae1 同步最新 README.md 功能列表 2023-10-13 18:35:44 +08:00
xingyu
9b09304c50 docs: update deps 2023-10-13 10:41:10 +08:00
xingyu
e04ca7aac7 fix: unocss eslint 2023-10-13 10:34:01 +08:00
xingyu
73b2030c7f chore: update deps 2023-10-13 10:31:36 +08:00
芋道源码
6ed7b3a69e
!270 合并商城最新代码
Merge pull request !270 from 芋道源码/dev
2023-10-12 13:53:25 +00:00
芋道源码
532b237712
!268 统计:会员统计
Merge pull request !268 from 疯狂的世界/dev
2023-10-11 04:34:07 +00:00
YunaiV
855b37c1ab code review:拼团记录列表 2023-10-11 11:04:03 +08:00
芋道源码
19c19d78dd
!269 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗
Merge pull request !269 from puhui999/dev-to-dev
2023-10-11 02:40:01 +00:00
puhui999
b08e0e5ab2 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:55:53 +08:00
puhui999
3500a20630 营销活动:完善 review 提到的问题,添加拼团列表查看弹窗 2023-10-10 16:53:22 +08:00
youkehai
62a953815d fix: 减签按钮显示和api地址修改 2023-10-10 10:40:30 +08:00
owen
ad4607db09 Merge remote-tracking branch 'owen/dev' into dev 2023-10-09 23:29:36 +08:00
owen
6b7040404e 统计:会员统计 2023-10-09 23:27:32 +08:00
owen
d4a521eff1 统计:交易统计Review修改 2023-10-09 23:27:32 +08:00
owen
22adab8590 统计:会员统计 2023-10-09 23:27:09 +08:00