puhui999
|
d62bbcdd92
|
Merge remote-tracking branch 'yudao/dev' into dev-to-dev
# Conflicts:
# package.json
# src/views/member/user/detail/UserOrderList.vue
|
2023-10-20 16:40:19 +08:00 |
|
puhui999
|
1e8945de63
|
SPU: 新增完善活动优先级拖拽排序
|
2023-10-20 16:36:50 +08:00 |
|
puhui999
|
01d78429cc
|
SPU: 完善优惠卷选择
|
2023-10-20 15:35:01 +08:00 |
|
puhui999
|
18df708b49
|
SPU: 完善优惠卷选择
|
2023-10-20 11:48:59 +08:00 |
|
YunaiV
|
2457665b55
|
code review：门店自提
|
2023-10-20 09:46:15 +08:00 |
|
puhui999
|
3464bb9c74
|
SPU: 新增优惠卷选择
|
2023-10-19 17:33:42 +08:00 |
|
puhui999
|
5b3bcecef2
|
OrderTableColumn: 商品信息列样式调整2
|
2023-10-19 15:54:23 +08:00 |
|
puhui999
|
094f8e16db
|
OrderTableColumn: 商品信息列样式调整
|
2023-10-19 11:10:33 +08:00 |
|
puhui999
|
70778fd9e6
|
UserOrderList 重构完善
|
2023-10-19 10:54:10 +08:00 |
|
puhui999
|
5270c83876
|
订单列表：完善表头宽度自适应
|
2023-10-19 10:36:52 +08:00 |
|
puhui999
|
04d88ce1a6
|
订单列表：自定义列抽离封装为组件
|
2023-10-18 17:20:13 +08:00 |
|
puhui999
|
d1a3fe5d5a
|
营销文章：新增表单属性移除浏览量
|
2023-10-18 11:33:42 +08:00 |
|
owen
|
ff01effd45
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 23:26:08 +08:00 |
|
owen
|
431fff28ce
|
统计卡片修改为全局组件
|
2023-10-17 23:25:49 +08:00 |
|
owen
|
61b3bdfd4c
|
交易：核销订单
|
2023-10-17 23:18:07 +08:00 |
|
芋道源码
|
40ec1b08ae
|
!275 Review代码修改
Merge pull request !275 from 疯狂的世界/dev
|
2023-10-17 12:52:28 +00:00 |
|
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 |
|
owen
|
57f6367596
|
Merge remote-tracking branch 'origin/dev' into dev
|
2023-10-17 16:09:55 +08:00 |
|
owen
|
6fc232b758
|
交易：订单核销
|
2023-10-17 16:09:36 +08: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 |
|
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 |
|
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 |
|
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
|
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 |
|