Commits · e1051ef900853dcf6c0ec66a04dcd7a5eb1bb5a6 · shenshaokai / jinfa-platform · GitLab

20 Nov, 2020 23 commits
- Merge branch 'dev' into test · e1051ef9
  Bill authored Nov 20, 2020
  
  e1051ef9
- 修改socket url · 188af8e9
  Bill authored Nov 20, 2020
  
  188af8e9
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · b4c52e24
  Bill authored Nov 20, 2020
  
  b4c52e24
- 修改app.tsx dev环境也需要登录，不然首页因没有用户信息而报错 · 5d003629
  Bill authored Nov 20, 2020
  
  5d003629
- Merge branch 'dev' into test · 05511112
  XieZhiXiong authored Nov 20, 2020
  
  05511112
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ed41bf7b
  XieZhiXiong authored Nov 20, 2020
  
  ed41bf7b
- 物流方式从商品中获取 · a5cf0678
  XieZhiXiong authored Nov 20, 2020
  
  a5cf0678
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · c58ddae0
  Bill authored Nov 20, 2020
  
  c58ddae0
- 修改首页布局，对接加工 · 5d47ea7f
  Bill authored Nov 20, 2020
  
  5d47ea7f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · fe3ae5b7
  GuanHua authored Nov 20, 2020
  
  fe3ae5b7
- fix： · 6d670cc1
  前端-钟卫鹏 authored Nov 20, 2020
  
  6d670cc1
- Merge branch 'dev' into test · 8917f098
  前端-钟卫鹏 authored Nov 20, 2020
  
  8917f098
- fix：处理订单/资金账户区块时间筛选为时间戳格式，添加时间戳格式的时间范围选择控件DateRangePickerUnix · e2d5eae1
  前端-钟卫鹏 authored Nov 20, 2020
  
  e2d5eae1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 51e846ea
  GuanHua authored Nov 20, 2020
  
  51e846ea
- fix:修改获取钱包余额参数,修改线下转账支付方式样式问题 · 8e1056de
  GuanHua authored Nov 20, 2020
  
  8e1056de
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 3061edce
  XieZhiXiong authored Nov 20, 2020
  
  3061edce
- 取消货品联动，货品选择只做新增操作 · 9729e798
  XieZhiXiong authored Nov 20, 2020
  
  9729e798
- 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
- 对接售后换货中 · 42e2522f
  XieZhiXiong authored Nov 20, 2020
  
  42e2522f
- fix：资金账户充值更新 · 3d1e4f2f
  前端-钟卫鹏 authored Nov 20, 2020
  
  3d1e4f2f
- 修改socket— · 0ca4ecdc
  Bill authored Nov 20, 2020
  
  0ca4ecdc
19 Nov, 2020 17 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