Commits · 2265c151ec37db03be93e89df05f7cc426b8c092 · shenshaokai / jinfa-platform · GitLab

19 Nov, 2020 6 commits
- 对接售后换货中 · 2265c151
  XieZhiXiong authored Nov 19, 2020
  
  2265c151
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f5786bf9
  XieZhiXiong authored Nov 19, 2020
  
  f5786bf9
- 修复文件上传大小限制的问题 · 73b6be0a
  XieZhiXiong authored Nov 19, 2020
  
  73b6be0a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 7b008fe8
  前端-钟卫鹏 authored Nov 19, 2020
  
  7b008fe8
- fix：订单收货统计收货明细无数据做隐藏处理 · 42506099
  前端-钟卫鹏 authored Nov 19, 2020
  
  42506099
- 修复文件上传大小限制的问题 · 49819180
  XieZhiXiong authored Nov 19, 2020
  
  49819180
18 Nov, 2020 27 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a127e538
  前端-钟卫鹏 authored Nov 18, 2020
  
  a127e538
- fix：处理新增订单或者支付订单时获取支付方式没有带memberId · 918b240b
  前端-钟卫鹏 authored Nov 18, 2020
  
  918b240b
- 合并冲突 · 1c4ba958
  Bill authored Nov 18, 2020
  
  1c4ba958
- 修改临时socket_url · 358cee2e
  Bill authored Nov 18, 2020
  
  358cee2e
- 对接加工，对接首页 · a903d76c
  Bill authored Nov 18, 2020
  
  a903d76c
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · dfb140f2
  前端-黄佳鑫 authored Nov 18, 2020
  
  dfb140f2
- 修改商品询价，确认询价报价，支付配置需求单审核等细节问题 · 91aeb51e
  前端-黄佳鑫 authored Nov 18, 2020
  
  91aeb51e
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 7006140f
  XieZhiXiong authored Nov 18, 2020
  
  7006140f
- 完成换货申请相关UI · 4ccf0c9a
  XieZhiXiong authored Nov 18, 2020
  
  4ccf0c9a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 0fb3b8a3
  GuanHua authored Nov 18, 2020
  
  0fb3b8a3
- fix:修改求购动态样式 · 8e9194a8
  GuanHua authored Nov 18, 2020
  
  8e9194a8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · af1ef987
  前端-钟卫鹏 authored Nov 18, 2020
  
  af1ef987
- fix：处理商品编辑设置价格显示异常，处理确认订单默认选中已有的合同模板，处理采购下单超出区间按最后一阶价格计算费用/下单补全供应商角色ID字段 · 1adecd70
  前端-钟卫鹏 authored Nov 18, 2020
  
  1adecd70
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5e2a4ea6
  GuanHua authored Nov 18, 2020
  
  5e2a4ea6
- fix:修复商品类型筛选问题 · 0cda7310
  GuanHua authored Nov 18, 2020
  
  0cda7310
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b05baa6d
  XieZhiXiong authored Nov 18, 2020
  
  b05baa6d
- fix:去除模板装修必选选择一个商品的限制 · 96884935
  GuanHua authored Nov 18, 2020
  
  96884935
- 去掉只有服务提供者才能创建下级会员的限制，更改 levelId 为 level · 839a4a15
  XieZhiXiong authored Nov 18, 2020
  
  839a4a15
- fix:进货单购买数量可直接编辑 · 692730e9
  GuanHua authored Nov 18, 2020
  
  692730e9
- fix:修改购买数量低于起订量的提示 · 9d9afe55
  GuanHua authored Nov 18, 2020
  
  9d9afe55
- 完善UI · f7b432eb
  XieZhiXiong authored Nov 18, 2020
  
  f7b432eb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · cdfe9e41
  XieZhiXiong authored Nov 18, 2020
  
  cdfe9e41
- 完成售后换货处理相关UI · 32e70e49
  XieZhiXiong authored Nov 18, 2020
  
  32e70e49
- feat:更新商城组件库版本 · 1ec4dc25
  GuanHua authored Nov 18, 2020
  
  1ec4dc25
- fix:修改商城首页询价商品价格显示 · c42cd1a7
  GuanHua authored Nov 18, 2020
  
  c42cd1a7
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 26c150fa
  前端-黄佳鑫 authored Nov 18, 2020
  
  26c150fa
- 增加询价报价后台新加的字段 · fbe74105
  前端-黄佳鑫 authored Nov 18, 2020
  
  fbe74105
17 Nov, 2020 7 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5fed6d7c
  GuanHua authored Nov 17, 2020
  
  5fed6d7c
- feat:修改渠道添加进货单参数 · 13d44158
  GuanHua authored Nov 17, 2020
  
  13d44158
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 29cfd5a8
  Bill authored Nov 17, 2020
  
  29cfd5a8
- 对接首页，对接加工详情页，修改加工新建页 · f2475603
  Bill authored Nov 17, 2020
  
  f2475603
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 84938f3e
  XieZhiXiong authored Nov 17, 2020
  
  84938f3e
- 修改 rowId · fe37a72f
  XieZhiXiong authored Nov 17, 2020
  
  fe37a72f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f310e778
  前端-钟卫鹏 authored Nov 17, 2020
  
  f310e778