Commits · c2a7eda40f385291bb92660458eaaf7dbc2fffbd · bp / ShenghuoquanBusiness · GitLab

24 Jun, 2021 4 commits
- Merge branch 'dev' into dev_7.2 · c2a7eda4
  shiyl authored Jun 24, 2021
```
# Conflicts:
#	Components/newscontent/src/main/java/com/yidian/shenghuoquan/newscontent/ui/center/MerchantCenterActivity.kt
```
  c2a7eda4
- add 添加友盟环境配置的开关 · 66222f61
  shiyl authored Jun 24, 2021
  
  66222f61
- add 修改个小Bug · 80159569
  宋永孟 authored Jun 24, 2021
  
  80159569
- delete 删除冗余代码 · 98f1f04d
  shiyl authored Jun 24, 2021
  
  98f1f04d
23 Jun, 2021 22 commits
- fix 生活号名称修改页面输入内容为空时不允许保存 · 3efd3177
  yinjiacheng authored Jun 23, 2021
  
  3efd3177
- fix 启动商户管理中心页面时清空页面栈 · 253eb128
  yinjiacheng authored Jun 23, 2021
  
  253eb128
- fix SHQBD-201 处理部分页面back event · b1d4b6cd
  yinjiacheng authored Jun 23, 2021
  
  b1d4b6cd
- fix SHQBD-179 个人认证完成页、个人认证信息页中"个人小店"修改为显示生活号名称，证件号码和手机号脱敏处理 · 4fe0cae2
  yinjiacheng authored Jun 23, 2021
  
  4fe0cae2
- fix SHQBD-224 个人认证完成页、个人认证信息页、企业认证生活号创建完成页处理生活号名称过长时UI显示 · f7515ae7
  yinjiacheng authored Jun 23, 2021
  
  f7515ae7
- update 企业审核认证驳回状态下修改认证资料传参标识 · 3cdf8fdf
  yinjiacheng authored Jun 23, 2021
  
  3cdf8fdf
- fix SHQBD-237 生活号标签具体区分普通企业和个体工商户 · 6f73ad44
  yinjiacheng authored Jun 23, 2021
  
  6f73ad44
- fix SHQBD-233 生活号身份选择页面企业员工角色由"普通管理员"修改为"普通员工" · bc88061e
  yinjiacheng authored Jun 23, 2021
  
  bc88061e
- fix SHQBD-230 商户基本信息页面生活号名称过长末尾省略处理 · 6fdca605
  yinjiacheng authored Jun 23, 2021
  
  6fdca605
- add 微信授权页面搭建 · 108e882d
  shiyl authored Jun 23, 2021
  
  108e882d
- fix SHQBD-236 企业员工状态下基本信息页屏蔽查看认证信息入口 · 0aa8070d
  yinjiacheng authored Jun 23, 2021
  
  0aa8070d
- fix SHQBD-212 企业员工状态下基本信息页屏蔽修改生活号名称入口 · 8aa86ade
  yinjiacheng authored Jun 23, 2021
  
  8aa86ade
- add 添加TOPBAR · fa70e6cf
  宋永孟 authored Jun 23, 2021
  
  fa70e6cf
- fix SHQBD-228 商户管理中心下拉刷新优化 · 5176e97e
  yinjiacheng authored Jun 23, 2021
  
  5176e97e
- add 添加保存 · ba51f4c2
  宋永孟 authored Jun 23, 2021
  
  ba51f4c2
- add 身份验证页面搭建 · e6753535
  shiyl authored Jun 23, 2021
  
  e6753535
- add 完善编辑页 · e1e9a629
  宋永孟 authored Jun 23, 2021
  
  e1e9a629
- add 我的钱包页面搭建完成 · 2665b187
  shiyl authored Jun 23, 2021
  
  2665b187
- add 添加编辑门店页面 · b5a9e5f5
  宋永孟 authored Jun 23, 2021
  
  b5a9e5f5
- add 添加点击 · ecfb08af
  宋永孟 authored Jun 23, 2021
  
  ecfb08af
- fix SHQBD-215 身份证OCR成功后检查下一步条件 · 92ca0ce7
  yinjiacheng authored Jun 23, 2021
  
  92ca0ce7
- add 添加底部按钮 · f5ad1a16
  宋永孟 authored Jun 23, 2021
  
  f5ad1a16
22 Jun, 2021 14 commits
- fix SHQBD-111 SHQBD-107 身份证两面OCR结果数据覆盖问题 · 9f9610dd
  yinjiacheng authored Jun 22, 2021
  
  9f9610dd
- fix SHQBD-210 商户管理中心企业员工角色下不展示管理服务模块 · 272d6069
  yinjiacheng authored Jun 22, 2021
  
  272d6069
- fix SHQBD-213 SHQBD-175 SHQBD-159 商户管理中心加下拉刷新功能，同步生活号认证状态变化 · 86b7d40d
  yinjiacheng authored Jun 22, 2021
  
  86b7d40d
- fix SHQBD-130 未修改商户类型不清空营业执照信息 · c81f1f49
  yinjiacheng authored Jun 22, 2021
  
  c81f1f49
- fix SHQBD-130 未修改商户类型不清空信息 · cc2d5320
  yinjiacheng authored Jun 22, 2021
  
  cc2d5320
- fix SHQBD-99 身份证号码输入限制18位字符、数字+大小写x · 9184264f
  yinjiacheng authored Jun 22, 2021
  
  9184264f
- fix SHQBD-222 只有登录成功后才请求生活号列表接口，避免非登录状态下请求 · 9adf14a8
  yinjiacheng authored Jun 22, 2021
  
  9adf14a8
- Merge branch 'dev_7.2' of https://git.yidian-inc.com:8021/bp/ShenghuoquanBusiness into dev_7.2 · 9b3d63bf
  shiyl authored Jun 22, 2021
  
  9b3d63bf
- 新建钱包相关的页面 · 4ba35d74
  shiyl authored Jun 22, 2021
  
  4ba35d74
- fix 企业认证流程页面跳转时pop上一页面 · b8dfaa20
  yinjiacheng authored Jun 22, 2021
  
  b8dfaa20
- update 认证流程首页UI调整 · 7c2d5988
  yinjiacheng authored Jun 22, 2021
  
  7c2d5988
- add 添加门店管理页面 · 708e3fc8
  宋永孟 authored Jun 22, 2021
  
  708e3fc8
- update 登录页面跳转特殊处理，未登录状态下从开屏页跳转直接startActivity，退出登录、切换登录使用XPage · b515ae9d
  yinjiacheng authored Jun 22, 2021
  
  b515ae9d
- add 集成友盟三方登录，实现微信授权 · a4e8a4b1
  shiyl authored Jun 22, 2021
  
  a4e8a4b1