Commits · 7db1a67a2729c11d12ade91084d72fcaad292749 · linweijiong / jinfa-platform · GitLab

04 Dec, 2020 3 commits
- Merge branch 'dev' into test · 7db1a67a
  前端-钟卫鹏 authored Dec 04, 2020
  
  7db1a67a
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a77f5329
  前端-钟卫鹏 authored Dec 04, 2020
  
  a77f5329
- fix：新建采购订单查询表支付信息添加memberRoleId和orderModel字段 · 073222a1
  前端-钟卫鹏 authored Dec 04, 2020
  
  073222a1
03 Dec, 2020 25 commits
- 合并冲突 · 97696e3d
  XieZhiXiong authored Dec 03, 2020
  
  97696e3d
- 走完一遍售后换货流程 · 3255f3fd
  XieZhiXiong authored Dec 03, 2020
  
  3255f3fd
- 修改冲突 · 48f976f0
  前端-黄佳鑫 authored Dec 03, 2020
  
  48f976f0
- refactor: 重构需求发布 · a5693060
  前端-黄佳鑫 authored Dec 03, 2020
  
  a5693060
- merge: 解决冲突 · e9a8edc4
  Bill authored Dec 03, 2020
  
  e9a8edc4
- refactor: 重构首页，适配小屏 · 19207fdb
  Bill authored Dec 03, 2020
  
  19207fdb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f52b6d98
  GuanHua authored Dec 03, 2020
  
  f52b6d98
- fix:店铺模板装修修改查询品牌列表的接口 · acc79611
  GuanHua authored Dec 03, 2020
  
  acc79611
- fix:下单接口添加shopId和memberRoleId参数 · b1d55385
  GuanHua authored Dec 03, 2020
  
  b1d55385
- Merge branch 'dev' into test · 455b8bf8
  前端-钟卫鹏 authored Dec 03, 2020
  
  455b8bf8
- fix： · 3229623c
  前端-钟卫鹏 authored Dec 03, 2020
  
  3229623c
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 814acebb
  前端-钟卫鹏 authored Dec 03, 2020
  
  814acebb
- fix：处理销售订单确认回单和继续发货按钮显示异常 · fe38862f
  前端-钟卫鹏 authored Dec 03, 2020
  
  fe38862f
- fix：处理编辑交易规则商品无分页问题，处理销售订单商品区块修改价格后乱序问题，处理商城跳转过来的订单会员折扣传参异常 · 27c98491
  前端-钟卫鹏 authored Dec 03, 2020
  
  27c98491
- fix:下单接口添加传参参数 · ed5f0b49
  GuanHua authored Dec 03, 2020
  
  ed5f0b49
- fix:查询渠道商城信息添加用户id · 597c1bae
  GuanHua authored Dec 03, 2020
  
  597c1bae
- fix:店铺商品品类筛选问题 · 4e2f64ec
  GuanHua authored Dec 03, 2020
  
  4e2f64ec
- fix：处理商品跳转过来的下单会员折扣显示异常 · 3e251647
  前端-钟卫鹏 authored Dec 03, 2020
  
  3e251647
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · e6bb8559
  Bill authored Dec 03, 2020
  
  e6bb8559
- fix: 修改首页默认logo, 消息页跳转 · 70bb4563
  Bill authored Dec 03, 2020
  
  70bb4563
- Merge branch 'dev' into test · a3ad28d1
  前端-钟卫鹏 authored Dec 03, 2020
  
  a3ad28d1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · eea7495c
  前端-钟卫鹏 authored Dec 03, 2020
  
  eea7495c
- fix：处理添加商品无品类空白显示，处理销售订单合计总计价格显示异常，隐藏订单详情中无内容的审核流程，添加数值范围筛选控件 · 8bf17c06
  前端-钟卫鹏 authored Dec 03, 2020
  
  8bf17c06
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 3bfbef8e
  XieZhiXiong authored Dec 03, 2020
  
  3bfbef8e
- 对接中 · 0966f2c2
  XieZhiXiong authored Dec 03, 2020
  
  0966f2c2
02 Dec, 2020 12 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f1720391
  前端-黄佳鑫 authored Dec 02, 2020
  
  f1720391
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ee5765c4
  前端-黄佳鑫 authored Dec 02, 2020
  
  ee5765c4
- 修改询价模块批量提交审核接口响应时可多次点击的问题 · 96cc8220
  前端-黄佳鑫 authored Dec 02, 2020
  
  96cc8220
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 00b2b8ef
  Bill authored Dec 02, 2020
  
  00b2b8ef
- fix:商品收藏跳转到商品详情链接错误 · 4dcc1be6
  GuanHua authored Dec 02, 2020
  
  4dcc1be6
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 1885ff18
  Bill authored Dec 02, 2020
  
  1885ff18
- fix: 加工新建时选择商品后，删除商品后再勾选会出现重复的商品 · a8085060
  Bill authored Dec 02, 2020
  
  a8085060
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 2aac24e7
  GuanHua authored Dec 02, 2020
  
  2aac24e7
- Merge branch 'dev' into tes:wq · cd78e17b
  前端-许佳敏 authored Dec 02, 2020
  
  cd78e17b
- fix: 用户管理加密方法 · 893e80eb
  前端-许佳敏 authored Dec 02, 2020
  
  893e80eb
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 63a73465
  GuanHua authored Dec 02, 2020
  
  63a73465
- feat:remove fontwesome css · 8b1e3910
  GuanHua authored Dec 02, 2020
  
  8b1e3910