 lhm
|
93040015e7
所有商品导入时，如果存在，则更新
|
3 gadi atpakaļ |
|
lhm
|
42119c9a82
Merge branch 'master' of lhm/kmall-haikong into master
|
3 gadi atpakaļ |
|
lhm
|
916b6d924e
收银页新增可选择不使用积分抵扣开关
|
3 gadi atpakaļ |
|
lhm
|
cd6f7c7653
fix:会员管理显示不全
|
3 gadi atpakaļ |
|
lhm
|
3039be14c2
fix:积分赠送规则，修改时不显示积分类型
|
3 gadi atpakaļ |
|
lhm
|
220cb4b705
删除活动，同时删除对应活动详情
|
3 gadi atpakaļ |
|
lhm
|
8e583118ee
活动形式管理：jfdk改为积分抵扣
|
3 gadi atpakaļ |
|
lhm
|
2a4dd30b25
收银页付款新增会员信息与订单金额信息
|
3 gadi atpakaļ |
|
lhm
|
68cfe2f9ad
首页会员相关去除
|
3 gadi atpakaļ |
 zhh
|
18ad1237f5
Merge remote-tracking branch 'upsteam/master'
|
3 gadi atpakaļ |
|
lhm
|
b414c0b48f
Merge branch 'master' of lhm/kmall-haikong into master
|
3 gadi atpakaļ |
|
lhm
|
869eb2c6b8
fix bug
|
3 gadi atpakaļ |
 钱能归
|
8a6d68e023
Merge branch 'feature/欢迎页的数据调整1224' of qng/kmall-haikong into master
|
3 gadi atpakaļ |
|
qng
|
e0ea93e7e4
订单取消
|
3 gadi atpakaļ |
|
qng
|
a38ed84be2
欢迎页数据源更换
|
3 gadi atpakaļ |
|
lhm
|
a2b00db8bd
Merge branch 'master' of lhm/kmall-haikong into master
|
3 gadi atpakaļ |
|
lhm
|
83f917f305
收银端逻辑优化
|
3 gadi atpakaļ |
|
lhm
|
07aff20d9e
Merge branch 'master' of lhm/kmall-haikong into master
|
3 gadi atpakaļ |
|
lhm
|
93b9d4747b
库存校验优化
|
3 gadi atpakaļ |
|
lhm
|
39e07852ee
库存校验优化，小票打印调整
|
3 gadi atpakaļ |
|
lhm
|
f389c58094
登录页面样式调整
|
3 gadi atpakaļ |
|
lhm
|
c67dd7cff5
图片修改，日志地址修改
|
3 gadi atpakaļ |
|
lhm
|
6d0cfe60ec
按钮样式修改
|
3 gadi atpakaļ |
|
lhm
|
943bd34e41
fix:多个积分变动记录详情，日志优化
|
3 gadi atpakaļ |
|
lhm
|
e24b3991c4
Merge branch 'master' of zhh/kmall-haikong into master
|
3 gadi atpakaļ |
|
zhh
|
7c0ce2a8cb
修改管理端收银管理页面和修复bug
|
3 gadi atpakaļ |
|
zhh
|
af5b700bd0
Merge remote-tracking branch 'upsteam/master'
|
3 gadi atpakaļ |
|
lhm
|
50195bb59b
Merge branch 'master' of lhm/kmall-haikong into master
|
3 gadi atpakaļ |
|
lhm
|
47cfe35ff1
fix:收银端bug，截止时间导入问题
|
3 gadi atpakaļ |
|
zhh
|
d6c4b64f1a
Merge remote-tracking branch 'upsteam/master'
|
3 gadi atpakaļ |
