Commits · f611fc4da0bc237a82f34641d4838ea49421e6b1 · 黄庭坚 / jinfa-platform · GitLab

16 Nov, 2020 19 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · f611fc4d
  Bill authored Nov 16, 2020
  
  f611fc4d
- 修改冲突 · 4d45b3bb
  Bill authored Nov 16, 2020
  
  4d45b3bb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d66023ca
  XieZhiXiong authored Nov 16, 2020
  
  d66023ca
- 修改首页，修改加工业详情 · 44285560
  Bill authored Nov 16, 2020
  
  44285560
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 28c0ace3
  前端-钟卫鹏 authored Nov 16, 2020
  
  28c0ace3
- fix：处理新增采购订单数据显示异常，订单支付开通授信支付 · 933b48cb
  前端-钟卫鹏 authored Nov 16, 2020
  
  933b48cb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 901b34cc
  GuanHua authored Nov 16, 2020
  
  901b34cc
- feat:微信支付方式 · 1fa08769
  GuanHua authored Nov 16, 2020
  
  1fa08769
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4d6afff9
  XieZhiXiong authored Nov 16, 2020
  
  4d6afff9
- 对接完毕售后维修相关 · cd438c10
  XieZhiXiong authored Nov 16, 2020
  
  cd438c10
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 6c5035f9
  前端-黄佳鑫 authored Nov 16, 2020
  
  6c5035f9
- 修改确认物流单没按原型的问题 · b4a9d1a7
  前端-黄佳鑫 authored Nov 16, 2020
  
  b4a9d1a7
- feat:对接余额支付方式 · a64504a4
  GuanHua authored Nov 16, 2020
  
  a64504a4
- 修改询价报价新增的时候商品计算单价的问题 · 4bbc0314
  前端-黄佳鑫 authored Nov 16, 2020
  
  4bbc0314
- merge · 57ab3da6
  前端-许佳敏 authored Nov 16, 2020
  
  57ab3da6
- fix:socket应该使用ws协议 · 2a84a1e2
  前端-许佳敏 authored Nov 16, 2020
  
  2a84a1e2
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 49cb48c7
  前端-钟卫鹏 authored Nov 16, 2020
  
  49cb48c7
- fix: · 2838db1f
  前端-钟卫鹏 authored Nov 16, 2020
  
  2838db1f
- fix:1.商品logo链接问题;2.申请会员按钮添加确认提示; · 637e6418
  GuanHua authored Nov 16, 2020
  
  637e6418
13 Nov, 2020 21 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 0264a1f0
  XieZhiXiong authored Nov 13, 2020
  
  0264a1f0
- 对接售后维修申请中... · 549ea305
  XieZhiXiong authored Nov 13, 2020
  
  549ea305
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 0bacb5f8
  Bill authored Nov 13, 2020
  
  0bacb5f8
- 修改socket—_url常量，package.json，修复消息中心bug, 等首页数据接口 · 563d8f83
  Bill authored Nov 13, 2020
  
  563d8f83
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d4291c88
  前端-黄佳鑫 authored Nov 13, 2020
  
  d4291c88
- 修改物流显示的问提 · 6cb6516a
  前端-黄佳鑫 authored Nov 13, 2020
  
  6cb6516a
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · b1e3ed94
  Bill authored Nov 13, 2020
  
  b1e3ed94
- 修改socket · ce0ba6ce
  Bill authored Nov 13, 2020
  
  ce0ba6ce
- 处理冲突 · 3ff59317
  前端-钟卫鹏 authored Nov 13, 2020
  
  3ff59317
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1c626a65
  前端-钟卫鹏 authored Nov 13, 2020
  
  1c626a65
- fix: 处理采购订单无法批量归档问题，处理新增积分商品必须为卖家承担运费的问题 · cb110e6b
  前端-钟卫鹏 authored Nov 13, 2020
  
  cb110e6b
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 56b98e4f
  Bill authored Nov 13, 2020
  
  56b98e4f
- 修改消息中心数据问题 · cce83c4f
  Bill authored Nov 13, 2020
  
  cce83c4f
- 优化socket获取方式 · 8be70b28
  前端-许佳敏 authored Nov 13, 2020
  
  8be70b28
- feat:新增Socket启动参数 · 9932aacd
  前端-许佳敏 authored Nov 13, 2020
  
  9932aacd
- merge and fix · fd7a7d14
  前端-许佳敏 authored Nov 13, 2020
  
  fd7a7d14
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4d959fac
  GuanHua authored Nov 13, 2020
  
  4d959fac
- fix:修改商品详情库存默认显示 · c132c008
  GuanHua authored Nov 13, 2020
  
  c132c008
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 91e7f63f
  前端-钟卫鹏 authored Nov 13, 2020
  
  91e7f63f
- fix： · 9e6f2e72
  前端-钟卫鹏 authored Nov 13, 2020
  
  9e6f2e72
- fix;进货单商品图片显示;进货单推荐商品显示 · 90d9032f
  GuanHua authored Nov 13, 2020
  
  90d9032f