Commits · fc11325fe1da8e10564d5e9a903984bbc862518b · linweijiong / jinfa-platform · GitLab

03 Dec, 2021 6 commits
- fix: 修复券有效截止时间与领券截止时间比较错误的问题 · fc11325f
  XieZhiXiong authored Dec 03, 2021
  
  fc11325f
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 55175793
  Bill authored Dec 03, 2021
  
  55175793
- feat: 修改首页跳转向导 · a21684d7
  Bill authored Dec 03, 2021
  
  a21684d7
- chore: 删除无用组件及引用 · 16adb735
  XieZhiXiong authored Dec 03, 2021
  
  16adb735
- feat: 添加代客维修申请 · 0b255b50
  XieZhiXiong authored Dec 03, 2021
  
  0b255b50
- chore: 修改提示与及其判断 · eb944260
  XieZhiXiong authored Dec 03, 2021
  
  eb944260
02 Dec, 2021 22 commits
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 99d5e0e0
  XieZhiXiong authored Dec 02, 2021
  
  99d5e0e0
- feat: 添加代客退货申请 · fac0ecd9
  XieZhiXiong authored Dec 02, 2021
  
  fac0ecd9
- chore: 修改注释 · 9507af71
  XieZhiXiong authored Dec 02, 2021
  
  9507af71
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · d327f78d
  前端-钟卫鹏 authored Dec 02, 2021
  
  d327f78d
- feat: 添加e账户认证企业认证页面，对接销售订单查询生成支付链接和二维码功能 · 9b5d4b97
  前端-钟卫鹏 authored Dec 02, 2021
  
  9b5d4b97
- feat: 对接代客换货申请 · 7acf5074
  XieZhiXiong authored Dec 02, 2021
  
  7acf5074
- chore: 补充类型说明 · 44e62fbe
  XieZhiXiong authored Dec 02, 2021
  
  44e62fbe
- fix: 修复 echo 属性存在时，还回填了默认地址的问题 · 22f66055
  XieZhiXiong authored Dec 02, 2021
  
  22f66055
- chore: 添加会员管理 -> 待审核入库资料CN国际化 · 919dd2ff
  XieZhiXiong authored Dec 02, 2021
  
  919dd2ff
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 137bd247
  XieZhiXiong authored Dec 02, 2021
  
  137bd247
- chore: 删除 extra 属性 · 1219129b
  XieZhiXiong authored Dec 02, 2021
  
  1219129b
- feat: 新增代客售后换货UI · 4f14490b
  XieZhiXiong authored Dec 02, 2021
  
  4f14490b
- fix: 修改营销活动bug · 9c9f9faa
  前端-黄佳鑫 authored Dec 02, 2021
  
  9c9f9faa
- feat: 采购能力 -> 组件国际化 · 5d1bd6b5
  前端-黄佳鑫 authored Dec 02, 2021
  
  5d1bd6b5
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 5266f0ca
  前端-黄佳鑫 authored Dec 02, 2021
  
  5266f0ca
- feat: 采购能力 -> 组件国际化 · 0fcc8435
  前端-黄佳鑫 authored Dec 02, 2021
  
  0fcc8435
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · c0c7374f
  XieZhiXiong authored Dec 02, 2021
  
  c0c7374f
- fix: 修复无法重置部分表单值的问题 · dbe5f571
  XieZhiXiong authored Dec 02, 2021
  
  dbe5f571
- merge: 冲突解决 · 67a29bb2
  GuanHua authored Dec 02, 2021
  
  67a29bb2
- feat: 品类装修页面文案提取 · 3f2cfa8a
  GuanHua authored Dec 02, 2021
  
  3f2cfa8a
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · a0f0bdd9
  XieZhiXiong authored Dec 02, 2021
  
  a0f0bdd9
- feat: 完成售后申请地址抽屉地区信息四级功能 · 4119779e
  XieZhiXiong authored Dec 02, 2021
  
  4119779e
01 Dec, 2021 12 commits
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 3b92f32c
  前端-李俊鑫 authored Dec 01, 2021
```
# Conflicts:
#	src/locales/zh-CN/common.ts
```
  3b92f32c
- feat: 内容能力-公告管理国际化 · 1a91bb75
  前端-李俊鑫 authored Dec 01, 2021
  
  1a91bb75
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · a6203eee
  GuanHua authored Dec 01, 2021
  
  a6203eee
- feat: 装修相关文案提取 · 27ca90d1
  GuanHua authored Dec 01, 2021
  
  27ca90d1
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 19ac5900
  前端-钟卫鹏 authored Dec 01, 2021
  
  19ac5900
- feat: 添加商品导出二维码功能，添加销售订单查询生成支付链接弹框，添加e账户认证未认证状态页面 · ac7d316f
  前端-钟卫鹏 authored Dec 01, 2021
  
  ac7d316f
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 38acd6bc
  前端-黄佳鑫 authored Dec 01, 2021
  
  38acd6bc
- feat: 采购能力 -> 采访门户国际化 · a1bb25e0
  前端-黄佳鑫 authored Dec 01, 2021
  
  a1bb25e0
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · 255c1d1a
  卢均锐 authored Dec 01, 2021
```
* 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform:
  feat: 内容能力-》资讯等国际化
  feat: 采购能力 -> 在线竞价国际化
  chore: 补充 returnDetailId
```
  255c1d1a
- feat: 商品能力-仓位模块国际化 · beaceaad
  卢均锐 authored Dec 01, 2021
  
  beaceaad
- Merge branch 'v2' of http://10.0.0.22:3000/lingxi/lingxi-business-paltform into v2 · c7d2dc6d
  前端-李俊鑫 authored Dec 01, 2021
  
  c7d2dc6d
- feat: 内容能力-》资讯等国际化 · 3df134d9
  前端-李俊鑫 authored Dec 01, 2021
  
  3df134d9