Commits · 21abe57a89708f8883b17876c141fe9feaf03263 · linweijiong / jinfa-platform · GitLab

25 Nov, 2020 4 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 21abe57a
  GuanHua authored Nov 25, 2020
  
  21abe57a
- feat:对接积分兑换 · 7418f22f
  GuanHua authored Nov 25, 2020
  
  7418f22f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 1e1e4c9d
  前端-钟卫鹏 authored Nov 25, 2020
  
  1e1e4c9d
- fix：处理销售订单区块字段显示异常、待确认订单添加合同签署供功能，处理新增采购订单数量大于最小起订数商品数据显示异常，处理商品提交审核后编辑时需要传入规格id、商品上架查询店铺时添加会员角色字段 · 48777062
  前端-钟卫鹏 authored Nov 25, 2020
  
  48777062
24 Nov, 2020 7 commits
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 28a0b16c
  Bill authored Nov 24, 2020
  
  28a0b16c
- 修改加工 · 1bbee90d
  Bill authored Nov 24, 2020
  
  1bbee90d
- fixbug · 92295fae
  XieZhiXiong authored Nov 24, 2020
  
  92295fae
- 完成加工单相关 · ee9e16ad
  XieZhiXiong authored Nov 24, 2020
  
  ee9e16ad
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 97e4aec6
  XieZhiXiong authored Nov 24, 2020
  
  97e4aec6
- fixbug · eedf7dfb
  XieZhiXiong authored Nov 24, 2020
  
  eedf7dfb
- feat:有合同流程的新增订单添加合同id字段 · 1281ab95
  GuanHua authored Nov 24, 2020
  
  1281ab95
23 Nov, 2020 25 commits
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f93466ce
  前端-黄佳鑫 authored Nov 23, 2020
  
  f93466ce
- 修改需求发布需求报价确认需求报价得外部内部状态显示 · 7faf08c3
  前端-黄佳鑫 authored Nov 23, 2020
  
  7faf08c3
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 851afab3
  Bill authored Nov 23, 2020
  
  851afab3
- 对接首页，对接加工模块，加密修改密码模块 · 3eee0593
  Bill authored Nov 23, 2020
  
  3eee0593
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a8e67237
  XieZhiXiong authored Nov 23, 2020
  
  a8e67237
- 对接中加工发货单中 · 045eb3ed
  XieZhiXiong authored Nov 23, 2020
  
  045eb3ed
- fix:购买数量低于最小订购量,可以加入购物车的问题 · 89862bb2
  GuanHua authored Nov 23, 2020
  
  89862bb2
- feat:积分支付和余额支付支付密码加密 · 89fde2e2
  GuanHua authored Nov 23, 2020
  
  89fde2e2
- feat:积分支付获取当前用户积分接口对接 · 659c3740
  GuanHua authored Nov 23, 2020
  
  659c3740
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 5b0367f8
  GuanHua authored Nov 23, 2020
  
  5b0367f8
- fix:企业商城进货单推荐商品链接问题 · fcc01397
  GuanHua authored Nov 23, 2020
  
  fcc01397
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · f09618ac
  前端-黄佳鑫 authored Nov 23, 2020
  
  f09618ac
- 修改询价商品，询价报价，确认询价报价外部和内部状态文字 · 852f02fd
  前端-黄佳鑫 authored Nov 23, 2020
  
  852f02fd
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 95f8b048
  XieZhiXiong authored Nov 23, 2020
  
  95f8b048
- 对接加工相关单据中 · 1b6e4219
  XieZhiXiong authored Nov 23, 2020
  
  1b6e4219
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · dcfcaa99
  GuanHua authored Nov 23, 2020
  
  dcfcaa99
- fix:进货单商品链接问题,订单支付获取余额参数错误的问题 · 2241999a
  GuanHua authored Nov 23, 2020
  
  2241999a
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · 4d5322dc
  Bill authored Nov 23, 2020
  
  4d5322dc
- 对接加工详情 · 403db5c7
  Bill authored Nov 23, 2020
  
  403db5c7
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 6c7241c1
  前端-许佳敏 authored Nov 23, 2020
  
  6c7241c1
- feat:对密码进行AES加密 · ee04d6a4
  前端-许佳敏 authored Nov 23, 2020
  
  ee04d6a4
- fix;登录后访问渠道商城地址，点击会员中心提示无权限的问题 · ac38c1ed
  GuanHua authored Nov 23, 2020
  
  ac38c1ed
- fix:商品不存在样式优化 · 903a58b6
  GuanHua authored Nov 23, 2020
  
  903a58b6
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · a00f45dd
  Bill authored Nov 23, 2020
  
  a00f45dd
- 修改首页在dev没有userAuth的情况下，首页返回null · df94782e
  Bill authored Nov 23, 2020
  
  df94782e
21 Nov, 2020 3 commits
- 询价和需求报价添加商品加上图片链接，运费模板弹框BUG修复，修改询价报价附件编辑添加附件把之前的搞没得问题 · 6f33f0b1
  前端-黄佳鑫 authored Nov 21, 2020
  
  6f33f0b1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · b4db2a61
  前端-黄佳鑫 authored Nov 21, 2020
  
  b4db2a61
- 修改需求发布新需求 · 8b560a66
  前端-黄佳鑫 authored Nov 21, 2020
  
  8b560a66
20 Nov, 2020 1 commit
- 修改socket url · 188af8e9
  Bill authored Nov 20, 2020
  
  188af8e9