Commits · 0f2ddbb9a38978597a64124b1ac63aa06929b0f8 · linweijiong / jinfa-platform · GitLab

11 Dec, 2020 13 commits
- merge · 0f2ddbb9
  XieZhiXiong authored Dec 11, 2020
  
  0f2ddbb9
- merge · dcfe4f21
  XieZhiXiong authored Dec 11, 2020
  
  dcfe4f21
- 修改字段名称 · 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' into test · 903753bf
  XieZhiXiong authored Dec 11, 2020
  
  903753bf
- 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 27 commits
- Merge branch 'dev' into test · f3ca8ad2
  前端-黄佳鑫 authored Dec 10, 2020
  
  f3ca8ad2
- 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' into test · 813fc03b
  Bill authored Dec 10, 2020
  
  813fc03b
- 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
- Merge branch 'dev' into test · 60c0aeb2
  XieZhiXiong authored Dec 10, 2020
  
  60c0aeb2
- fixbug · 76227308
  XieZhiXiong authored Dec 10, 2020
  
  76227308
- 完善业务逻辑 · 75049b75
  XieZhiXiong authored Dec 10, 2020
  
  75049b75
- Merge branch 'dev' into test · 23b4f5de
  XieZhiXiong authored Dec 10, 2020
  
  23b4f5de
- 修复商品单价被覆盖的问题 · 43e6adb6
  XieZhiXiong authored Dec 10, 2020
  
  43e6adb6
- 完善业务逻辑 · 9183867e
  XieZhiXiong authored Dec 10, 2020
  
  9183867e
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4a81daf4
  XieZhiXiong authored Dec 10, 2020
  
  4a81daf4
- 添加各种退款方式弹窗相关组件及逻辑 · d986686b
  XieZhiXiong authored Dec 10, 2020
  
  d986686b
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · e8205734
  Bill authored Dec 10, 2020
  
  e8205734
- fix: 加工物流单，修改密码页自适应， · 917e826b
  Bill authored Dec 10, 2020
  
  917e826b
- Merge branch 'dev' into test · ec2f70ed
  前端-钟卫鹏 authored Dec 10, 2020
  
  ec2f70ed
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 36e0ee0c
  前端-钟卫鹏 authored Dec 10, 2020
  
  36e0ee0c
- fix：渠道商品添加物流相关信息，处理订单自提方式无法显示自提地址，处理采购下单多商品下价格运算异常，处理列表高级筛选后重置异常 · 629a6a16
  前端-钟卫鹏 authored Dec 10, 2020
  
  629a6a16
- Merge branch 'dev' into test · d6260430
  XieZhiXiong authored Dec 10, 2020
  
  d6260430
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · c3f62b7b
  XieZhiXiong authored Dec 10, 2020
  
  c3f62b7b
- 添加退款弹窗组件 · 13b268f1
  XieZhiXiong authored Dec 10, 2020
  
  13b268f1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ae6e3738
  XieZhiXiong authored Dec 10, 2020
  
  ae6e3738
- 完善业务逻辑 · 13156315
  XieZhiXiong authored Dec 10, 2020
  
  13156315
- Merge branch 'dev' into test · 5bc4d6d2
  前端-黄佳鑫 authored Dec 10, 2020
  
  5bc4d6d2