Commit Graph

7467 Commits

Author SHA1 Message Date
wangmingzhe
6ee36771af Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev 2020-04-22 16:57:16 +08:00
wangmingzhe
06aa537325 [NEW] 隐藏投保支付页面微信支付选项 2020-04-22 16:56:56 +08:00
tian.guangyuan
41336fc1d5 Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev 2020-04-22 16:00:23 +08:00
tian.guangyuan
570fb92457 【fix】 修复卡单pdf查看时的bug 2020-04-22 16:00:04 +08:00
tian.guangyuan
e2ce03d07e Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev 2020-04-22 15:56:56 +08:00
tian.guangyuan
25a12d966c [fix] 添加 卡单产品的pdf 2020-04-22 15:56:40 +08:00
tian.guangyuan
9cdcb2366f Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev 2020-04-22 15:24:43 +08:00
tian.guangyuan
45f3a541e1 [fix] 完善卡单产品投保 2020-04-22 15:23:33 +08:00
yuweiqi
5dcb36eff6 Merge branch 'feature/GFRS-1033【0430】职业控件优化' into release/0422 2020-04-22 14:53:23 +08:00
tian.guangyuan
95600451fb 【fix】 修改卡单支付结果页面 2020-04-22 13:59:40 +08:00
yuweiqi
cf3af6bd8b Merge branch 'hotfix/【跟爱易保一起上】bug_GFRS-1053影像信息上传-上传图片接口请求错误时,前端未校验住' into release/0422 2020-04-22 13:43:27 +08:00
yuweiqi
5bfdebd135 Merge branch 'feature/GFRS-1006【0423】国富人寿爱易保重大疾病保险产品开发' into release/0422 2020-04-22 13:42:59 +08:00
tian.guangyuan
5f6b0c6b3c 【fix】 完善填写投保人信息页面 2020-04-22 13:15:40 +08:00
yuweiqi
259773bd7f Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-04-22 11:39:54 +08:00
yuweiqi
bf9511cef5 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/config/urlMap.js
#	src/router/ebiz/index.js
2020-04-22 11:36:35 +08:00
wangmingzhe
ba64616909 Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev 2020-04-22 11:28:01 +08:00
wangmingzhe
12119e6d56 [NEW] 修改投保列表点击去支付时,储存投保人证件类型 2020-04-22 11:27:42 +08:00
yuweiqi
83dc14803b [NEW]【续期管理】续期列表、续期详情、短信模板 2020-04-22 11:24:03 +08:00
yuweiqi
b505086522 [NEW]【续期管理】新增图片资源 2020-04-22 11:23:06 +08:00
yuweiqi
ab68e9ae02 [NEW]【续期管理】路由、api、mock设置 2020-04-22 11:22:28 +08:00
wangmingzhe
062dd0abe7 Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev 2020-04-22 10:58:29 +08:00
wangmingzhe
28aeeaf2ef [NEW] 投保支付页微信支付添加证件类型校验 2020-04-22 10:57:20 +08:00
yuweiqi
cde9fed319 Merge branch 'hotfix/bug_GFRS-1053影像信息上传-上传图片接口请求错误时,前端未校验住' into dev 2020-04-22 09:37:06 +08:00
yuweiqi
22d9c1d24f [FIX]影像上传-请求上传接口错误情况,抛出错误并提示,提示语修改 2020-04-22 09:36:16 +08:00
tian.guangyuan
e7a27da4e8 Merge branch 'feature/GFRS-834【0402】国富人寿国富栋梁定期寿险' into release/0421
# Conflicts:
#	src/views/ebiz/sale/SignatureConfirmation.vue
2020-04-21 19:54:22 +08:00
tian.guangyuan
2f4f1771a1 Merge branch 'feature/GFRS-834【0402】国富人寿国富栋梁定期寿险' into dev
# Conflicts:
#	src/views/ebiz/sale/SignatureConfirmation.vue
2020-04-21 19:18:31 +08:00
tian.guangyuan
549c41540c [fix] 对签名个确认页面的配置进行了升级 2020-04-21 19:17:00 +08:00
tian.guangyuan
5395a69536 [fix] 卡单开发, 临时保存 2020-04-21 19:01:05 +08:00
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
b36bbb92c8 Merge branch 'hotfix/GFRS【栋梁一起】电投受益人同投保人选项-其他禁用' into dev 2020-04-21 13:13:10 +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