Commits · 1fc34f63e08f32774855d5562fd851a5ffd8a2b0 · linweijiong / jinfa-platform · GitLab

16 Dec, 2020 7 commits
- Merge branch 'dev' into test · 1fc34f63
  Bill authored Dec 16, 2020
  
  1fc34f63
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 60abf477
  Bill authored Dec 16, 2020
  
  60abf477
- 添加手工发货、手工收货 · 5acef646
  Bill authored Dec 16, 2020
  
  5acef646
- Merge branch 'dev' into test · 061b61ca
  前端-黄佳鑫 authored Dec 16, 2020
  
  061b61ca
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 13cb053d
  前端-黄佳鑫 authored Dec 16, 2020
  
  13cb053d
- 修改其他地方跳到物流调接口的问题 · 64a68531
  前端-黄佳鑫 authored Dec 16, 2020
  
  64a68531
- fix: 修复模板装修相关bug · fadff86f
  GuanHua authored Dec 16, 2020
  
  fadff86f
15 Dec, 2020 20 commits
- 合并冲突 · 95bacda4
  Bill authored Dec 15, 2020
  
  95bacda4
- fix: 修改生产通知单 · 36c37873
  Bill authored Dec 15, 2020
  
  36c37873
- Merge branch 'dev' into test · f1ec16f5
  前端-黄佳鑫 authored Dec 15, 2020
  
  f1ec16f5
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 2225cf69
  前端-黄佳鑫 authored Dec 15, 2020
  
  2225cf69
- 修改待新增物流单 · 4e48cc96
  前端-黄佳鑫 authored Dec 15, 2020
  
  4e48cc96
- fix: 修改商城首页接口路径 · fd9e08a3
  GuanHua authored Dec 15, 2020
  
  fd9e08a3
- merge · f9d3479e
  XieZhiXiong authored Dec 15, 2020
  
  f9d3479e
- fix: 会员模块小bug · 7626ab73
  XieZhiXiong authored Dec 15, 2020
  
  7626ab73
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 57507249
  XieZhiXiong authored Dec 15, 2020
  
  57507249
- 添加输入框输入错误收集事件 · 77dca80f
  XieZhiXiong authored Dec 15, 2020
  
  77dca80f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d58f0659
  前端-黄佳鑫 authored Dec 15, 2020
  
  d58f0659
- 修改物流模块列表字段被修改导致没显示的问题 · f014ecc4
  前端-黄佳鑫 authored Dec 15, 2020
  
  f014ecc4
- fix: 下单页面商品名称拼接规格 · ec0e609d
  GuanHua authored Dec 15, 2020
  
  ec0e609d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 756ac5e3
  XieZhiXiong authored Dec 15, 2020
  
  756ac5e3
- fix：评论信息暂时不全的问题 · af2f6606
  XieZhiXiong authored Dec 15, 2020
  
  af2f6606
- fix: 商品没有属性时页面报错问题 · 65ed174f
  GuanHua authored Dec 15, 2020
  
  65ed174f
- 修改会员支付参数配置编辑修改和删除 · 0b6a43e4
  前端-黄佳鑫 authored Dec 15, 2020
  
  0b6a43e4
- fix: 描述组件内容不换行的问题、删除无用的文件 · b9b82e16
  XieZhiXiong authored Dec 15, 2020
  
  b9b82e16
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 17fd3009
  XieZhiXiong authored Dec 15, 2020
  
  17fd3009
- 售后维修不需要工作流相关 · 47f0f20f
  XieZhiXiong authored Dec 15, 2020
  
  47f0f20f
14 Dec, 2020 13 commits
- 修改npmrc 冲突 · d6c3459b
  前端-黄佳鑫 authored Dec 14, 2020
  
  d6c3459b
- 修改会员支付参数设置 · 654780fe
  前端-黄佳鑫 authored Dec 14, 2020
  
  654780fe
- Merge branch 'dev' into test · 8d7b8334
  XieZhiXiong authored Dec 14, 2020
  
  8d7b8334
- 完成售后换货手工发货相关流程 · e5d82bda
  XieZhiXiong authored Dec 14, 2020
  
  e5d82bda
- 删除测试代码 · 1fea8375
  XieZhiXiong authored Dec 14, 2020
  
  1fea8375
- Merge branch 'dev' into test · bfb5e879
  XieZhiXiong authored Dec 14, 2020
  
  bfb5e879
- 添加是否是采购商判断 · 6eecee6c
  XieZhiXiong authored Dec 14, 2020
  
  6eecee6c
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 6a306d92
  XieZhiXiong authored Dec 14, 2020
  
  6a306d92
- 添加售后退货手动发货流程 · d592c0e2
  XieZhiXiong authored Dec 14, 2020
  
  d592c0e2
- Merge branch 'dev' into test · ccaf7547
  前端-钟卫鹏 authored Dec 14, 2020
  
  ccaf7547
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 42b124cb
  前端-钟卫鹏 authored Dec 14, 2020
  
  42b124cb
- fix：处理订单收发货重复点击问题 · dd3a3b52
  前端-钟卫鹏 authored Dec 14, 2020
  
  dd3a3b52
- Merge branch 'dev' into test · 0b5da9ca
  XieZhiXiong authored Dec 14, 2020
  
  0b5da9ca