Commits · cf0a8e7df8c6cd5a0affdb332a1bd0c4e026563b · chenzhifeng / jinfa-platform · GitLab

28 Jan, 2021 23 commits
- 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 8 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
- fix: 修复在线结算无收获地址情况下,页面一直在加载状态的问题 · c346b1e3
  GuanHua authored Jan 27, 2021
  
  c346b1e3
- fix: 更新装修模板依赖 · f7616513
  GuanHua authored Jan 27, 2021
  
  f7616513
- fix: 修改商品详情样式, 和在线结算合同相关接口地址 · 32b8b307
  GuanHua authored Jan 27, 2021
  
  32b8b307
- fix: 处理编辑采购订单发票回显问题 · 5b1cc840
  前端-钟卫鹏 authored Jan 27, 2021
  
  5b1cc840
26 Jan, 2021 9 commits
- fix: 修复附件不存在页面报错的问题 · 77848eed
  XieZhiXiong authored Jan 26, 2021
  
  77848eed
- feat: 内部单据单据金额 = 货品成本价 * 单据数量 · 879ebcb1
  XieZhiXiong authored Jan 26, 2021
  
  879ebcb1
- feat: 新增编辑物流单的逻辑 · 54909672
  XieZhiXiong authored Jan 26, 2021
  
  54909672
- fix: 修复单据类型id错误的问题 · 229850a1
  XieZhiXiong authored Jan 26, 2021
  
  229850a1
- feat: 退款金额手动不可输入 · f214882d
  XieZhiXiong authored Jan 26, 2021
  
  f214882d
- fix: 去掉过滤未支付的订单 · aa35c0ed
  XieZhiXiong authored Jan 26, 2021
  
  aa35c0ed
- fix: 处理订单跳转异常 · 633ad354
  前端-钟卫鹏 authored Jan 26, 2021
  
  633ad354
- chore: 删除入库、发货id 更改为单据编号 · e3d25b88
  XieZhiXiong authored Jan 26, 2021
  
  e3d25b88
- Merge branch 'featStrategies' into dev · eca1f22c
  前端-钟卫鹏 authored Jan 26, 2021
  
  eca1f22c