Commits · 7c387280d27362c64c00dc61b254ab9c87a6410a · shenshaokai / jinfa-platform · GitLab

18 Mar, 2022 16 commits
- Merge branch 'v2' into v2-220318 · 7c387280
  前端-许佳敏 authored Mar 18, 2022
  
  7c387280
- feat: 处理积分订单售后换货的价格展示 · 878264a5
  XieZhiXiong authored Mar 18, 2022
  
  878264a5
- fix: 修复采购报价报价信息金额保留2位数和加上合计计算 · 54d14b61
  前端-黄佳鑫 authored Mar 18, 2022
  
  54d14b61
- fix: 修改品类导航活动商品品类为空导致报错bug · 3441a3ef
  Bill authored Mar 18, 2022
  
  3441a3ef
- fix: 修改考评单考评权重考评计分权重 · 9308865d
  Bill authored Mar 18, 2022
  
  9308865d
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 3016f42c
  Bill authored Mar 18, 2022
  
  3016f42c
- fix: 修改品类导航精选商品自定义类型bug · fb5bf56a
  Bill authored Mar 18, 2022
  
  fb5bf56a
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · efc19f10
  xiexiuxing authored Mar 18, 2022
  
  efc19f10
- fix: 合并0212版本合同代码 · 16c6d3b0
  xiexiuxing authored Mar 18, 2022
  
  16c6d3b0
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · bd6c9290
  前端-黄佳鑫 authored Mar 18, 2022
  
  bd6c9290
- fix: 营销活动换购主商品过滤 · 80bcaba6
  前端-黄佳鑫 authored Mar 18, 2022
  
  80bcaba6
- fix: 修改会员考评会员权重正则 · 416f7446
  Bill authored Mar 18, 2022
  
  416f7446
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 489b73ef
  前端-许佳敏 authored Mar 18, 2022
  
  489b73ef
- merge: 合并冲突 · 3f27013f
  Bill authored Mar 18, 2022
  
  3f27013f
- fix: 修改结算实付搜索条件以及会员考评创建考评单校验信息 · 3bb50028
  Bill authored Mar 18, 2022
  
  3bb50028
- fix: 注册接口根据返回额状态判断是否需要审核 · dea09c15
  GuanHua authored Mar 18, 2022
  
  dea09c15
17 Mar, 2022 14 commits
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 1446303b
  GuanHua authored Mar 17, 2022
  
  1446303b
- fix: 修改自营商城装修标题栏链接问题和注册添加saas逻辑处理 · ba2cf808
  GuanHua authored Mar 17, 2022
  
  ba2cf808
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 0e075d4b
  前端-钟卫鹏 authored Mar 17, 2022
  
  0e075d4b
- fix: 处理待核销订单和核销自提码的问题 · f3a59d7f
  前端-钟卫鹏 authored Mar 17, 2022
  
  f3a59d7f
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · c9bbdb7e
  前端-黄佳鑫 authored Mar 17, 2022
  
  c9bbdb7e
- fix: 修复0318BUG · 767e11b0
  前端-黄佳鑫 authored Mar 17, 2022
  
  767e11b0
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 7d6982c7
  前端-许佳敏 authored Mar 17, 2022
  
  7d6982c7
- chore: 去除yapi优化插件 · 61c505de
  前端-许佳敏 authored Mar 17, 2022
  
  61c505de
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 33cc23dc
  前端-钟卫鹏 authored Mar 17, 2022
  
  33cc23dc
- fix: 现货下单选择会员根据是否设置多租户来调取接口 · 364a78e8
  前端-钟卫鹏 authored Mar 17, 2022
  
  364a78e8
- fix: 待支付订单对接跨境电商支付方式支付 · fedfffce
  前端-钟卫鹏 authored Mar 17, 2022
  
  fedfffce
- chore: 重新选择上级会员清空会员类型、会员角色选项 · fd9efbee
  XieZhiXiong authored Mar 17, 2022
  
  fd9efbee
- fix: 修复确认询价报价搜索报价会员字段错误问题 · 4938c8fc
  前端-黄佳鑫 authored Mar 17, 2022
  
  4938c8fc
- fix: 修复确认询价报价搜索报价会员字段错误问题 · 065667de
  前端-黄佳鑫 authored Mar 17, 2022
  
  065667de
16 Mar, 2022 5 commits
- merge: v2版本 · c7da812b
  前端-许佳敏 authored Mar 16, 2022
  
  c7da812b
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · c85ec86c
  前端-钟卫鹏 authored Mar 16, 2022
  
  c85ec86c
- fix: 属性属性值编辑隐藏MRO的问题 · 90e9360e
  前端-钟卫鹏 authored Mar 16, 2022
  
  90e9360e
- feat: 处理saas多租户售后申请获取供应商逻辑 · 52fbc939
  XieZhiXiong authored Mar 16, 2022
  
  52fbc939
- fix: 平台积分结算兑换比率 · 38fa5150
  Bill authored Mar 16, 2022
  
  38fa5150
15 Mar, 2022 5 commits
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 0b86ffda
  前端-钟卫鹏 authored Mar 15, 2022
  
  0b86ffda
- fix: 处理属性属性值详情查看关联平台异常 · 698a3103
  前端-钟卫鹏 authored Mar 15, 2022
  
  698a3103
- Merge branch 'v2-220318' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2-220318 · 01ad84c9
  XieZhiXiong authored Mar 15, 2022
  
  01ad84c9
- feat: 对接会员信息查询 - 新增角色 saas接口 · 82b4fc75
  XieZhiXiong authored Mar 15, 2022
  
  82b4fc75
- fix: 修改商品详情归属区域翻译 · 0c0ca00d
  前端-钟卫鹏 authored Mar 15, 2022
  
  0c0ca00d