YunaiV
|
63fd52828c
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 19:03:02 +08:00 |
|
YunaiV
|
aa99c53729
|
Merge branch 'master' of https://gitee.com/yudaocode/yudao-ui-admin-vue3 into dev
# Conflicts:
# src/views/mall/statistics/member/index.vue
|
2023-10-17 19:02:37 +08:00 |
|
芋道源码
|
0242c84196
|
!267 【工作流】加签和减签
Merge pull request !267 from Youkehai/feature/addSignAndSubSign
|
2023-10-17 11:01:18 +00:00 |
|
jason
|
c3f06f5fbe
|
钱包 - 钱包余额流水
|
2023-10-16 22:45:32 +08:00 |
|
jason
|
8626bccc4c
|
钱包 - 钱包余额流水
|
2023-10-16 22:32:10 +08:00 |
|
jason
|
ae2c3f2ad5
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-16 22:27:39 +08:00 |
|
YunaiV
|
66ec610801
|
code review：文章管理
|
2023-10-16 21:55:11 +08:00 |
|
xingyu
|
1a1b70a350
|
style: stylelint
|
2023-10-16 15:04:05 +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 |
|
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 |
|
YunaiV
|
e2a08ddbac
|
恢复 SSO 界面的路由
|
2023-10-15 21:58:19 +08: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
|
4d77d7e136
|
feat: 社交平台登录
|
2023-10-15 14:26:20 +08:00 |
|
puhui999
|
36bb90fbb8
|
营销活动：新增文章分类管理
|
2023-10-15 00:54:28 +08: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
|
f9d0c1aa1c
|
钱包-充值套餐
|
2023-10-14 11:32:54 +08:00 |
|
xingyu
|
e04ca7aac7
|
fix: unocss eslint
|
2023-10-13 10:34:01 +08: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 |
|
puhui999
|
3500a20630
|
营销活动：完善 review 提到的问题，添加拼团列表查看弹窗
|
2023-10-10 16:53:22 +08:00 |
|
youkehai
|
62a953815d
|
fix: 减签按钮显示和api地址修改
|
2023-10-10 10:40:30 +08:00 |
|
owen
|
6b7040404e
|
统计：会员统计
|
2023-10-09 23:27:32 +08:00 |
|
owen
|
d4a521eff1
|
统计：交易统计Review修改
|
2023-10-09 23:27:32 +08:00 |
|
kehaiyou
|
683e319c72
|
fix: 【工作流】--加签减签
|
2023-10-08 22:35:50 +08:00 |
|
YunaiV
|
86323f970b
|
code review：拼团记录列表
|
2023-10-08 07:30:14 +08:00 |
|
天痕
|
fff4cfd012
|
修复，刷新菜单缓存失效问题
Signed-off-by: 天痕 <614891294@qq.com>
|
2023-10-07 10:51:56 +00:00 |
|
puhui999
|
5b4983a3e9
|
拼团记录：优化页面布局，添加日期快捷选项
|
2023-10-07 11:10:26 +08:00 |
|
puhui999
|
8c347e5990
|
拼团活动：表单添加虚拟成团控制按钮
|
2023-10-07 10:04:05 +08:00 |
|
puhui999
|
e86dfa30fd
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-06 22:21:10 +08:00 |
|
puhui999
|
c445173855
|
拼团记录：接口对接
|
2023-10-06 22:20:40 +08:00 |
|
YunaiV
|
24fc36e23a
|
promotion：调整拼团活动的界面
|
2023-10-06 21:03:17 +08:00 |
|
puhui999
|
eee3d0fef5
|
拼团记录： 完成 UI 部分
|
2023-10-06 18:40:21 +08:00 |
|
YunaiV
|
78062dd474
|
promotion：调整拼团活动的界面
|
2023-10-06 10:58:31 +08:00 |
|
puhui999
|
869bac2501
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
|
2023-10-05 21:50:33 +08:00 |
|
YunaiV
|
cf7ac2cb10
|
promotion：新增记录记录列表
|
2023-10-05 12:42:00 +08:00 |
|
YunaiV
|
860872a890
|
promotion：新增砍价记录列表
|
2023-10-05 12:06:57 +08:00 |
|
YunaiV
|
42f0bf07f0
|
promotion：优化砍价活动的管理
|
2023-10-05 02:17:44 +08:00 |
|
owen
|
58b6b1ba57
|
交易：核销
|
2023-10-04 10:51:35 +08:00 |
|
YunaiV
|
7c491ff62a
|
promotion：优化秒杀活动的界面
|
2023-10-03 18:41:57 +08:00 |
|
YunaiV
|
40f44fc78e
|
promotion：优化优惠劵的界面
|
2023-10-03 13:01:31 +08:00 |
|