Commits · 8917f098fa1e2370137abb4d826cdd7d359dd774 · 黄庭坚 / jinfa-platform · GitLab

20 Nov, 2020 7 commits
- Merge branch 'dev' into test · 8917f098
  前端-钟卫鹏 authored Nov 20, 2020
  
  8917f098
- fix：处理订单/资金账户区块时间筛选为时间戳格式，添加时间戳格式的时间范围选择控件DateRangePickerUnix · e2d5eae1
  前端-钟卫鹏 authored Nov 20, 2020
  
  e2d5eae1
- fix: · 1cfc61a6
  前端-钟卫鹏 authored Nov 20, 2020
  
  1cfc61a6
- Merge branch 'dev' into test · 33d658c7
  前端-钟卫鹏 authored Nov 20, 2020
  
  33d658c7
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a6fc0a3c
  前端-钟卫鹏 authored Nov 20, 2020
  
  a6fc0a3c
- fix：资金账户充值更新 · 3d1e4f2f
  前端-钟卫鹏 authored Nov 20, 2020
  
  3d1e4f2f
- 修改socket— · 0ca4ecdc
  Bill authored Nov 20, 2020
  
  0ca4ecdc
19 Nov, 2020 21 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 59250692
  Bill authored Nov 19, 2020
  
  59250692
- 修改首页，修改加工能力 · 5a4b385a
  Bill authored Nov 19, 2020
  
  5a4b385a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1aa70e53
  前端-黄佳鑫 authored Nov 19, 2020
  
  1aa70e53
- 修改支付，询价报价状态文字不对的问题 · ea4df738
  前端-黄佳鑫 authored Nov 19, 2020
  
  ea4df738
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 2bdc11b6
  XieZhiXiong authored Nov 19, 2020
  
  2bdc11b6
- 对接售后换货中 · 2265c151
  XieZhiXiong authored Nov 19, 2020
  
  2265c151
- Merge branch 'dev' into test · 655b76e6
  GuanHua authored Nov 19, 2020
  
  655b76e6
- fix:进货单问题 · 12b88f36
  GuanHua authored Nov 19, 2020
  
  12b88f36
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 8252248d
  GuanHua authored Nov 19, 2020
  
  8252248d
- fix:支付错误时为显示错误提示的问题 · 9e42aa53
  GuanHua authored Nov 19, 2020
  
  9e42aa53
- 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 12 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