Commits · d626043046712b9d759dd51a1672e6857e8fe4bd · linweijiong / jinfa-platform · GitLab

10 Dec, 2020 8 commits
- Merge branch 'dev' into test · d6260430
  XieZhiXiong authored Dec 10, 2020
  
  d6260430
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · c3f62b7b
  XieZhiXiong authored Dec 10, 2020
  
  c3f62b7b
- 添加退款弹窗组件 · 13b268f1
  XieZhiXiong authored Dec 10, 2020
  
  13b268f1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ae6e3738
  XieZhiXiong authored Dec 10, 2020
  
  ae6e3738
- 完善业务逻辑 · 13156315
  XieZhiXiong authored Dec 10, 2020
  
  13156315
- Merge branch 'dev' into test · 5bc4d6d2
  前端-黄佳鑫 authored Dec 10, 2020
  
  5bc4d6d2
- 修改确认询价报价的schema · fb311c84
  前端-黄佳鑫 authored Dec 10, 2020
  
  fb311c84
- 修改会员支付策略配置 · 4f48f31a
  前端-黄佳鑫 authored Dec 10, 2020
  
  4f48f31a
09 Dec, 2020 21 commits
- Merge branch 'dev' into test · aea0a147
  前端-黄佳鑫 authored Dec 09, 2020
  
  aea0a147
- 修改销售订单点击跳带新增物流单传参的问题 · 898804f0
  前端-黄佳鑫 authored Dec 09, 2020
  
  898804f0
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · e88aab74
  XieZhiXiong authored Dec 09, 2020
  
  e88aab74
- 添加新增物流单跳转 · d3938b76
  XieZhiXiong authored Dec 09, 2020
  
  d3938b76
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · e6925110
  前端-黄佳鑫 authored Dec 09, 2020
  
  e6925110
- 待新建物流单完善 · 159cb901
  前端-黄佳鑫 authored Dec 09, 2020
  
  159cb901
- 新增加工发货、入库单字段 · 4f840d2a
  XieZhiXiong authored Dec 09, 2020
  
  4f840d2a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ee835fcc
  XieZhiXiong authored Dec 09, 2020
  
  ee835fcc
- 完善售后退货相关 · 5bb94b0e
  XieZhiXiong authored Dec 09, 2020
  
  5bb94b0e
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f8b53bdb
  GuanHua authored Dec 09, 2020
  
  f8b53bdb
- fix: 注册页面密码校验提示 · a1691abc
  GuanHua authored Dec 09, 2020
  
  a1691abc
- fix: 修改加工入库单路由 · 9b7432d2
  Bill authored Dec 09, 2020
  
  9b7432d2
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · c8c7dfb9
  Bill authored Dec 09, 2020
  
  c8c7dfb9
- fix: 修改加工列表页搜索 · a947e560
  Bill authored Dec 09, 2020
  
  a947e560
- 修改冲突 · 5ab0349b
  前端-黄佳鑫 authored Dec 09, 2020
  
  5ab0349b
- 待新增物流单修改 · c7b3d5e8
  前端-黄佳鑫 authored Dec 09, 2020
  
  c7b3d5e8
- Merge branch 'dev' into test · 1c9cadc9
  前端-钟卫鹏 authored Dec 09, 2020
  
  1c9cadc9
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · fb7f5abb
  前端-钟卫鹏 authored Dec 09, 2020
  
  fb7f5abb
- fix：处理品类属性区块关联平台树无法回显展开，关联平台品类树添加可搜索功能，编辑品牌时对应信息不做禁用处理/品牌列表添加原品牌列 · e80fc922
  前端-钟卫鹏 authored Dec 09, 2020
  
  e80fc922
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1d8932ff
  GuanHua authored Dec 09, 2020
  
  1d8932ff
- fix: 注册页面添加密码提示 · 6b6eae81
  GuanHua authored Dec 09, 2020
  
  6b6eae81
08 Dec, 2020 11 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ff1de435
  XieZhiXiong authored Dec 08, 2020
  
  ff1de435
- 对接售后退货相关 · 495e4c27
  XieZhiXiong authored Dec 08, 2020
  
  495e4c27
- fix：处理新增采购订单采购数量变动清空原有支付信息 · e07df5e0
  前端-钟卫鹏 authored Dec 08, 2020
  
  e07df5e0
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 46372949
  Bill authored Dec 08, 2020
  
  46372949
- fix:修改加工搜索 · e85d3cab
  Bill authored Dec 08, 2020
  
  e85d3cab
- Merge branch 'dev' into test · 47d84899
  前端-钟卫鹏 authored Dec 08, 2020
  
  47d84899
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 93d8fd62
  前端-钟卫鹏 authored Dec 08, 2020
  
  93d8fd62
- fix：处理新增/编辑采购订单只能在物流方式下使用到付，处理销售订单改运费没有更新订单数据，处理待新建入库单单号无法跳转 · 93e2bbef
  前端-钟卫鹏 authored Dec 08, 2020
  
  93e2bbef
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · ad67cfef
  Bill authored Dec 08, 2020
  
  ad67cfef
- chore: package.json 10和25环境socket需要添加端口 · 12f4c69c
  Bill authored Dec 08, 2020
  
  12f4c69c
- Merge branch 'dev' into test · db570bb9
  前端-钟卫鹏 authored Dec 08, 2020
  
  db570bb9