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

18 Nov, 2020 16 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 0fb3b8a3
  GuanHua authored Nov 18, 2020
  
  0fb3b8a3
- fix:修改求购动态样式 · 8e9194a8
  GuanHua authored Nov 18, 2020
  
  8e9194a8
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · af1ef987
  前端-钟卫鹏 authored Nov 18, 2020
  
  af1ef987
- fix：处理商品编辑设置价格显示异常，处理确认订单默认选中已有的合同模板，处理采购下单超出区间按最后一阶价格计算费用/下单补全供应商角色ID字段 · 1adecd70
  前端-钟卫鹏 authored Nov 18, 2020
  
  1adecd70
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5e2a4ea6
  GuanHua authored Nov 18, 2020
  
  5e2a4ea6
- fix:修复商品类型筛选问题 · 0cda7310
  GuanHua authored Nov 18, 2020
  
  0cda7310
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b05baa6d
  XieZhiXiong authored Nov 18, 2020
  
  b05baa6d
- fix:去除模板装修必选选择一个商品的限制 · 96884935
  GuanHua authored Nov 18, 2020
  
  96884935
- 去掉只有服务提供者才能创建下级会员的限制，更改 levelId 为 level · 839a4a15
  XieZhiXiong authored Nov 18, 2020
  
  839a4a15
- fix:进货单购买数量可直接编辑 · 692730e9
  GuanHua authored Nov 18, 2020
  
  692730e9
- fix:修改购买数量低于起订量的提示 · 9d9afe55
  GuanHua authored Nov 18, 2020
  
  9d9afe55
- 完善UI · f7b432eb
  XieZhiXiong authored Nov 18, 2020
  
  f7b432eb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · cdfe9e41
  XieZhiXiong authored Nov 18, 2020
  
  cdfe9e41
- 完成售后换货处理相关UI · 32e70e49
  XieZhiXiong authored Nov 18, 2020
  
  32e70e49
- feat:更新商城组件库版本 · 1ec4dc25
  GuanHua authored Nov 18, 2020
  
  1ec4dc25
- fix:修改商城首页询价商品价格显示 · c42cd1a7
  GuanHua authored Nov 18, 2020
  
  c42cd1a7
17 Nov, 2020 21 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5fed6d7c
  GuanHua authored Nov 17, 2020
  
  5fed6d7c
- feat:修改渠道添加进货单参数 · 13d44158
  GuanHua authored Nov 17, 2020
  
  13d44158
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 29cfd5a8
  Bill authored Nov 17, 2020
  
  29cfd5a8
- 对接首页，对接加工详情页，修改加工新建页 · f2475603
  Bill authored Nov 17, 2020
  
  f2475603
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 84938f3e
  XieZhiXiong authored Nov 17, 2020
  
  84938f3e
- 修改 rowId · fe37a72f
  XieZhiXiong authored Nov 17, 2020
  
  fe37a72f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f310e778
  前端-钟卫鹏 authored Nov 17, 2020
  
  f310e778
- fix：处理采购订单下单商品价格和ID显示异常 · a39ff0a7
  前端-钟卫鹏 authored Nov 17, 2020
  
  a39ff0a7
- 暂时注释回复原有代码 · 39959d24
  XieZhiXiong authored Nov 17, 2020
  
  39959d24
- 修改 levelId 为 level · 17ab5570
  XieZhiXiong authored Nov 17, 2020
  
  17ab5570
- 去掉只有服务提供者才能够创建下级会员的限制 · d85cd3dc
  XieZhiXiong authored Nov 17, 2020
  
  d85cd3dc
- 调整UI · b47eefce
  XieZhiXiong authored Nov 17, 2020
  
  b47eefce
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 0aebe839
  XieZhiXiong authored Nov 17, 2020
  
  0aebe839
- 对接售后退货中... · dfe30212
  XieZhiXiong authored Nov 17, 2020
  
  dfe30212
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · bb2b5416
  前端-钟卫鹏 authored Nov 17, 2020
  
  bb2b5416
- fix：处理报价类订单没有支付信息问题，新增销售订单内部状态0完成订单，修改账户充值微信渠道为2，处理渠道商品切换角色数据清空问题，处理快捷修改价格阶梯价格校验问题 · f739b677
  前端-钟卫鹏 authored Nov 17, 2020
  
  f739b677
- feat:下单接口添加最小起购数参数 · 212fdaac
  GuanHua authored Nov 17, 2020
  
  212fdaac
- feat:店铺页面id的获取;微信支付方式支付结果查询 · a0af7fb6
  GuanHua authored Nov 17, 2020
  
  a0af7fb6
- 完善售后维修相关 · e7173bb3
  XieZhiXiong authored Nov 17, 2020
  
  e7173bb3
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1a8950b7
  XieZhiXiong authored Nov 17, 2020
  
  1a8950b7
- 完善售后维修相关 · 3a94c508
  XieZhiXiong authored Nov 17, 2020
  
  3a94c508
16 Nov, 2020 3 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · f611fc4d
  Bill authored Nov 16, 2020
  
  f611fc4d
- 修改冲突 · 4d45b3bb
  Bill authored Nov 16, 2020
  
  4d45b3bb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d66023ca
  XieZhiXiong authored Nov 16, 2020
  
  d66023ca