Commits · 851afab35796a21445b0b5f48e345baa2e78022b · shenshaokai / jinfa-platform · GitLab

23 Nov, 2020 19 commits
- 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
- 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 · 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 18 commits
- 修改socket url · 188af8e9
  Bill authored Nov 20, 2020
  
  188af8e9
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · b4c52e24
  Bill authored Nov 20, 2020
  
  b4c52e24
- 修改app.tsx dev环境也需要登录，不然首页因没有用户信息而报错 · 5d003629
  Bill authored Nov 20, 2020
  
  5d003629
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · ed41bf7b
  XieZhiXiong authored Nov 20, 2020
  
  ed41bf7b
- 物流方式从商品中获取 · a5cf0678
  XieZhiXiong authored Nov 20, 2020
  
  a5cf0678
- Merge branch 'dev' of 10.0.0.22:lingxi/lingxi-business-paltform into dev · c58ddae0
  Bill authored Nov 20, 2020
  
  c58ddae0
- 修改首页布局，对接加工 · 5d47ea7f
  Bill authored Nov 20, 2020
  
  5d47ea7f
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · fe3ae5b7
  GuanHua authored Nov 20, 2020
  
  fe3ae5b7
- fix： · 6d670cc1
  前端-钟卫鹏 authored Nov 20, 2020
  
  6d670cc1
- fix：处理订单/资金账户区块时间筛选为时间戳格式，添加时间戳格式的时间范围选择控件DateRangePickerUnix · e2d5eae1
  前端-钟卫鹏 authored Nov 20, 2020
  
  e2d5eae1
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 51e846ea
  GuanHua authored Nov 20, 2020
  
  51e846ea
- fix:修改获取钱包余额参数,修改线下转账支付方式样式问题 · 8e1056de
  GuanHua authored Nov 20, 2020
  
  8e1056de
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · 3061edce
  XieZhiXiong authored Nov 20, 2020
  
  3061edce
- 取消货品联动，货品选择只做新增操作 · 9729e798
  XieZhiXiong authored Nov 20, 2020
  
  9729e798
- fix: · 1cfc61a6
  前端-钟卫鹏 authored Nov 20, 2020
  
  1cfc61a6
- Merge branch 'dev' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into dev · a6fc0a3c
  前端-钟卫鹏 authored Nov 20, 2020
  
  a6fc0a3c
- 对接售后换货中 · 42e2522f
  XieZhiXiong authored Nov 20, 2020
  
  42e2522f
- fix：资金账户充值更新 · 3d1e4f2f
  前端-钟卫鹏 authored Nov 20, 2020
  
  3d1e4f2f