Commits · b4865765861c4ff33a031ccc3c3a06a23918c674 · shenshaokai / jinfa-platform · GitLab

29 Jan, 2021 11 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · b4865765
  Bill authored Jan 29, 2021
  
  b4865765
- fix: 修改首页物流显示bug,加工审核不通过选择bug, 加工物流单修改bug · e9e04d90
  Bill authored Jan 29, 2021
  
  e9e04d90
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · c208c6ea
  GuanHua authored Jan 29, 2021
  
  c208c6ea
- fix: 忘记密码页面问题 · 6a53081c
  GuanHua authored Jan 29, 2021
  
  6a53081c
- merge · a7c1bfdb
  前端-许佳敏 authored Jan 29, 2021
  
  a7c1bfdb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5a84ba33
  GuanHua authored Jan 29, 2021
  
  5a84ba33
- fix: 注册勾选统一协议的问题 · 2f644488
  GuanHua authored Jan 29, 2021
  
  2f644488
- fix: 修改计算支付金额逻辑 · 52285993
  XieZhiXiong authored Jan 29, 2021
  
  52285993
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 9f4f9f35
  GuanHua authored Jan 29, 2021
  
  9f4f9f35
- fix: 1.登录页面广告图排序问题;2.忘记密码的密码规则提示;3.隐藏登录页面第三方登录方式入口;4.购物车提交的订单,缺少发票信息问题 · bbdd4f64
  GuanHua authored Jan 29, 2021
  
  bbdd4f64
- feat: 权限2.0 · a3e77766
  前端-许佳敏 authored Jan 29, 2021
  
  a3e77766
28 Jan, 2021 25 commits
- feat: 新增参数给后台 · 855eb0bb
  XieZhiXiong authored Jan 28, 2021
  
  855eb0bb
- fix: 修改物流和商品询价的Bug · 41ea1463
  前端-黄佳鑫 authored Jan 28, 2021
  
  41ea1463
- Merge branch 'featStrategies' into dev · cf0a8e7d
  前端-钟卫鹏 authored Jan 28, 2021
  
  cf0a8e7d
- fix: 处理采购下单支付比例校验问题 · f54c772d
  前端-钟卫鹏 authored Jan 28, 2021
  
  f54c772d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ea167965
  GuanHua authored Jan 28, 2021
  
  ea167965
- style: 商城样式修改 · 82c84dfa
  GuanHua authored Jan 28, 2021
  
  82c84dfa
- Merge branch 'featStrategies' into dev · 1e892ee4
  前端-钟卫鹏 authored Jan 28, 2021
  
  1e892ee4
- fix：新增订单内部状态，处理待支付订单确认确认未到账状态下无法支付的问题 · bf83b7f6
  前端-钟卫鹏 authored Jan 28, 2021
  
  bf83b7f6
- Merge branch 'featStrategies' into dev · 1674ecd4
  前端-钟卫鹏 authored Jan 28, 2021
  
  1674ecd4
- fix：处理价格策略商品筛选品类树选择问题，处理采购下单采购数和支付比例数据校验问题 · 16c3b6ec
  前端-钟卫鹏 authored Jan 28, 2021
  
  16c3b6ec
- Merge branch 'featStrategies' into dev · ae7ac147
  前端-钟卫鹏 authored Jan 28, 2021
  
  ae7ac147
- fix: · 7e3f09f0
  前端-钟卫鹏 authored Jan 28, 2021
  
  7e3f09f0
- fix：处理价格策略的一些问题 · aa5fab19
  前端-钟卫鹏 authored Jan 28, 2021
  
  aa5fab19
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5c948062
  XieZhiXiong authored Jan 28, 2021
  
  5c948062
- fix: 添加操作成功页面跳转 · fa61b6c3
  XieZhiXiong authored Jan 28, 2021
  
  fa61b6c3
- chore: 暂时注释按钮 · 42ac3e24
  XieZhiXiong authored Jan 28, 2021
  
  42ac3e24
- fix: 修复单据类型不显示的问题 · 692b5182
  XieZhiXiong authored Jan 28, 2021
  
  692b5182
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d2d4b848
  XieZhiXiong authored Jan 28, 2021
  
  d2d4b848
- chore: 添加跳转查看订单详情 · ec16a5de
  XieZhiXiong authored Jan 28, 2021
  
  ec16a5de
- fix: 添加退款凭证必传 · 17bd1ff8
  XieZhiXiong authored Jan 28, 2021
  
  17bd1ff8
- Merge branch 'dev' into mobile · f1c5cfaf
  GuanHua authored Jan 28, 2021
  
  f1c5cfaf
- fix: 添加按钮是否可操作限制 · b2a1f09a
  XieZhiXiong authored Jan 28, 2021
  
  b2a1f09a
- fix: 修复未到账操作失败的问题 · 5da33494
  XieZhiXiong authored Jan 28, 2021
  
  5da33494
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 18b401a8
  Bill authored Jan 28, 2021
  
  18b401a8
- feat: 添加修改个人会员信息白名单 · dce93ee8
  Bill authored Jan 28, 2021
  
  dce93ee8
27 Jan, 2021 4 commits
- Merge branch 'featStrategies' into dev · f6c028ac
  前端-钟卫鹏 authored Jan 27, 2021
  
  f6c028ac
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 16ce4590
  前端-钟卫鹏 authored Jan 27, 2021
  
  16ce4590
- fix: 订单区块所有签署合同api变更 · c3ce66d1
  前端-钟卫鹏 authored Jan 27, 2021
  
  c3ce66d1
- fix：处理商品移除发票字段；处理价格策略设置阶梯价格和空情况下筛选会员数据异常；处理销售订单页面采购会员筛选字段错误问题，处理订单发货记录物流单和发货入库单跳… · 8a734ed8
  前端-钟卫鹏 authored Jan 27, 2021
```
fix：处理商品移除发票字段；处理价格策略设置阶梯价格和空情况下筛选会员数据异常；处理销售订单页面采购会员筛选字段错误问题，处理订单发货记录物流单和发货入库单跳转异常，处理待确认订单审核不通过状态的订单实行禁用通过处理
```
  8a734ed8