Commits · 1509e360c1b8e8be7bde95bd958b60164ce0c5f8 · linweijiong / jinfa-platform · GitLab

31 Dec, 2020 36 commits
- Merge branch 'dev' into test · 1509e360
  前端-黄佳鑫 authored Dec 31, 2020
  
  1509e360
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 3ab6693c
  前端-黄佳鑫 authored Dec 31, 2020
  
  3ab6693c
- 修改物流，询价报价选择弹框关掉再打开没刷新的问题 · 53d3b1cb
  前端-黄佳鑫 authored Dec 31, 2020
  
  53d3b1cb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · d0a6b161
  前端-许佳敏 authored Dec 31, 2020
  
  d0a6b161
- fix: 修复角色管理中父子组件不关联 · b63e79fb
  前端-许佳敏 authored Dec 31, 2020
  
  b63e79fb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4dfc68e6
  GuanHua authored Dec 31, 2020
  
  4dfc68e6
- style: 修改商城首页logo样式 · 7f96cac4
  GuanHua authored Dec 31, 2020
  
  7f96cac4
- Merge branch 'dev' into test · 17492215
  前端-钟卫鹏 authored Dec 31, 2020
  
  17492215
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 2faa5b50
  前端-钟卫鹏 authored Dec 31, 2020
  
  2faa5b50
- fix: 处理交易规则筛选状态清空，处理品牌页面异常 · ba28fb8e
  前端-钟卫鹏 authored Dec 31, 2020
  
  ba28fb8e
- style: 样式文件修改 · d33f998e
  GuanHua authored Dec 31, 2020
  
  d33f998e
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b226c7e8
  GuanHua authored Dec 31, 2020
  
  b226c7e8
- style: 修改主题颜色 · 456effee
  GuanHua authored Dec 31, 2020
  
  456effee
- fix: 采购订单详情简单流程添加发货信息区块 · 0b48a5da
  前端-钟卫鹏 authored Dec 31, 2020
  
  0b48a5da
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · dcfd59b9
  XieZhiXiong authored Dec 31, 2020
  
  dcfd59b9
- fix: 添加 break · b57239cd
  XieZhiXiong authored Dec 31, 2020
  
  b57239cd
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 434c7962
  GuanHua authored Dec 31, 2020
  
  434c7962
- fix: 店铺列表字段修改 · c91d949b
  GuanHua authored Dec 31, 2020
  
  c91d949b
- Merge branch 'dev' into test · d4ae2ef5
  XieZhiXiong authored Dec 31, 2020
  
  d4ae2ef5
- fix: 更改字段名 · b148e410
  XieZhiXiong authored Dec 31, 2020
  
  b148e410
- fix: 格式化时间 · 54b3f06e
  XieZhiXiong authored Dec 31, 2020
  
  54b3f06e
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into test · e76ee40e
  前端-钟卫鹏 authored Dec 31, 2020
  
  e76ee40e
- Merge branch 'dev' into test · c4a467cf
  前端-黄佳鑫 authored Dec 31, 2020
  
  c4a467cf
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 83431505
  前端-黄佳鑫 authored Dec 31, 2020
  
  83431505
- 修改物流能力中心待提交选择商品为售后的时候显示订单编号 · 5e3e4606
  前端-黄佳鑫 authored Dec 31, 2020
  
  5e3e4606
- Merge branch 'dev' into test · b4ed44b0
  前端-钟卫鹏 authored Dec 31, 2020
  
  b4ed44b0
- fix： · d577d824
  前端-钟卫鹏 authored Dec 31, 2020
  
  d577d824
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 44721c64
  前端-钟卫鹏 authored Dec 31, 2020
  
  44721c64
- fix: 修复还款状态文字展示错误的问题 · 7321e939
  XieZhiXiong authored Dec 31, 2020
  
  7321e939
- fix：处理资金账户查询提现是查询对公账户异常和账户充值后记录无更新问题，采购下单对于简单流程使用电子合同的商品添加必须签署电子合同的操作 · f06dbdf9
  前端-钟卫鹏 authored Dec 31, 2020
  
  f06dbdf9
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 8aa0090a
  XieZhiXiong authored Dec 31, 2020
  
  8aa0090a
- fix: 修复 Select label内容过长导致变形的问题 · d923106a
  XieZhiXiong authored Dec 31, 2020
  
  d923106a
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 39595dd3
  Bill authored Dec 31, 2020
  
  39595dd3
- fix: 添加消息全部已读，修改加工详情 · 9478fe25
  Bill authored Dec 31, 2020
  
  9478fe25
- fix: 选择除微信外的支付渠道给错误提示 · fa5f2b97
  XieZhiXiong authored Dec 31, 2020
  
  fa5f2b97
- fix: 添加还款对公账户条件 · 45744d4d
  XieZhiXiong authored Dec 31, 2020
  
  45744d4d
30 Dec, 2020 4 commits
- fix: 进货单显示已选商品数量问题 · b68c1dd9
  GuanHua authored Dec 30, 2020
  
  b68c1dd9
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 8ccf0cd3
  GuanHua authored Dec 30, 2020
  
  8ccf0cd3
- fix: 店铺列表的信用排序问题 · 8f4e2230
  GuanHua authored Dec 30, 2020
  
  8f4e2230
- Merge branch 'dev' into test · 090f65c5
  XieZhiXiong authored Dec 30, 2020
  
  090f65c5