hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-17 23:16:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
6,420 Commits 229 Branches 17 Tags
1cacdf0dd24fb65ebb3400bcccd08a7ded5cd0f8
Commit Graph

6308 Commits

Author SHA1 Message Date
wangmingzhe
e944637957 Merge branch 'release/1226' of http://112.124.100.131/GFRS/ebiz-h5 into release/1226 2019-12-26 14:40:26 +08:00
wangmingzhe
ba3fbb47d8 [FIX] 添加产品列表页Loading 2019-12-26 14:40:05 +08:00
zhouna
def9f1bced Merge branch 'dev_1220' into release/1226 2019-12-26 14:22:36 +08:00
zhouna
18324ae038 Merge branch 'dev_1220' into dev 2019-12-26 14:16:53 +08:00
zhouna
0a189da744 Merge branch 'zhouna' into dev_1220 2019-12-26 14:16:11 +08:00
zhouna
55d777939b [FIX]换卡流程缓存问题优化 2019-12-26 14:15:47 +08:00
wangmingzhe
d316e92948 Merge branch 'release/1226' into dev 2019-12-26 14:03:25 +08:00
wangmingzhe
c5961d285a [FIX] 修改建议书产品选择时页面的跳转问题 2019-12-26 14:03:12 +08:00
nimengmeng_1990
5a75734fef [NEW] 新增详情信息接口联调及支付信息保存接口 2019-12-26 13:57:01 +08:00
wangmingzhe
51d0d03d0e Merge branch 'release/1226' into dev 
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
 2019-12-26 13:34:16 +08:00
wangmingzhe
0fbf38ecef [FIX] 修改建议书展示第二款产品保费及年限显示错误问题，修改两款产品组合不能转投保问题，修改添加产品按钮显示隐藏问题 2019-12-26 13:30:02 +08:00
皮伟
77add6c8b2 Merge branch 'release/1226' of http://112.124.100.131/GFRS/ebiz-h5 into release/1226 2019-12-26 12:14:26 +08:00
皮伟
bc292d5d4c 【IMP】更改编辑进入问题 2019-12-26 12:13:52 +08:00
zhouna
b4e8082729 Merge branch 'dev_1220' into release/1226 2019-12-26 11:03:09 +08:00
zhouna
87b95db41f Merge branch 'dev_1220' into dev 2019-12-26 11:01:15 +08:00
zhouna
a5cae94777 Merge branch 'zhouna' into dev_1220 2019-12-26 11:00:26 +08:00
zhouna
bb7c38c448 [FIX]换卡支付状态修改 2019-12-26 10:59:54 +08:00
zhouna
139cfabe34 Merge branch 'dev_1220' into release/1226 2019-12-26 10:47:34 +08:00
zhouna
26b09eb42c Merge branch 'dev_1220' into dev 2019-12-26 10:41:56 +08:00
zhouna
c767902932 Merge branch 'zhouna' into dev_1220 2019-12-26 10:41:12 +08:00
zhouna
a0cbaef40e [FIX]健康告知与列表页修改 2019-12-26 10:40:39 +08:00
zhouna
624a8196bb Merge branch 'dev_1220' into dev 2019-12-25 16:44:34 +08:00
zhouna
89c35e3c11 Merge branch 'dev_1220' into release/1226 2019-12-25 16:39:56 +08:00
zhouna
a4f867e1d4 Merge branch 'zhouna' into dev_1220 2019-12-25 16:38:32 +08:00
zhouna
a17b9872e6 [FIX]健康告知2a选项问题修改 2019-12-25 16:37:00 +08:00
wangmingzhe
36dd0636fa Merge branch 'hotfix_Electric' into release/1226 
# Conflicts:
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
 2019-12-25 14:02:07 +08:00
皮伟
5eade15927 Merge branch 'dev_1220' into release/1226 
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
#	src/views/ebiz/sale/AccountInformation.vue
#	src/views/ebiz/sale/SignatureConfirmation.vue
 2019-12-25 13:55:11 +08:00
zhouna
06f9f7789d []FIX]代码冲突问题修改 2019-12-25 13:54:45 +08:00
皮伟
bfdd0006d8 Merge branch 'dev_1220' into dev 2019-12-25 13:37:55 +08:00
皮伟
d350075b64 Merge branch 'dev_1220' into dev_1220_pw 2019-12-25 13:35:29 +08:00
皮伟
5165aabff8 【IMP】删除注释代码 2019-12-25 13:35:03 +08:00
wangmingzhe
306c6cee74 Merge branch 'hotfix_Electric' into dev 2019-12-25 12:07:35 +08:00
wangmingzhe
0c342454dc [FIX] 修改安卓页面返回问题 2019-12-25 12:07:24 +08:00
wangmingzhe
51f1a45142 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2019-12-25 11:56:45 +08:00
wangmingzhe
08bc67a20e Merge branch 'hotfix_Electric' into dev 2019-12-25 11:55:17 +08:00
wangmingzhe
1d1a1f1c77 测试刷新功能 2019-12-25 11:55:06 +08:00
zhouna
b85da1960c Merge branch 'dev_1220' into dev 2019-12-25 11:48:44 +08:00
zhouna
a2252c14a0 Merge branch 'zhouna' into dev_1220 2019-12-25 11:47:42 +08:00
zhouna
3254de7836 [FIX]健康告知与换卡失败状态修改 2019-12-25 11:46:57 +08:00
wangmingzhe
102214dca8 Merge branch 'hotfix_Electric' into dev 2019-12-25 10:34:13 +08:00
wangmingzhe
9d52c98503 [FIX] 修复删除同投保人标识 2019-12-25 10:34:03 +08:00
wangmingzhe
5561140740 Merge branch 'hotfix_Electric' into dev 2019-12-25 10:09:39 +08:00
wangmingzhe
928eccec68 [FIX] 修复返回产品列表删除同投保人标识，与被保人关系选择框可输入问题 2019-12-25 10:09:28 +08:00
wangmingzhe
0c927edd49 Merge branch 'hotfix_Electric' into dev 2019-12-25 09:43:13 +08:00
wangmingzhe
995dc58563 [FIX] 修复指定受益人信息页面刷新问题，删除受益人后同投保人按钮置灰问题 2019-12-25 09:43:02 +08:00
wangmingzhe
361243ad93 Merge branch 'hotfix_Electric' into dev 2019-12-24 20:21:48 +08:00
wangmingzhe
957feedcd8 [FIX] 修复删除同投保人标记问题 2019-12-24 20:21:40 +08:00
wangmingzhe
05c87caae7 Merge branch 'hotfix_Electric' into dev 2019-12-24 20:09:12 +08:00
wangmingzhe
35e5893918 [FIX] 返回！！！ 2019-12-24 20:09:05 +08:00
wangmingzhe
560b3a0042 Merge branch 'hotfix_Electric' into dev 2019-12-24 19:53:10 +08:00