Commits · 179ada2372250f945f9ebf90732142be0fd9fd96 · shenshaokai / jinfa-platform · GitLab

19 Nov, 2020 11 commits
- Merge branch 'dev' into test · 179ada23
  前端-钟卫鹏 authored Nov 19, 2020
  
  179ada23
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 35f2a4fb
  前端-钟卫鹏 authored Nov 19, 2020
  
  35f2a4fb
- fix：订单详情供应会员字段修改，订单流转记录无数据隐藏处理，支付比例状态更正 · 42e2a1b2
  前端-钟卫鹏 authored Nov 19, 2020
  
  42e2a1b2
- Merge branch 'dev' into test · 9a121f03
  XieZhiXiong authored Nov 19, 2020
  
  9a121f03
- 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' into test · 1a75dfdf
  前端-钟卫鹏 authored Nov 19, 2020
  
  1a75dfdf
- 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
- Merge branch 'dev' into test · 07efb896
  XieZhiXiong authored Nov 19, 2020
  
  07efb896
- 修复文件上传大小限制的问题 · 49819180
  XieZhiXiong authored Nov 19, 2020
  
  49819180
18 Nov, 2020 29 commits
- Merge branch 'dev' into test · 90e2f9eb
  前端-钟卫鹏 authored Nov 18, 2020
  
  90e2f9eb
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · e6ec9c32
  前端-钟卫鹏 authored Nov 18, 2020
  
  e6ec9c32
- 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' into test · 5dba9a4d
  前端-黄佳鑫 authored Nov 18, 2020
  
  5dba9a4d
- 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' into test · d1b45923
  GuanHua authored Nov 18, 2020
  
  d1b45923
- 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' into test · 726a9867
  前端-钟卫鹏 authored Nov 18, 2020
  
  726a9867
- 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' into test · 7d539464
  XieZhiXiong authored Nov 18, 2020
  
  7d539464
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b05baa6d
  XieZhiXiong authored Nov 18, 2020
  
  b05baa6d
- Merge branch 'dev' into test · 3869c63d
  GuanHua authored Nov 18, 2020
  
  3869c63d
- 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' into test · d9698617
  GuanHua authored Nov 18, 2020
  
  d9698617