Commits · b216edfd19393965b3327f18e1edfad56b14e72f · shenshaokai / jinfa-admin · GitLab

08 Dec, 2020 2 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · b216edfd
  Bill authored Dec 08, 2020
  
  b216edfd
- chore: 修改package.json 1o和25环境需要添加socket端口 · 3e55f2da
  Bill authored Dec 08, 2020
  
  3e55f2da
07 Dec, 2020 11 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 45f32bf9
  前端-黄佳鑫 authored Dec 07, 2020
  
  45f32bf9
- 修改会员支付策略 · 5a2043bf
  前端-黄佳鑫 authored Dec 07, 2020
  
  5a2043bf
- fix: 修改package.json socket端口 · 92abd711
  Bill authored Dec 07, 2020
  
  92abd711
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · e971aacd
  Bill authored Dec 07, 2020
  
  e971aacd
- fix: 修改socket · 4d30cea4
  Bill authored Dec 07, 2020
  
  4d30cea4
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · a6fd8a0b
  前端-钟卫鹏 authored Dec 07, 2020
  
  a6fd8a0b
- 完善单位，系统参数接口接入 · 9758bebe
  前端-黄佳鑫 authored Dec 07, 2020
  
  9758bebe
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · fd85306b
  前端-钟卫鹏 authored Dec 07, 2020
  
  fd85306b
- fix: 去掉注释页 · 9076227d
  前端-许佳敏 authored Dec 07, 2020
  
  9076227d
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 5ea0ab2e
  前端-钟卫鹏 authored Dec 07, 2020
  
  5ea0ab2e
- fix：处理订单确认支付结果无法返回列表页 · 5b6e6d9f
  前端-钟卫鹏 authored Dec 07, 2020
  
  5b6e6d9f
04 Dec, 2020 12 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-system into dev · 2d0f3253
  Bill authored Dec 04, 2020
  
  2d0f3253
- fix: 修改首页，自适应 · a8c71b5f
  Bill authored Dec 04, 2020
  
  a8c71b5f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · ba0ef87b
  GuanHua authored Dec 04, 2020
  
  ba0ef87b
- fix: 模板类型显示错误问题 · 21ecbd1f
  GuanHua authored Dec 04, 2020
  
  21ecbd1f
- 修改字段名 · 8cc3a7bc
  XieZhiXiong authored Dec 04, 2020
  
  8cc3a7bc
- 对接评价相关新字段 · 204555c5
  XieZhiXiong authored Dec 04, 2020
  
  204555c5
- fix：订单筛选添加供应商会员查询 · 032b8057
  前端-钟卫鹏 authored Dec 04, 2020
  
  032b8057
- fix: 商城装修品类品牌筛选 · 5bad014c
  GuanHua authored Dec 04, 2020
  
  5bad014c
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 2e195ba1
  GuanHua authored Dec 04, 2020
  
  2e195ba1
- fix: 商城装修品类接接口参数问题 · 08eb0ed1
  GuanHua authored Dec 04, 2020
  
  08eb0ed1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 98626747
  前端-钟卫鹏 authored Dec 04, 2020
  
  98626747
- fix： · afd715c3
  前端-钟卫鹏 authored Dec 04, 2020
  
  afd715c3
03 Dec, 2020 9 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · bbda74a1
  GuanHua authored Dec 03, 2020
  
  bbda74a1
- fix:修改平台模板装修获取品牌列表参数 · a8a4333b
  GuanHua authored Dec 03, 2020
  
  a8a4333b
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · 9adf6169
  前端-钟卫鹏 authored Dec 03, 2020
  
  9adf6169
- fix：处理订单确认支付结果按钮重复点击 · 0170a6ff
  前端-钟卫鹏 authored Dec 03, 2020
  
  0170a6ff
- fix：处理订单详情价格运费显示异常 · dbfc8a71
  前端-钟卫鹏 authored Dec 03, 2020
  
  dbfc8a71
- erge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-system into dev · d8fd8efc
  GuanHua authored Dec 03, 2020
  
  d8fd8efc
- fix:商城装修筛选项显示问题 · 7bdf2640
  GuanHua authored Dec 03, 2020
  
  7bdf2640
- 修改冲突 · 9d30db74
  前端-黄佳鑫 authored Dec 03, 2020
  
  9d30db74
- 敏感词接口修复，支付策略选择支付平台修复 · 5301229e
  前端-黄佳鑫 authored Dec 03, 2020
  
  5301229e
02 Dec, 2020 6 commits
- fix: 合并冲突 · 1279d962
  Bill authored Dec 02, 2020
  
  1279d962
- 修改请求方式 · 11fdb3a6
  前端-许佳敏 authored Dec 02, 2020
  
  11fdb3a6
- 修改冲突 · 4d30a02e
  Bill authored Dec 02, 2020
  
  4d30a02e
- fix: 修改生产通知单详情页 · cf47273c
  Bill authored Dec 02, 2020
  
  cf47273c
- Merge branch 'test' of http://10.0.0.22:3000/lingxi/lingxi-business-system into test · 872e35a9
  前端-许佳敏 authored Dec 02, 2020
  
  872e35a9
- fix: 优化api构建 · 2580c085
  前端-许佳敏 authored Dec 02, 2020
  
  2580c085