Commit Graph

3055 Commits

Author SHA1 Message Date
tian.guangyuan
196cffa0b1 Merge branch 'feature/GFRS-228【待确定】活动量管理-活动量' into dev 2020-06-08 09:11:39 +08:00
tian.guangyuan
f6040b1d40 【fix】 增加e活动微信分享统计接口调用 2020-06-08 09:11:24 +08:00
tian.guangyuan
8f4bab170d Merge branch 'hotfix/建议书返回按钮bug' into dev 2020-06-05 10:42:42 +08:00
tian.guangyuan
a37bb412b6 【fix】 删除 对 ios的单独处理 2020-06-05 10:42:17 +08:00
yuweiqi
3a4be42227 [FIX]操作页 2020-06-04 22:52:57 +08:00
yuweiqi
40d1deb6d0 Merge branch 'feature/【保全】' of http://112.124.100.131/GFRS/ebiz-h5 into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/views/ebiz/preserve/js/data-dictionary.js
2020-06-04 21:17:28 +08:00
yuweiqi
1a88cd470f [FIX]【保全】退保、进度查询、filters 2020-06-04 21:11:46 +08:00
tian.guangyuan
d9b3054fa6 Merge branch 'feature/GFRS-1373【待确定】理赔银行卡鉴权' into dev 2020-06-04 18:12:51 +08:00
阳华祥
e8577e7635 Merge branch 'PC保全' into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
2020-06-04 18:01:59 +08:00
tian.guangyuan
77d74d7850 【fix】 修复咋理赔中,一个判断的 == 写成 = 的缺陷 2020-06-04 18:01:12 +08:00
阳华祥
cab97e8fe4 保全:续期账号变更调整 --提交人:阳华祥 2020-06-04 17:59:34 +08:00
yuweiqi
f70d800586 [FIX]【保全】保全进度查询列表 2020-06-04 14:14:24 +08:00
tian.guangyuan
f7aed54764 Merge branch 'hotfix/修复缺陷GFRS-1356' into release/0604 2020-06-04 14:11:03 +08:00
tian.guangyuan
7e0c3520d3 Merge branch 'hotfix/修复在调用试算接口时未禁用确定按钮' into release/0604 2020-06-04 14:10:50 +08:00
tian.guangyuan
46c52eca6b Merge branch 'hotfix/删除电投中的份数参数' into release/0604 2020-06-04 14:09:51 +08:00
tian.guangyuan
6bb8abe08e Merge branch 'feature/理赔暂时删除人脸识别' into dev 2020-06-04 11:20:59 +08:00
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