Commits · b39718ee033a79bb83e344912dbcae94d66247f4 · linweijiong / jinfa-platform · GitLab

04 Dec, 2020 26 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b39718ee
  前端-钟卫鹏 authored Dec 04, 2020
  
  b39718ee
- fix：处理发货单号无法跳转 · 25878831
  前端-钟卫鹏 authored Dec 04, 2020
  
  25878831
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 337db0fd
  XieZhiXiong authored Dec 04, 2020
  
  337db0fd
- fix: 修复单据类型编号偶尔不存在的问题 · 5e1a0bb7
  XieZhiXiong authored Dec 04, 2020
  
  5e1a0bb7
- fix: 修改判断工作流和下单接口参数 · c8ca9dad
  GuanHua authored Dec 04, 2020
  
  c8ca9dad
- fix: 判断工作流接口添加参数 · f24c8707
  GuanHua authored Dec 04, 2020
  
  f24c8707
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 0f4c612b
  GuanHua authored Dec 04, 2020
  
  0f4c612b
- fix: 判断交易规则接口添加参数 · 9aaa3b90
  GuanHua authored Dec 04, 2020
  
  9aaa3b90
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · cf6eff75
  前端-钟卫鹏 authored Dec 04, 2020
  
  cf6eff75
- fix：新增采购订单查询内部工作流添加memberRoleId和orderModel字段，处理添加发票弹框提交无校验问题 · b24e8ce3
  前端-钟卫鹏 authored Dec 04, 2020
  
  b24e8ce3
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 5463ef6a
  Bill authored Dec 04, 2020
  
  5463ef6a
- fix: 修改首页自适应 · b76c04ec
  Bill authored Dec 04, 2020
  
  b76c04ec
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · e6d719e0
  GuanHua authored Dec 04, 2020
  
  e6d719e0
- fix: 进货单勾选状态问题 · 18ce0d24
  GuanHua authored Dec 04, 2020
  
  18ce0d24
- fix： · 1109e1c7
  前端-钟卫鹏 authored Dec 04, 2020
  
  1109e1c7
- chore:修改构建方式 · e7262173
  前端-许佳敏 authored Dec 04, 2020
  
  e7262173
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 713de7d4
  前端-许佳敏 authored Dec 04, 2020
  
  713de7d4
- style: config · e7ce587d
  前端-许佳敏 authored Dec 04, 2020
  
  e7ce587d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a610a9b9
  XieZhiXiong authored Dec 04, 2020
  
  a610a9b9
- feat: 对接最新评价接口字段、调整平价详情相关字段 · 738ef1a7
  XieZhiXiong authored Dec 04, 2020
  
  738ef1a7
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d13aa7e5
  GuanHua authored Dec 04, 2020
  
  d13aa7e5
- fix: 1.商品列表排序问题;2.模板装修品类参数问题 · 52bf3f9e
  GuanHua authored Dec 04, 2020
  
  52bf3f9e
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 8b9ca25d
  前端-黄佳鑫 authored Dec 04, 2020
  
  8b9ca25d
- 去掉原先老的需求发布路由 · 1154cf80
  前端-黄佳鑫 authored Dec 04, 2020
  
  1154cf80
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a77f5329
  前端-钟卫鹏 authored Dec 04, 2020
  
  a77f5329
- fix：新建采购订单查询表支付信息添加memberRoleId和orderModel字段 · 073222a1
  前端-钟卫鹏 authored Dec 04, 2020
  
  073222a1
03 Dec, 2020 14 commits
- 合并冲突 · 97696e3d
  XieZhiXiong authored Dec 03, 2020
  
  97696e3d
- 走完一遍售后换货流程 · 3255f3fd
  XieZhiXiong authored Dec 03, 2020
  
  3255f3fd
- 修改冲突 · 48f976f0
  前端-黄佳鑫 authored Dec 03, 2020
  
  48f976f0
- refactor: 重构需求发布 · a5693060
  前端-黄佳鑫 authored Dec 03, 2020
  
  a5693060
- merge: 解决冲突 · e9a8edc4
  Bill authored Dec 03, 2020
  
  e9a8edc4
- refactor: 重构首页，适配小屏 · 19207fdb
  Bill authored Dec 03, 2020
  
  19207fdb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f52b6d98
  GuanHua authored Dec 03, 2020
  
  f52b6d98
- fix:店铺模板装修修改查询品牌列表的接口 · acc79611
  GuanHua authored Dec 03, 2020
  
  acc79611
- fix:下单接口添加shopId和memberRoleId参数 · b1d55385
  GuanHua authored Dec 03, 2020
  
  b1d55385
- fix： · 3229623c
  前端-钟卫鹏 authored Dec 03, 2020
  
  3229623c
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 814acebb
  前端-钟卫鹏 authored Dec 03, 2020
  
  814acebb
- fix：处理销售订单确认回单和继续发货按钮显示异常 · fe38862f
  前端-钟卫鹏 authored Dec 03, 2020
  
  fe38862f
- fix：处理编辑交易规则商品无分页问题，处理销售订单商品区块修改价格后乱序问题，处理商城跳转过来的订单会员折扣传参异常 · 27c98491
  前端-钟卫鹏 authored Dec 03, 2020
  
  27c98491
- fix:下单接口添加传参参数 · ed5f0b49
  GuanHua authored Dec 03, 2020
  
  ed5f0b49