Commits · 62985240f962429df624ac59d90feb7b6770f2ab · linweijiong / jinfa-platform · GitLab

04 Jan, 2021 22 commits
- Merge branch 'dev' into test · 62985240
  前端-钟卫鹏 authored Jan 04, 2021
  
  62985240
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 4d3ad00c
  前端-钟卫鹏 authored Jan 04, 2021
  
  4d3ad00c
- fix：订单详情发货明细中添加跳转，处理再次点击同样的菜单重载页面没有清空筛选的数据问题 · d8d19164
  前端-钟卫鹏 authored Jan 04, 2021
  
  d8d19164
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 6b1044b8
  GuanHua authored Jan 04, 2021
  
  6b1044b8
- fix: 店铺收藏列表字段显示问题 · 9b5133ae
  GuanHua authored Jan 04, 2021
  
  9b5133ae
- fix：处理订单模块没有订单状态和订单类型搜索、解决详情页没有查看发票/支付比例没有查看支付结果的问题，处理新增订单到付方式限制使用异常，变更主内容区块的mar… · 49863d81
  前端-钟卫鹏 authored Jan 04, 2021
```
fix：处理订单模块没有订单状态和订单类型搜索、解决详情页没有查看发票/支付比例没有查看支付结果的问题，处理新增订单到付方式限制使用异常，变更主内容区块的margin值，处理资金账户待支付提现查询对公账户异常
```
  49863d81
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 85178a42
  Bill authored Jan 04, 2021
  
  85178a42
- fix: 修改首页最近访问，广告样式 · 10974e0c
  Bill authored Jan 04, 2021
  
  10974e0c
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 3ea320e2
  GuanHua authored Jan 04, 2021
  
  3ea320e2
- fix: 商城下单接口添加参数 · fde85c8e
  GuanHua authored Jan 04, 2021
  
  fde85c8e
- Merge branch 'dev' into test · df974dc5
  XieZhiXiong authored Jan 04, 2021
  
  df974dc5
- fix: 监听单据明细不生效的问题 · fe88d173
  XieZhiXiong authored Jan 04, 2021
  
  fe88d173
- Merge branch 'dev' into test · 83fbf918
  XieZhiXiong authored Jan 04, 2021
  
  83fbf918
- chore: 删除无用代码 · f8ff772e
  XieZhiXiong authored Jan 04, 2021
  
  f8ff772e
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 0556b600
  XieZhiXiong authored Jan 04, 2021
  
  0556b600
- fix: 添加数据为空的展示 · 08b94e0e
  XieZhiXiong authored Jan 04, 2021
  
  08b94e0e
- fix: 修改模板颜色和首页顶部logo样式 · b8828846
  GuanHua authored Jan 04, 2021
  
  b8828846
- fix: 追加校验 · 3fd6b643
  XieZhiXiong authored Jan 04, 2021
  
  3fd6b643
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b69d653b
  XieZhiXiong authored Jan 04, 2021
  
  b69d653b
- chore: 调整接口参数字段名 · b2cc0db1
  XieZhiXiong authored Jan 04, 2021
  
  b2cc0db1
- Merge branch 'dev' into test · b1f6a656
  Bill authored Jan 04, 2021
  
  b1f6a656
- 修改首页最新公告 · 7f395123
  Bill authored Jan 04, 2021
  
  7f395123
31 Dec, 2020 18 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 11573239
  GuanHua authored Dec 31, 2020
  
  11573239
- style: 立即报价按钮样式修改 · e3181151
  GuanHua authored Dec 31, 2020
  
  e3181151
- 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