Commit Graph

6308 Commits

Author SHA1 Message Date
yuweiqi
6734f8509d [FIX]自助入司-调试 2020-02-16 15:58:09 +08:00
yuweiqi
14db925967 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 15:44:13 +08:00
yuweiqi
892ce10c7f [FIX]自助入司-打log调试 2020-02-16 15:43:45 +08:00
yuweiqi
4bd7f138c4 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 15:16:27 +08:00
yuweiqi
2a678684c3 [FIX]入司审批(整体调整:接口联调+页面按钮调整) 2020-02-16 15:15:23 +08:00
yuweiqi
23e6f38d90 Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-16 11:29:54 +08:00
yuweiqi
27790c4c46 [FIX]自助入司-打log调试 2020-02-16 11:27:56 +08:00
lihaoda
fa3073fbb8 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-15 20:03:26 +08:00
lihaoda
0da146bcf0 Merge branch '新增保险' into dev 2020-02-15 20:03:03 +08:00
lihaoda
3d426bf55c fix 2020-02-15 20:02:39 +08:00
yuweiqi
b5bd17160a Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-15 18:29:14 +08:00
yuweiqi
bdc0b793d2 [FIX]自助入司-新增人员-身份证号获取 2020-02-15 18:28:28 +08:00
yuweiqi
e44698fb7f Merge branch 'feature/GFRS-221_入司审批' into dev
# Conflicts:
#	src/store/index.js
#	src/views/app/Home.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/share/ShareInfo.vue
2020-02-15 17:49:45 +08:00
yuweiqi
e6b0f9e05c [FIX]自助入司优化-如果学历为大专以下,可以不填写所学专业;如学历为中学及以下学历,直接阻断入司并提醒学历不符合入司条件 2020-02-15 17:28:57 +08:00
yuweiqi
57a7b6bff3 Merge branch 'hotfix/bug_保费试算-保额份数变化传值修复' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-02-15 16:36:46 +08:00
yuweiqi
371b1e4534 [FIX]保费试算-保额份数mult字段传给后台数值错误bug修复 2020-02-15 16:28:49 +08:00
yuweiqi
3708165324 [FIX]入司审批-审批结果提交页-样式微调 2020-02-15 14:06:07 +08:00
yuweiqi
caffb622e7 [FIX]自助入司优化-职称、邮箱为非必填项 2020-02-15 14:04:34 +08:00
yuweiqi
f2f92d0751 [FIX]入司审批-审批列表样式微调 2020-02-15 14:03:21 +08:00
yuweiqi
9a80526988 [FIX]自助入司优化-新增入司人员提醒下载app引导提示语修改(手机号、证件号) 2020-02-15 14:02:24 +08:00
lihaoda
63776a196e Merge branch '新增保险' into dev 2020-02-15 00:25:45 +08:00
lihaoda
2249369fda fix 2020-02-15 00:25:26 +08:00
lihaoda
a5a8de615e Merge branch '新增保险' into dev 2020-02-14 23:54:37 +08:00
lihaoda
e451a0a79e fix 2020-02-14 23:54:21 +08:00
lihaoda
c1f1a06b99 Merge branch '新增保险' into dev 2020-02-14 23:33:52 +08:00
lihaoda
39a817ffc5 fix 2020-02-14 23:33:05 +08:00
lihaoda
b6147c4d8e Merge branch '新增保险' into dev 2020-02-14 22:56:28 +08:00
lihaoda
1053de6bb1 fix 2020-02-14 22:56:18 +08:00
lihaoda
204869b560 Merge branch '新增保险' into dev 2020-02-14 22:50:40 +08:00
lihaoda
b476704459 fix 2020-02-14 22:45:56 +08:00
lihaoda
cebb2a0689 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-14 16:41:03 +08:00
lihaoda
c33d63c2f5 Merge branch '有无社保写死赔付比例和免赔额' into dev 2020-02-14 16:40:44 +08:00
lihaoda
c98bf2e253 fix 2020-02-14 16:40:08 +08:00
yuweiqi
d7a5bd8261 [NEW]入司审批模块新增:增员审批信息页、审批基本信息页、审批提交成功页、提交成功图片 2020-02-13 21:17:49 +08:00
ÁÖ־ΰ
c6736b4032 还原ip 2020-02-13 18:34:00 +08:00
ÁÖ־ΰ
7b8d811801 重新生成ip 2020-02-13 18:30:45 +08:00
ÁÖ־ΰ
a1704251b6 还原ip 2020-02-13 18:22:55 +08:00
ÁÖ־ΰ
834acd5670 修改ip 2020-02-13 18:13:03 +08:00
lihaoda
283854f0b0 Merge branch 'hotfix/bug_nbs' into dev 2020-02-13 15:42:19 +08:00
lihaoda
59aa8eed8e fix 2020-02-13 15:36:16 +08:00
lihaoda
88f863785b Merge branch 'hoxfix/bug_支付页面信息展示错误588' into dev 2020-02-13 15:33:16 +08:00
lihaoda
087dcfbb3f fix 2020-02-13 15:32:51 +08:00
lihaoda
be22d283c8 Merge branch '有无社保写死赔付比例和免赔额' into dev 2020-02-13 15:14:23 +08:00
lihaoda
69a605db7a work 2020-02-13 15:14:06 +08:00
lihaoda
3fb785bbdd Merge branch '有无社保写死赔付比例和免赔额' into dev 2020-02-13 12:33:19 +08:00
lihaoda
26af751c95 work 2020-02-13 12:31:08 +08:00
lihaoda
64fcdaf5b6 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-02-12 09:09:49 +08:00
yuweiqi
733d18db9d Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into dev
# Conflicts:
#	src/views/ebiz/proposal/Exhibition.vue
2020-02-12 00:30:32 +08:00
yuweiqi
2196c430da Merge branch 'feature/GFRS-502_【0206】国富人寿富娃娃两全保险(万能型)' into release/【0210】 2020-02-12 00:01:01 +08:00
yuweiqi
37b2bb972a [FIX]建议书-利益演示页面-保险期间显示bug修复 2020-02-12 00:00:36 +08:00