Commits · ee835fcc65c5735a900b8118ed706eef2f790920 · 黄庭坚 / jinfa-platform · GitLab

09 Dec, 2020 13 commits
- 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' 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' 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' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 007661b7
  前端-钟卫鹏 authored Dec 08, 2020
  
  007661b7
- fix：处理新增/编辑采购订单支付方式渠道提交异常，处理新增/编辑采购订单商品区块高级筛选品类品牌异常 · 89b094a7
  前端-钟卫鹏 authored Dec 08, 2020
  
  89b094a7
07 Dec, 2020 16 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · e25588a3
  前端-黄佳鑫 authored Dec 07, 2020
  
  e25588a3
- 修改询价模块详情step,修改物流待新增物流单模块 · 82e1cde8
  前端-黄佳鑫 authored Dec 07, 2020
  
  82e1cde8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 37624bd4
  GuanHua authored Dec 07, 2020
  
  37624bd4
- fix: 商品属性分类筛选问题 · 6f321ec5
  GuanHua authored Dec 07, 2020
  
  6f321ec5
- fix: 修改package.json 删除socket接口 · e18c97d4
  Bill authored Dec 07, 2020
  
  e18c97d4
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 82899bd1
  Bill authored Dec 07, 2020
  
  82899bd1
- fix: 修改socket参数 · 335fb03d
  Bill authored Dec 07, 2020
  
  335fb03d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b932ee57
  GuanHua authored Dec 07, 2020
  
  b932ee57
- fix: 渠道模板装修接口添加参数 · 6b21958e
  GuanHua authored Dec 07, 2020
  
  6b21958e
- fix: 修改socket添加token以及规定接收信息的数据结构 · a5e388c5
  Bill authored Dec 07, 2020
  
  a5e388c5
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · ebf4cdf9
  Bill authored Dec 07, 2020
  
  ebf4cdf9
- fix: 修改加工订单时,订单号为必填 · 21e004d1
  Bill authored Dec 07, 2020
  
  21e004d1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1fbb162d
  GuanHua authored Dec 07, 2020
  
  1fbb162d
- fix: 商品右侧消息链接添加 · 585e9ebf
  GuanHua authored Dec 07, 2020
  
  585e9ebf
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 9c848afe
  XieZhiXiong authored Dec 07, 2020
  
  9c848afe
- feat: 添加构建前接口的source字段 · e16b20bb
  前端-许佳敏 authored Dec 07, 2020
  
  e16b20bb