Commit Graph

1522 Commits

Author SHA1 Message Date
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
kehaiyou
683e319c72 fix: 【工作流】--加签减签 2023-10-08 22:35:50 +08:00
风狗
aa5f27bec7
修复 floatToFixed2 函数某些情况下计算结果为零 Closes #I8671C
Signed-off-by: 风狗 <909275705@qq.com>
2023-10-08 08:26:07 +00:00
YunaiV
86323f970b code review:拼团记录列表 2023-10-08 07:30:14 +08:00
芋道源码
523784ce41
!264 营销活动:添加拼团记录
Merge pull request !264 from puhui999/dev-to-dev
2023-10-07 23:06:18 +00: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
owen
c8a476ac7c Merge remote-tracking branch 'origin/dev' into dev 2023-10-06 14:17:13 +08:00
owen
2a58b04a98 统计:交易统计Review修改 2023-10-06 14:15:58 +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
芋道源码
4c2eb3d8b2
!262 核销
Merge pull request !262 from 疯狂的世界/dev
2023-10-04 09:34:20 +00: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
YunaiV
59ab6218ca trade:优化分销界面的 width 列宽度,和一些非空判断 2023-10-03 12:16:24 +08:00
芋道源码
04a94ad941
!254 解决处理顶级非目录路由的组件名称逻辑缺失的问题
Merge pull request !254 from clockdotnet/master_pr
2023-10-03 02:27:37 +00:00
芋道源码
e6ee0ab445
!261 对齐面包屑的图标和文字
Merge pull request !261 from 疯狂的世界/dev
2023-10-02 16:00:45 +00:00
owen
6515e218e2 Merge branch 'dev' into dev_local 2023-10-02 23:58:41 +08:00
owen
a06a63c1be Merge remote-tracking branch 'origin/dev' into dev 2023-10-02 23:52:23 +08:00
YunaiV
ab95d87c68 trade:优化门店的 list 列表,新增是否自提的配置项 2023-10-02 21:18:31 +08:00
YunaiV
a9bbbc7b0a trade:优化运费模版的实现 2023-10-02 18:30:22 +08:00
YunaiV
bb08f6f54f trade:完善退款详情 2023-10-02 15:44:26 +08:00
owen
df8a3941c1 对齐面包屑的图标和文字 2023-10-02 11:11:07 +08:00
owen
4c077711a1 对齐面包屑的图标和文字 2023-10-02 11:03:46 +08:00
YunaiV
4fddbccea1 trade:完善订单详情 2023-10-02 10:34:37 +08:00