 shizhongqi
|
1abca23708
feat(order): 支持零元订单直接完成支付
|
2 hete |
 ouyang
|
f4e0dcac37
花掌柜设置，金刚区默认图标设置优化
|
3 hete |
|
shizhongqi
|
c7fd2b8639
Merge branch 'redesign-260706' of git.huaml.com:zhh/huahuibao into redesign-260706
|
3 hete |
|
shizhongqi
|
29c4c5b9ab
绿植花材商城码缓存键修改
|
3 hete |
|
ouyang
|
57acdd177c
Merge remote-tracking branch 'origin/redesign-260706' into redesign-260706
|
3 hete |
|
ouyang
|
5096abd24c
花掌柜PC后台新增订单本地A4打印
|
3 hete |
|
shizhongqi
|
ea011d6a8b
同城配送历史注释清理
|
3 hete |
|
shizhongqi
|
f26f7cb0be
fix(order): 避免拼团和秒杀订单叠加整单优惠
|
3 hete |
|
ouyang
|
8c73a85d85
Merge remote-tracking branch 'origin/redesign-260706' into redesign-260706
|
3 hete |
|
ouyang
|
dc262792c4
花掌柜手动开单、计算器开单，界面显示会员折扣/店铺优惠。手动开单不能再次计算优惠，支付金额以实际金额为准
|
3 hete |
 shish
|
5be1e83b9b
Merge branch 'after-sale' into redesign-260706
|
3 hete |
|
shish
|
37695a6e49
Merge branch 'master' into after-sale
|
3 hete |
|
shish
|
a39558cf5f
更新
|
3 hete |
|
shish
|
15d3057e9f
更新
|
3 hete |
|
shish
|
1ff268d0bf
更新
|
3 hete |
|
shish
|
a163828661
更新
|
3 hete |
|
shish
|
bf9c36e44d
增加门店名称
|
3 hete |
|
shish
|
59f6b3885b
ok
|
3 hete |
|
shish
|
c7fd2f2985
ok
|
3 hete |
|
shish
|
2e954e1ad7
更新
|
3 hete |
|
shish
|
e59556f238
Merge branch 'after-sale' into redesign-260706
|
3 hete |
|
shish
|
8ecbd15bb4
采购单的隔天售后
|
3 hete |
|
shish
|
9801860f45
优化
|
3 hete |
|
shish
|
b290a447cc
隔天售后线上订单，门店余额要减少
|
3 hete |
|
shish
|
607d58d8d7
Merge branch 'after-sale' into redesign-260706
|
3 hete |
|
shish
|
59e9151bc3
Merge branch 'master' into after-sale
|
3 hete |
|
shish
|
ca7d59de6b
更新
|
3 hete |
|
shish
|
f28f7a8b42
余额支付增加打印次数
|
3 hete |
|
shish
|
109b0826c9
提示
|
3 hete |
|
shish
|
573f717557
更新key
|
3 hete |
