Commit Graph

6308 Commits

Author SHA1 Message Date
tian.guangyuan
9204cf697a Revert "【临时修改】 暂时屏蔽人脸识别"
This reverts commit c7db44e3cb.
2020-06-04 11:20:41 +08:00
tian.guangyuan
67428b8975 Merge branch 'feature/理赔暂时删除人脸识别' into dev 2020-06-04 10:27:41 +08:00
tian.guangyuan
c7db44e3cb 【临时修改】 暂时屏蔽人脸识别 2020-06-04 10:26:50 +08:00
yuweiqi
e24fde33db Merge branch 'feature/GFRS-214【待确定】保全进度查询' into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/config/preserve.js
#	src/config/urlMap.js
#	src/router/ebiz/preserve.js
#	src/views/ebiz/preserve/BeneficiaryInfoDetail.vue
#	src/views/ebiz/preserve/ImageUpload.vue
#	src/views/ebiz/preserve/RenewalConfirmation.vue
#	src/views/ebiz/preserve/RenewalInfo.vue
#	src/views/ebiz/preserve/Search.vue
#	src/views/ebiz/preserve/SurrenderConfirmation.vue
#	src/views/ebiz/preserve/SurrenderInfo.vue
#	src/views/ebiz/preserve/bb/ContacAgreement.vue
#	src/views/ebiz/preserve/bb/ContactConfirmation.vue
#	src/views/ebiz/preserve/bb/ContactInfo.vue
#	src/views/ebiz/preserve/bc/BeneficiaryInfo.vue
#	src/views/ebiz/preserve/bc/BeneficiaryInfoAdd.vue
#	src/views/ebiz/preserve/bc/BeneficiaryInfoDetail.vue
#	src/views/ebiz/preserve/common/HandleResult.vue
#	src/views/ebiz/preserve/common/PolicyList.vue
#	src/views/ebiz/preserve/detail/BeneficiaryInfo.vue
#	src/views/ebiz/preserve/js/data-dictionary.js
2020-06-04 10:26:16 +08:00
yuweiqi
4d902756d3 [FIX]【理赔】打开app人脸识别内 2020-06-04 10:09:12 +08:00
yuweiqi
d4e6797364 [FIX]【理赔】临时关闭app内人脸识别功能,测试专用 2020-06-04 09:26:11 +08:00
yuweiqi
02dfc2fee7 [FIX]【保全】受益人-初始信息页面、新增/编辑受益人页面;保单列表页 2020-06-03 17:59:05 +08:00
tian.guangyuan
c492b231a9 Merge branch 'hotfix/修复缺陷1356' into dev 2020-06-03 13:35:54 +08:00
tian.guangyuan
0b23757bad 【fix】 修复 bug GFRS-1356
【dev测试】电子投保-未提交,进入两个不同投保人的保单,a是账号信息页面,b是任意页面。先进入b,在进入a。a的投保人信息显示有误
2020-06-03 13:35:20 +08:00
yuweiqi
19c240d882 [FIX]【保全】分支整理 2020-06-03 09:29:14 +08:00
阳华祥
fe5b37dac9 GFRS-1306卡单学平险:分享链接添加 --提交人:阳华祥 2020-06-02 17:34:27 +08:00
tian.guangyuan
2a150d31e6 Merge branch 'hotfix/建议书返回按钮bug' into release/0602 2020-06-02 16:58:22 +08:00
tian.guangyuan
229123a7e2 Merge branch 'hotfix/修复在调用试算接口时未禁用确定按钮' into dev 2020-06-02 16:55:39 +08:00
tian.guangyuan
7523e8f14c 【fix】 在调用保费试算页面,在 试算 接口时,禁用确定按钮 2020-06-02 16:54:03 +08:00
tian.guangyuan
8439c85a12 Merge branch 'hotfix/建议书返回按钮bug' into dev 2020-06-02 09:56:39 +08:00
tian.guangyuan
230cfdf3e2 【fix】 修复 错误的return 2020-06-02 09:54:24 +08:00
yuweiqi
a7d4b60ee9 [FIX]【自助入司改造】查看原因页面新增撤销申请功能 2020-06-01 19:32:44 +08:00
tian.guangyuan
c1bd48d8e2 Merge branch 'hotfix/建议书返回按钮bug' into dev
# Conflicts:
#	src/views/ebiz/nbs/List.vue
#	src/views/ebiz/proposal/List.vue
#	src/views/ebiz/sale/List.vue
2020-06-01 16:58:16 +08:00
tian.guangyuan
e920f55567 [fix] 对 ios 特别处理, 电子保单列表、建议书列表、nbs列表 的返回功能 2020-06-01 16:56:08 +08:00
tian.guangyuan
d50fff6aaf Revert "[fix] 将跳转到首页修改为关闭 webview_closed"
This reverts commit 816c813fc6.
2020-06-01 16:34:23 +08:00
tian.guangyuan
e9b4760e7f Merge branch 'hotfix/建议书返回按钮bug' into dev 2020-06-01 16:25:11 +08:00
tian.guangyuan
816c813fc6 [fix] 将跳转到首页修改为关闭 webview_closed 2020-06-01 16:24:41 +08:00
tian.guangyuan
e089f9aad8 Revert "【fix】 处理 nbs 相同的问题"
This reverts commit 40441f604d.
2020-06-01 16:18:42 +08:00
tian.guangyuan
593051d703 Merge branch 'hotfix/修改建议书返回按钮' into dev 2020-06-01 16:08:48 +08:00
tian.guangyuan
4858f4fdbe Revert "【fix】 尝试通过 不监听原生返回。 修改 建议书 和 电子投保的 错误返回"
This reverts commit 51a8a0d89b.
2020-06-01 16:05:04 +08:00
阳华祥
772474254e 测试知识社区生产链接回滚。 --提交人:阳华祥 2020-06-01 15:56:24 +08:00
阳华祥
65e2d7c549 测试知识社区生产链接。 --提交人:阳华祥 2020-06-01 15:53:47 +08:00
阳华祥
444f766101 GFRS-1306卡单学平险:流程调整 --提交人:阳华祥 2020-06-01 14:24:58 +08:00
tian.guangyuan
4195138585 Merge branch 'hotfix/建议书返回按钮bug' into dev 2020-06-01 13:06:23 +08:00
tian.guangyuan
40441f604d 【fix】 处理 nbs 相同的问题 2020-06-01 12:00:17 +08:00
tian.guangyuan
eb6677990e Merge branch 'hotfix/修改建议书返回按钮' into dev 2020-06-01 11:32:00 +08:00
tian.guangyuan
51a8a0d89b 【fix】 尝试通过 不监听原生返回。 修改 建议书 和 电子投保的 错误返回 2020-06-01 11:31:43 +08:00
tian.guangyuan
4e5ef8ea50 【fix】 修复 首页 产品中心,八桂无忧图片跳转到错误的产品详情 2020-06-01 11:29:09 +08:00
tgy
f5cc6fd6d7 Merge branch 'hotfix/建议书删除.00' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-05-30 21:41:17 +08:00
tgy
4d737941e6 [fix] 建议书, 如果计算值小数为.00 的话, 就直接隐藏小数了 2020-05-30 21:39:37 +08:00
tian.guangyuan
2c31f175e7 【fix】 增加该功能 2020-05-29 20:55:58 +08:00
yuweiqi
89675e66a1 [fix]【自助入司改造】干掉无用代码 2020-05-29 18:15:42 +08:00
yuweiqi
40d9451339 [fix]【自助入司改造】新增撤销申请功能 2020-05-29 18:14:02 +08:00
yuweiqi
d84605dea9 [fix]【自助入司改造】基本信息填写邮政编码非必填,若填写则进行格式校验 2020-05-29 17:35:25 +08:00
yuweiqi
accdbbf095 [NEW]【自助入司改造】新增审批记录、审批详细信息页;原待审批信息接口调整;影像上传页增加身份证正反面图片上传张数校验 2020-05-29 16:00:28 +08:00
tian.guangyuan
137098f7a2 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into release/0528
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-05-29 14:05:15 +08:00
tian.guangyuan
9629271fb7 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权-理赔银行卡鉴权' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-05-29 10:53:21 +08:00
tian.guangyuan
0dd45a54bd 【fix】 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into feature/【0529】银行卡鉴权-理赔银行卡鉴权
# Conflicts:
#	src/api/ebiz/sale/sale.js

开发理赔中的银行卡鉴权
2020-05-29 10:45:50 +08:00
tian.guangyuan
782cd6aefd Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into dev 2020-05-28 17:12:55 +08:00
tian.guangyuan
d25a031927 【fix】 修复在部分情况下,银行卡鉴权的数据取错的问题 2020-05-28 17:09:18 +08:00
yuweiqi
d0aa6e13c2 Merge branch 'hotfix/bug_【更换人脸识别厂商微信端】偶发性首次进入微信空签,签署文档参数缺失问题' into dev 2020-05-28 14:14:59 +08:00
yuweiqi
a54ed09b25 [FIX]【人脸识别缺陷】电投人脸识别分享到微信,点击分享链接,提示"参数缺少" 2020-05-28 14:11:57 +08:00
tian.guangyuan
7c2125d7fd Merge branch 'feature/GFRS-1357【待确定】银行卡增加招商银行' into dev 2020-05-28 13:58:02 +08:00
tian.guangyuan
25ef9f9d38 [fix] 增加银行卡时,通过银行的code来确定该银行logo 2020-05-28 13:56:40 +08:00
yuweiqi
81c9331847 Merge branch 'hotfix/bug_【更换人脸识别厂商微信端】偶发性首次进入微信空签,签署文档参数缺失问题' into dev 2020-05-28 13:54:52 +08:00