Commits · 73fcf2e808161f0bc0df188cb8fbd3697c349615 · shenshaokai / jinfa-platform · GitLab

14 Dec, 2020 10 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 73fcf2e8
  前端-许佳敏 authored Dec 14, 2020
  
  73fcf2e8
- 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
- fix：处理新增货品下无品类的状态 · 6bcc8a1e
  前端-钟卫鹏 authored Dec 14, 2020
  
  6bcc8a1e
- 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
- 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 22 commits
- 修改物流，询价商品|询价报价|确认询价报价|需求发布缺少的一些显示 · a23848ac
  前端-黄佳鑫 authored Dec 11, 2020
  
  a23848ac
- 思考判断工作流不同的逻辑中 · 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
- fix：处理订单详情无法获取支付方式 · 09899393
  前端-钟卫鹏 authored Dec 11, 2020
  
  09899393
- 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
- fix：处理多支付订单按照支付环节依次支付，处理询价需求下单冗余render字段用于显示自提地址，获取支付方式添加会员角色id字段 · e59bec76
  前端-钟卫鹏 authored Dec 11, 2020
  
  e59bec76
- 完善业务逻辑 · 0551a59a
  XieZhiXiong authored Dec 11, 2020
  
  0551a59a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 13cf4ea4
  前端-许佳敏 authored Dec 11, 2020
  
  13cf4ea4
- fix: 无首页权限时,只要登录了就能进入 · a2324299
  前端-许佳敏 authored Dec 11, 2020
  
  a2324299
- 修复冲突 · 3b303fb8
  XieZhiXiong authored Dec 11, 2020
  
  3b303fb8
- 修改字段名称 · a22e7e1d
  XieZhiXiong authored Dec 11, 2020
  
  a22e7e1d
- 解决冲突 · 044b3035
  前端-黄佳鑫 authored Dec 11, 2020
  
  044b3035
- 补充被误删services文件下的api.ts · 8b3c39dc
  前端-黄佳鑫 authored Dec 11, 2020
  
  8b3c39dc
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 8bc729ca
  前端-黄佳鑫 authored Dec 11, 2020
  
  8bc729ca
- 修改物流单查询详细信息接口 · c6f99fc6
  前端-黄佳鑫 authored Dec 11, 2020
  
  c6f99fc6
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1b3ad9a0
  XieZhiXiong authored Dec 11, 2020
  
  1b3ad9a0
- fixbug · 91bac5ea
  XieZhiXiong authored Dec 11, 2020
  
  91bac5ea
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1b8e8777
  GuanHua authored Dec 11, 2020
  
  1b8e8777
- fix: 1.渠道商品筛选错误的问题;2.积分商品查询交易规则参数错误问题,3:根据商品查询交易规则添加参数 · 54258684
  GuanHua authored Dec 11, 2020
  
  54258684
- 修改确认询价报价询价单详情的接口 · cc7eca15
  前端-黄佳鑫 authored Dec 11, 2020
  
  cc7eca15
10 Dec, 2020 8 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 02f6968f
  前端-黄佳鑫 authored Dec 10, 2020
  
  02f6968f
- 修改需求发布，修改询价报价/商品询价 · b8675138
  前端-黄佳鑫 authored Dec 10, 2020
  
  b8675138
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · e74f8b48
  前端-黄佳鑫 authored Dec 10, 2020
  
  e74f8b48
- 修改待新增物流单 · 60109d24
  前端-黄佳鑫 authored Dec 10, 2020
  
  60109d24
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · f427a5b5
  Bill authored Dec 10, 2020
  
  f427a5b5
- fix: 修改timeRange 一年前时间戳的bug · ea77b83b
  Bill authored Dec 10, 2020
  
  ea77b83b
- fixbug · 76227308
  XieZhiXiong authored Dec 10, 2020
  
  76227308
- 完善业务逻辑 · 75049b75
  XieZhiXiong authored Dec 10, 2020
  
  75049b75