wangmingzhe
|
f663da6433
|
Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev
|
2020-04-21 18:28:58 +08:00 |
|
wangmingzhe
|
9bdeabbf57
|
[NEW] 修改投保支付页面样式
|
2020-04-21 18:28:37 +08:00 |
|
wangmingzhe
|
4ac29b11df
|
Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev
|
2020-04-21 16:19:51 +08:00 |
|
wangmingzhe
|
a7b8abfef1
|
[NEW] 修改投保支付微信分享后储存token
|
2020-04-21 16:19:32 +08:00 |
|
wangmingzhe
|
83f2ddd982
|
Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev
|
2020-04-21 16:01:51 +08:00 |
|
wangmingzhe
|
32c5382687
|
[NEW] 新增投保分享微信支付功能
|
2020-04-21 16:01:23 +08:00 |
|
tian.guangyuan
|
d938d57094
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
|
2020-04-21 14:56:41 +08:00 |
|
tian.guangyuan
|
53d08ef1d0
|
Merge branch 'feature/GFRS-1033【0430】职业控件优化' into dev
|
2020-04-21 14:56:34 +08:00 |
|
tian.guangyuan
|
9520608d3e
|
【fix】 将职业控件 搜索列表字体从 12 -> 14 。 数据又居中对齐改为左对齐
|
2020-04-21 14:55:06 +08:00 |
|
tian.guangyuan
|
8b32ccdbaa
|
[fix] 添加查看条款功能，并通过eslint --fix 修复卡单模块代码
|
2020-04-21 14:48:00 +08:00 |
|
yuweiqi
|
466f71a17f
|
Merge branch 'hotfix/GFRS【栋梁一起】电投受益人同投保人选项-其他禁用' into dev
|
2020-04-21 13:15:10 +08:00 |
|
yuweiqi
|
11ef7ff2d9
|
[FIX]解决dev代码合并问题
|
2020-04-21 13:14:50 +08:00 |
|
yuweiqi
|
a918abba3e
|
[FIX]解决dev代码合并问题
|
2020-04-21 13:12:50 +08:00 |
|
tian.guangyuan
|
061e2e5152
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
|
2020-04-21 11:37:58 +08:00 |
|
tian.guangyuan
|
d97bba7845
|
【fix】 卡单流程完成，提交给后端与核心联调
|
2020-04-21 11:37:00 +08:00 |
|
yuweiqi
|
8a3286fceb
|
[FIX]影像上传-请求上传接口错误情况，增加校验、抛出错误并提示，提示语修改
|
2020-04-21 10:19:45 +08:00 |
|
yuweiqi
|
db4a685ccf
|
[FIX]影像上传-请求上传接口错误情况，增加校验、抛出错误并提示
|
2020-04-21 10:11:38 +08:00 |
|
tian.guangyuan
|
0b18daab3d
|
【new】 新增 保全进度详情：受益人相情感
|
2020-04-20 16:42:33 +08:00 |
|
yuweiqi
|
3b7bd763e4
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
|
2020-04-20 16:21:08 +08:00 |
|
yuweiqi
|
fcde3c97bd
|
[FIX]卡单-回滚卡单分支合并时影响到的customer代码
|
2020-04-20 16:20:33 +08:00 |
|
yuweiqi
|
49f51174ca
|
Merge branch 'feature/GFRS-452【待确定】知识社区' into dev
|
2020-04-20 16:07:16 +08:00 |
|
yuweiqi
|
d782fa97aa
|
[FIX]知识社区-HomeProducrt页，干掉 知识社区页面跳转title
|
2020-04-20 16:06:22 +08:00 |
|
yuweiqi
|
43f89953d3
|
Merge branch 'hotfix/bug_GFRS-1053自助入司-影像信息上传页-上传图片失败，点击下一步时，前端未校验住' into dev
|
2020-04-20 15:22:30 +08:00 |
|
yuweiqi
|
c451c20c7d
|
[FIX]自助入司-影像上传-增加上传图片失败提示
|
2020-04-20 15:21:24 +08:00 |
|
yuweiqi
|
f2e0580f2f
|
[FIX]自助入司-影像上传-增加上传图片失败提示、校验
|
2020-04-20 15:15:09 +08:00 |
|
tian.guangyuan
|
e18aee0066
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
# Conflicts:
# src/router/ebiz/index.js
|
2020-04-20 14:36:33 +08:00 |
|
tian.guangyuan
|
dba77db331
|
【fix】 修复处理冲突时，引起的项目无法正常启动。
|
2020-04-20 14:33:45 +08:00 |
|
tian.guangyuan
|
ab4959b0de
|
Merge branch 'dev_cardList' into feature/GFRS-247【待确定】卡单产品投保
# Conflicts:
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/views/app/Home.vue
# src/views/ebiz/sale/InsuredInfo.vue
|
2020-04-20 14:29:27 +08:00 |
|
tian.guangyuan
|
be6e381513
|
[new] 完成投保进度查询，详情（联系方式变更）
[fix] 完善投保进度列表
|
2020-04-20 14:18:32 +08:00 |
|
tian.guangyuan
|
78365d4b5d
|
[fix] 临时保存
|
2020-04-17 17:44:34 +08:00 |
|
tian.guangyuan
|
c4cca32dee
|
Merge branch 'feature/GFRS-1019【0415】签收回执人脸识别修改为短信验证码-tgy' into dev
|
2020-04-17 16:32:58 +08:00 |
|
tian.guangyuan
|
b5e25e3ff7
|
【fix】 修改微信中飞签的逻辑
|
2020-04-17 16:32:38 +08:00 |
|
tian.guangyuan
|
487a65ccb6
|
Merge branch 'feature/GFRS-1019【0415】签收回执人脸识别修改为短信验证码-tgy' into dev
|
2020-04-17 15:51:19 +08:00 |
|
tian.guangyuan
|
2cc35b6f3f
|
[fix] 调试 签收回执人脸识别修改为短信验证码
|
2020-04-17 15:50:48 +08:00 |
|
tian.guangyuan
|
ee1f6555bd
|
Merge branch 'feature/GFRS-1006【0423】国富人寿爱易保重大疾病保险产品开发' into dev
|
2020-04-17 14:16:13 +08:00 |
|
tian.guangyuan
|
38d3a696fd
|
【fix】 修正爱易保的riskType（产品编码）
|
2020-04-17 14:15:56 +08:00 |
|
tian.guangyuan
|
5d4f74f75b
|
Merge branch 'hotfix/GFRS【栋梁一起】电投受益人同投保人选项-其他禁用' into dev
|
2020-04-17 13:37:18 +08:00 |
|
tian.guangyuan
|
7a761c3997
|
Merge branch 'feature/GFRS-1033【0430】职业控件优化' into dev
# Conflicts:
# src/api/ebiz/sale/sale.js
|
2020-04-17 13:36:55 +08:00 |
|
tian.guangyuan
|
0e55519e67
|
Merge branch 'feature/GFRS-1019【0415】签收回执人脸识别修改为短信验证码-tgy' into dev
# Conflicts:
# src/views/ebiz/sale/SignatureOfElectronic.vue
# src/views/ebiz/serve/Detail.vue
|
2020-04-17 13:34:29 +08:00 |
|
tian.guangyuan
|
dd5e8200b5
|
Merge branch 'feature/GFRS-1006【0423】国富人寿爱易保重大疾病保险产品开发' into dev
# Conflicts:
# src/assets/js/business-common.js
# src/assets/js/utils/validator.js
# src/views/ebiz/sale/AddBeneficiaryInfo.vue
# src/views/ebiz/sale/InsuredInfo.vue
# src/views/ebiz/sale/InsuredPerson.vue
# src/views/ebiz/sale/List.vue
# src/views/ebiz/sale/SignatureConfirmation.vue
|
2020-04-17 13:33:11 +08:00 |
|
tian.guangyuan
|
066265188c
|
【fix】 在字典中配置爱易保的 riskType（产品编码）
|
2020-04-17 13:18:54 +08:00 |
|
tian.guangyuan
|
39f3201457
|
【fix】 完成 GFRS-1019【待确定】签收回执人脸识别修改为短信验证码
待发布到测试环境测试
|
2020-04-17 13:14:54 +08:00 |
|
tian.guangyuan
|
6a72af0dbe
|
【fix】 在添加指定受益人时，在投被保险人的关系为其他时，禁用 “同投保人” 选项
|
2020-04-17 09:47:11 +08:00 |
|
tian.guangyuan
|
80cd78c72f
|
Merge branch 'hotfix/GFRS【】修复建议书bug' into release/0416_2
|
2020-04-16 20:53:54 +08:00 |
|
tian.guangyuan
|
01f4337c94
|
Merge branch '0416/GFRS-765【0423】电投自核规则前端进行转译提示' into release/0416_2
# Conflicts:
# src/views/ebiz/sale/AccountInformation.vue
# src/views/ebiz/sale/AttachmentManagement.vue
# src/views/ebiz/sale/Beneficiary.vue
# src/views/ebiz/sale/InsuredInfo.vue
# src/views/ebiz/sale/InsuredPerson.vue
|
2020-04-16 20:01:36 +08:00 |
|
yuweiqi
|
975d109f1d
|
Merge branch 'feature/GFRS-597【电投页面优化】' into r/0416
# Conflicts:
# src/views/ebiz/sale/AddBeneficiaryInfo.vue
|
2020-04-16 19:53:46 +08:00 |
|
yuweiqi
|
d78b488c64
|
[FIX]【电投优化】添加指定受益人-勾选同被保人（关系为配偶）点击添加报错
|
2020-04-16 19:15:12 +08:00 |
|
tian.guangyuan
|
eb3ee61e66
|
【new】 临时存储
|
2020-04-16 19:06:03 +08:00 |
|
yuweiqi
|
caa15d29c1
|
Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
# src/assets/js/business-common.js
# src/views/ebiz/sale/AddBeneficiaryInfo.vue
|
2020-04-16 17:28:45 +08:00 |
|
yuweiqi
|
5902c19eec
|
[FIX]【电投优化】添加指定受益人-勾选“同投保人”时信息带入失败bug修复
|
2020-04-16 17:19:37 +08:00 |
|