Commit Graph

1612 Commits

Author SHA1 Message Date
yuweiqi
658cbfa69c Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-13 22:19:17 +08:00
yuweiqi
179ba2f33a [FIX]电投优化-列表页返回首页调试 2020-03-13 22:18:55 +08:00
yuweiqi
6f7986fe1f Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-13 21:55:02 +08:00
yuweiqi
340dc87f4d [FIX]电投优化-拦截原生事件失效调试 2020-03-13 21:54:30 +08:00
yuweiqi
85cc79f7bd Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/views/ebiz/common/SelectedProduct.vue
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
#	src/views/ebiz/sale/InsuredInfo.vue
#	src/views/ebiz/sale/InsuredPerson.vue
2020-03-13 21:15:41 +08:00
yuweiqi
a578f617cf [FIX]电投优化-受益人页、告知信息页-左上角按钮改为×,点击后直接返回列表页;页面跳转条件限制 2020-03-13 20:56:19 +08:00
yuweiqi
a305279f63 [FIX]电投优化-投保人、被保人、产品页-左上角按钮改为×,点击后直接返回列表页; 2020-03-13 20:42:24 +08:00
yuweiqi
55c92492ae [FIX]电投优化-从导航栏跳转的页面禁止右滑 2020-03-13 20:35:45 +08:00
yuweiqi
d315c700f4 [FIX]电投优化-优化后localStorage中可能不存在 relationToAppnt和insuredDetail,增加指定受益人页面用到的地方改为从其他地方取了 2020-03-13 20:34:25 +08:00
阳华祥
3feaaea123 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into dev 2020-03-13 15:56:07 +08:00
阳华祥
69ec3cc22a GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1 保费试算被保人职业以及职业编码添加 --提交人:阳华祥 2020-03-13 15:54:41 +08:00
yuweiqi
334e642b3c Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-13 15:29:05 +08:00
yuweiqi
39f68e502d [FIX]电投优化-手机端页面跳转问题修复 2020-03-13 15:28:21 +08:00
yuweiqi
3252784d66 Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-13 15:24:30 +08:00
yuweiqi
9b1b5a6542 [FIX]电投优化-打log调试 2020-03-13 15:23:50 +08:00
yuweiqi
29cd78aed8 Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/views/ebiz/sale/SignatureConfirmation.vue
2020-03-13 15:08:31 +08:00
yuweiqi
38ce4ec37a [FIX]电投优化-页面跳转 2020-03-13 15:03:11 +08:00
yuweiqi
9ebfe773ab Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-03-13 14:51:59 +08:00
yuweiqi
49fcfb7198 [FIX]电投优化调试 2020-03-13 14:48:08 +08:00
yuweiqi
bbb3804f5f Merge branch 'feature/GFRS-597【电投页面优化】' into dev
# Conflicts:
#	src/views/ebiz/common/SelectedProduct.vue
#	src/views/ebiz/sale/NotifyingMessage.vue
2020-03-13 14:22:32 +08:00
yuweiqi
e16fd9dbe8 [FIX]电投优化-页面跳转初始页面查询保单信息 2020-03-13 14:11:38 +08:00
阳华祥
6fd4d04b3e Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into dev 2020-03-13 13:41:42 +08:00
阳华祥
d4709a1329 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1 保费试算责任编码修改 --提交人:阳华祥 2020-03-13 13:41:00 +08:00
阳华祥
376a12fcc6 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1' into dev 2020-03-13 13:17:05 +08:00
阳华祥
2fb0da3cd7 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1 保费试算修改 --提交人:阳华祥 2020-03-13 13:12:10 +08:00
阳华祥
0343aeb2a4 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1 保费计算险种提示语修改、签名页特别提示添加 --提交人:阳华祥 2020-03-13 10:18:11 +08:00
阳华祥
d8b24dffb8 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1 被保人修改为被保险人 --提交人:阳华祥 2020-03-13 10:09:48 +08:00
阳华祥
bfebbfb1fa GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)_1 投被保人同一人告知页面显示处理 --提交人:阳华祥 2020-03-13 10:04:11 +08:00
yuweiqi
74286d0404 Merge branch 'nbs' into dev 2020-03-12 18:04:51 +08:00
yuweiqi
944ae80f40 [FIX]nbs-解决合并代码问题 2020-03-12 18:03:02 +08:00
yuweiqi
4c67ae7fa9 [FIX]电投优化 2020-03-12 17:50:47 +08:00
阳华祥
cf5f510660 Merge branch 'feature/GFRS-451【0312】电投添加双录提示' into release/0312 2020-03-12 15:14:37 +08:00
阳华祥
6f80fb72a1 Merge branch 'feature/GFRS-653【待确定】三月三活动' into release/0312 2020-03-12 15:13:08 +08:00
阳华祥
fc5b2df10a GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版) 分支后退处理 --提交人:阳华祥 2020-03-12 15:08:34 +08:00
yuweiqi
9ca88a524c Merge branch 'feature/GFRS-688_【国富人寿附加豁免保险费重大疾病保险】' into release/0312 2020-03-12 14:47:20 +08:00
yuweiqi
1c5b41069b [IMP]电投优化-产品选择页-新增顶部导航栏 2020-03-12 14:45:51 +08:00
yuweiqi
51f00f189b [FIX]电投优化-投保人、被保人信息页面增加salePageFlag字段(localStorage.salePageFlag同) 2020-03-12 14:44:25 +08:00
yuweiqi
90dfa87c30 [FIX]电投优化-电投顶部导航栏组件优化 2020-03-12 14:42:09 +08:00
yuweiqi
7d4e121223 [FIX]business-common,js—投保人信息localStorage.saleInsuredInfo储存字段增加[有无社保、职业名称、职业编码、婚姻状况] 2020-03-12 14:40:50 +08:00
阳华祥
f7f41a37f7 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-03-11 17:52:38 +08:00
阳华祥
cd350a14e3 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版) 责任校验处理 --提交人:阳华祥 2020-03-11 17:35:31 +08:00
阳华祥
28df6cec0a GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版) 责任校验处理 --提交人:阳华祥 2020-03-11 17:25:10 +08:00
阳华祥
f6f458d968 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版) 责任校验处理--提交人:阳华祥 2020-03-11 17:13:10 +08:00
阳华祥
21f7d1d298 Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)' into dev 2020-03-11 15:47:55 +08:00
阳华祥
112aed7a6d GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版) 投被同一人健康告知显示处理,以及被保人调整为被保险人 --提交人:阳华祥 2020-03-11 15:46:37 +08:00
阳华祥
1dd7330dbb Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)' into dev 2020-03-11 15:09:19 +08:00
阳华祥
17f6fbe515 GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版) 投被同一人健康告知显示处理 --提交人:阳华祥 2020-03-11 15:08:48 +08:00
阳华祥
c295a640ad GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版) 险种保额保费提示语处理 --提交人:阳华祥 2020-03-11 15:00:25 +08:00
yuweiqi
ba0c4f5140 [FIX]简化导航条组件代码,电投相关页面插入导航条 2020-03-11 12:41:50 +08:00
阳华祥
0b5d217ebb Merge branch 'feature/GFRS-729【0326】国富人寿国富民安重大疾病保险(2020版)' into dev 2020-03-11 10:00:22 +08:00