Commits · 2aac24e74117866b7753bd1b72c594a14b77e815 · linweijiong / jinfa-platform · GitLab

02 Dec, 2020 12 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 2aac24e7
  GuanHua authored Dec 02, 2020
  
  2aac24e7
- fix: 用户管理加密方法 · 893e80eb
  前端-许佳敏 authored Dec 02, 2020
  
  893e80eb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 63a73465
  GuanHua authored Dec 02, 2020
  
  63a73465
- feat:remove fontwesome css · 8b1e3910
  GuanHua authored Dec 02, 2020
  
  8b1e3910
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4900d442
  前端-许佳敏 authored Dec 02, 2020
  
  4900d442
- chore: 优化api获取方式 · 3b596919
  前端-许佳敏 authored Dec 02, 2020
  
  3b596919
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 66f79ddc
  前端-钟卫鹏 authored Dec 02, 2020
  
  66f79ddc
- fix：处理新增仓位不指定会员也能提交，处理新增采购订单开具发票个人和企业表单联动问题 · fbb7e9fb
  前端-钟卫鹏 authored Dec 02, 2020
  
  fbb7e9fb
- fix:店铺积分商品列表数据不对的问题 · efaa63d7
  GuanHua authored Dec 02, 2020
  
  efaa63d7
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ecc45c58
  GuanHua authored Dec 02, 2020
  
  ecc45c58
- fix:商品列表属性筛选问题;购买数量小数点问题 · a08dee18
  GuanHua authored Dec 02, 2020
  
  a08dee18
- 修改询价模块搜索询价会员被询价会员字段 · a906a8dd
  前端-黄佳鑫 authored Dec 02, 2020
  
  a906a8dd
01 Dec, 2020 20 commits
- Merge branch 'dev' into test · a4bd954d
  前端-黄佳鑫 authored Dec 01, 2020
  
  a4bd954d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · e4825f7f
  前端-黄佳鑫 authored Dec 01, 2020
  
  e4825f7f
- 修改物流模块的BUG，修改询价报价下单据时间拿错的问题，修改 · 77f2fac2
  前端-黄佳鑫 authored Dec 01, 2020
  
  77f2fac2
- Merge branch 'dev' into test · ed793325
  前端-钟卫鹏 authored Dec 01, 2020
  
  ed793325
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a8260a1d
  前端-钟卫鹏 authored Dec 01, 2020
  
  a8260a1d
- fix：处理仓位传参列表传参问题，处理销售订单修改价格和支付比例的价格同步 · aeb92ad0
  前端-钟卫鹏 authored Dec 01, 2020
  
  aeb92ad0
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a76deccd
  前端-许佳敏 authored Dec 01, 2020
  
  a76deccd
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 436b13df
  Bill authored Dec 01, 2020
  
  436b13df
- fix: 修改首页css 以及加工能力bug · f77c3000
  Bill authored Dec 01, 2020
  
  f77c3000
- fix:商品类型筛选问题 · 680e09e8
  GuanHua authored Dec 01, 2020
  
  680e09e8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b9e486a5
  GuanHua authored Dec 01, 2020
  
  b9e486a5
- fix:下单添加是否会员折扣字段 · a8ff1c0b
  GuanHua authored Dec 01, 2020
  
  a8ff1c0b
- Merge branch 'dev' into test · 54334763
  前端-钟卫鹏 authored Dec 01, 2020
  
  54334763
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · 52da3e36
  前端-钟卫鹏 authored Dec 01, 2020
  
  52da3e36
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1288f304
  前端-钟卫鹏 authored Dec 01, 2020
  
  1288f304
- fix：处理积分订单和订单类型显示异常 · 9a3012a6
  前端-钟卫鹏 authored Dec 01, 2020
  
  9a3012a6
- fix：处理添加积分商品不允许勾选会员折扣，处理仓位分配库存数值精度处理 · ff4e496d
  前端-钟卫鹏 authored Dec 01, 2020
  
  ff4e496d
- fix：处理添加积分商品不允许勾选会员折扣，处理仓位分配库存数值精度处理 · 027511e4
  前端-钟卫鹏 authored Dec 01, 2020
  
  027511e4
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 54d97bbc
  前端-黄佳鑫 authored Dec 01, 2020
  
  54d97bbc
- 修改需求发布新增列表 · 49bd3c0f
  前端-黄佳鑫 authored Dec 01, 2020
  
  49bd3c0f
30 Nov, 2020 8 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · c3e0c079
  Bill authored Nov 30, 2020
  
  c3e0c079
- fix: 修改首页以及加工能力bug · 923386ed
  Bill authored Nov 30, 2020
  
  923386ed
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 822b6219
  前端-黄佳鑫 authored Nov 30, 2020
  
  822b6219
- 修改需求发布，物流缺少的东西 · 328623dd
  前端-黄佳鑫 authored Nov 30, 2020
  
  328623dd
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · fa3e352c
  前端-钟卫鹏 authored Nov 30, 2020
  
  fa3e352c
- fix：处理订单列表按原型显示 · c855f515
  前端-钟卫鹏 authored Nov 30, 2020
  
  c855f515
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · da7acd38
  GuanHua authored Nov 30, 2020
  
  da7acd38
- fix:1.跳转到接单页面链接错误;2.跳转到找现货筛选错误3.询价商品未选择属性时提示 · 4e8c822d
  GuanHua authored Nov 30, 2020
  
  4e8c822d