Commit Graph

6420 Commits

Author SHA1 Message Date
mengxiaolong
1983e4d973 关闭测试电投人脸 2020-12-21 10:39:39 +08:00
yang.huaxiang
80bbdb7097 Merge branch 'feature/惠桂保添加访问授权控制' into release/1218 2020-12-18 18:05:21 +08:00
mengxiaolong
3442680fb7 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-12-18 16:59:07 +08:00
mengxiaolong
d33046db43 附加豁免定寿B+民鑫年金、瑞利年金、鑫享年金、稳赢两全保险: 附加险保额取主险保费 2020-12-18 16:57:36 +08:00
yang.huaxiang
1850f582e1 Merge branch 'feature/GFRS-2116【待确定】国富人寿附加住院医疗保险' into dev 2020-12-18 16:46:36 +08:00
yang.huaxiang
ea3864a97a 国富人寿附加住院医疗保险(B款): 产品上线代码调整GFRS_M0031 搭配处理 --提交人:阳华祥 2020-12-18 16:43:32 +08:00
mengxiaolong
4ed57cad72 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 2020-12-18 16:20:06 +08:00
mengxiaolong
1a5a5d2982 附加豁免定寿B+民鑫年金、瑞利年金、鑫享年金、稳赢两全保险: 附加险保额取主险保费 2020-12-18 16:19:55 +08:00
mengxiaolong
1bad45a6e7 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 2020-12-18 15:16:31 +08:00
mengxiaolong
46fd38ef5d 民鑫、瑞利年金、鑫享年金、稳赢两全+附加定寿B特殊处理 2020-12-18 15:15:00 +08:00
mengxiaolong
4b432b68c6 Merge branch 'hotfix/邮箱校验正则表达式修改' into dev 2020-12-17 17:55:05 +08:00
mengxiaolong
932813aee1 邮箱校验正则表达式修改 2020-12-17 17:54:37 +08:00
mengxiaolong
5514ab5cb7 Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev
# Conflicts:
#	src/views/ebiz/preserve/common/HandleResult.vue
2020-12-17 16:40:32 +08:00
mengxiaolong
8152841e4b 保全白名单 2020-12-17 16:39:23 +08:00
yang.huaxiang
d6afb861a5 Merge branch 'feature/GFRS-2116【待确定】国富人寿附加住院医疗保险' into dev 2020-12-17 10:41:52 +08:00
yang.huaxiang
46763c48fe 国富人寿附加住院医疗保险(B款): 产品上线代码调整 --提交人:阳华祥 2020-12-17 10:18:36 +08:00
mengxiaolong
c9fb51647d 修改国籍编码使用字符串比较问题 2020-12-16 21:43:43 +08:00
mengxiaolong
65c0c16eff Merge branch 'hotfix/修改国籍编码使用字符串比较问题' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/request.js
#	src/router/ebiz/index.js
#	src/views/ebiz/sale/List.vue
2020-12-16 15:58:33 +08:00
mengxiaolong
cb9f342a2c 修改使用字符串比较国籍编码问题 2020-12-16 15:55:26 +08:00
mengxiaolong
5bb72f5046 Merge branch 'hotfix/修改问题件提交无响应问题' into release/1215 2020-12-15 18:02:34 +08:00
mengxiaolong
a1fc9ab37a Merge branch 'feature/开门红' into release/1215 2020-12-15 13:17:46 +08:00
mengxiaolong
187626909e Merge branch 'feature/海报默认展示产品' into release/1215 2020-12-15 10:58:33 +08:00
mengxiaolong
c374aabd89 删除多余代码 2020-12-15 10:58:21 +08:00
mengxiaolong
b3b788311b Merge branch 'feature/人核保单显示撤单按钮' into release/1215
# Conflicts:
#	src/views/ebiz/sale/List.vue
2020-12-15 10:43:06 +08:00
mengxiaolong
582c2bb70e Merge branch 'feature/电投自动撤单添加验证码校验' into release/1215
# Conflicts:
#	src/views/ebiz/sale/List.vue
2020-12-15 10:31:02 +08:00
mengxiaolong
e547871c27 Merge branch 'feature/GFRS-706【0326】电投添加自动撤单功能' into release/1215
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/views/ebiz/sale/List.vue
2020-12-15 10:16:08 +08:00
mengxiaolong
d52de42b64 Merge branch 'feature/海报默认展示产品' into dev
# Conflicts:
#	src/router/ebiz/index.js
2020-12-15 09:48:49 +08:00
mengxiaolong
50e40cb348 格式化代码, 海报默认显示产品 2020-12-15 09:46:22 +08:00
mengxiaolong
1266535af2 Merge branch 'feature/开门红' into dev 2020-12-14 11:28:19 +08:00
mengxiaolong
06b7312f0d 区分从首页和服务页进入开门红方案 2020-12-14 11:28:04 +08:00
mengxiaolong
601c7000be Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev 2020-12-11 17:36:46 +08:00
mengxiaolong
679cefd1ae 白名单类型修改 2020-12-11 17:36:29 +08:00
mengxiaolong
c05101752d Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev 2020-12-11 17:24:47 +08:00
mengxiaolong
f507418307 白名单类型修改 2020-12-11 17:24:34 +08:00
mengxiaolong
86b820f824 Merge branch 'hotfix/修改问题件提交无响应问题' into dev 2020-12-11 14:28:16 +08:00
mengxiaolong
d1d648feeb 微信端回显图片 2020-12-11 14:27:26 +08:00
mengxiaolong
b9150b1050 Merge branch 'hotfix/修改问题件提交无响应问题' into dev 2020-12-11 14:07:56 +08:00
mengxiaolong
2055a07828 问题件提交无反应问题修改 2020-12-11 14:07:41 +08:00
mengxiaolong
fa11f57eaf Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev 2020-12-10 17:04:31 +08:00
mengxiaolong
e27629d132 理赔人脸识别打开 2020-12-10 17:04:12 +08:00
mengxiaolong
1a4a7439a0 Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev 2020-12-10 16:43:09 +08:00
mengxiaolong
298695b863 理赔人脸/银行卡鉴权白名单 2020-12-10 16:42:47 +08:00
mengxiaolong
79af18186b Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev 2020-12-10 15:51:20 +08:00
mengxiaolong
f7002422bb 理赔手机号码取值修改 2020-12-10 15:51:00 +08:00
mengxiaolong
27d355dd80 测试白名单, 打开人脸识别 2020-12-10 14:57:21 +08:00
mengxiaolong
6349dbc84d Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev
# Conflicts:
#	src/views/ebiz/preserve/common/HandleResult.vue
2020-12-10 14:54:28 +08:00
mengxiaolong
5dee06bdb8 白名单+短信 2020-12-10 11:56:59 +08:00
yang.huaxiang
b31e7182f0 Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into release/20201210 2020-12-10 10:17:26 +08:00
yang.huaxiang
474689bdd2 Merge branch 'feature/GFRS-2015【待确定】开门红需求' into release/20201210
# Conflicts:
#	src/api/ebiz/my/my.js
#	src/router/ebiz/my.js
2020-12-10 10:16:53 +08:00
mengxiaolong
150e3d00d7 Merge branch 'feature/开门红' into release/20201210
# Conflicts:
#	src/router/ebiz/index.js
2020-12-10 09:10:15 +08:00