Commits · ccaf7547c974e5e63d7f1656bd54dc7059c005e7 · linweijiong / jinfa-platform · GitLab

14 Dec, 2020 27 commits
- Merge branch 'dev' into test · ccaf7547
  前端-钟卫鹏 authored Dec 14, 2020
  
  ccaf7547
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 42b124cb
  前端-钟卫鹏 authored Dec 14, 2020
  
  42b124cb
- fix：处理订单收发货重复点击问题 · dd3a3b52
  前端-钟卫鹏 authored Dec 14, 2020
  
  dd3a3b52
- Merge branch 'dev' into test · 0b5da9ca
  XieZhiXiong authored Dec 14, 2020
  
  0b5da9ca
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · bd59a776
  XieZhiXiong authored Dec 14, 2020
  
  bd59a776
- 添加退货申请手工发货相关、添加采购入库单单据编号字段 · 0c072309
  XieZhiXiong authored Dec 14, 2020
  
  0c072309
- Merge branch 'dev' into test · d5cf9e87
  前端-许佳敏 authored Dec 14, 2020
  
  d5cf9e87
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · 39d5c112
  前端-许佳敏 authored Dec 14, 2020
  
  39d5c112
- chore: 修改npm源 · 42535981
  前端-许佳敏 authored Dec 14, 2020
  
  42535981
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 73fcf2e8
  前端-许佳敏 authored Dec 14, 2020
  
  73fcf2e8
- test: 新增demo环境 · fe34ef88
  前端-许佳敏 authored Dec 14, 2020
  
  fe34ef88
- Merge branch 'dev' into test · df90c598
  前端-钟卫鹏 authored Dec 14, 2020
  
  df90c598
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5a3d043c
  前端-钟卫鹏 authored Dec 14, 2020
  
  5a3d043c
- fix：处理积分订单详情订单/支付类型显示异常，变更销售订单发货单号显示字段 · e98846d9
  前端-钟卫鹏 authored Dec 14, 2020
  
  e98846d9
- merge: 解决冲突 · 583c7861
  GuanHua authored Dec 14, 2020
  
  583c7861
- fix: 修改下单时自提商品和无配送方式支付方式问题;修改店铺和渠道模板接口 · 3492bc3c
  GuanHua authored Dec 14, 2020
  
  3492bc3c
- Merge branch 'dev' into test · a6034f2c
  前端-钟卫鹏 authored Dec 14, 2020
  
  a6034f2c
- fix：处理新增货品下无品类的状态 · 6bcc8a1e
  前端-钟卫鹏 authored Dec 14, 2020
  
  6bcc8a1e
- 新增会员id、角色id相关字段 · 83e99a23
  XieZhiXiong authored Dec 14, 2020
  
  83e99a23
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 09170eeb
  XieZhiXiong authored Dec 14, 2020
  
  09170eeb
- 添加判断条件 · 50c04d58
  XieZhiXiong authored Dec 14, 2020
  
  50c04d58
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d55cee85
  前端-钟卫鹏 authored Dec 14, 2020
  
  d55cee85
- fix：处理订单支付方式（到付）切换问题 · 18d124c0
  前端-钟卫鹏 authored Dec 14, 2020
  
  18d124c0
- 修改接口参数字段 · e3e55891
  XieZhiXiong authored Dec 14, 2020
  
  e3e55891
- Merge branch 'dev' into test · 1c176315
  XieZhiXiong authored Dec 14, 2020
  
  1c176315
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 7e620f4f
  XieZhiXiong authored Dec 14, 2020
  
  7e620f4f
- 暂时注释掉代码 · cb323316
  XieZhiXiong authored Dec 14, 2020
  
  cb323316
11 Dec, 2020 13 commits
- Merge branch 'dev' into test · f1a13a9a
  前端-黄佳鑫 authored Dec 11, 2020
  
  f1a13a9a
- 修改物流，询价商品|询价报价|确认询价报价|需求发布缺少的一些显示 · a23848ac
  前端-黄佳鑫 authored Dec 11, 2020
  
  a23848ac
- Merge branch 'dev' into test · 2b69dc8b
  XieZhiXiong authored Dec 11, 2020
  
  2b69dc8b
- 思考判断工作流不同的逻辑中 · 5ef44bef
  XieZhiXiong authored Dec 11, 2020
  
  5ef44bef
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · faea484b
  XieZhiXiong authored Dec 11, 2020
  
  faea484b
- fixbug · 9fa96330
  XieZhiXiong authored Dec 11, 2020
  
  9fa96330
- Merge branch 'dev' into test · d398d2bf
  前端-钟卫鹏 authored Dec 11, 2020
  
  d398d2bf
- fix：处理订单详情无法获取支付方式 · 09899393
  前端-钟卫鹏 authored Dec 11, 2020
  
  09899393
- Merge branch 'dev' into test · 1d7caf9e
  前端-钟卫鹏 authored Dec 11, 2020
  
  1d7caf9e
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 483bdb21
  前端-钟卫鹏 authored Dec 11, 2020
  
  483bdb21
- 修改 entTime 字段名 · 743be149
  XieZhiXiong authored Dec 11, 2020
  
  743be149
- Merge branch 'dev' into test · ec7356be
  Bill authored Dec 11, 2020
  
  ec7356be
- fix：处理多支付订单按照支付环节依次支付，处理询价需求下单冗余render字段用于显示自提地址，获取支付方式添加会员角色id字段 · e59bec76
  前端-钟卫鹏 authored Dec 11, 2020
  
  e59bec76