Commit Graph

128 Commits

Author SHA1 Message Date
mengxiaolong
a3d54a4020 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into release/1106
# Conflicts:
#	src/router/ebiz/index.js
#	src/views/ebiz/sale/Detail.vue
2020-11-06 13:22:20 +08:00
mengxiaolong
d5dc2b4b5f Merge branch 'hotfix/签名bug修改' into release/1012 2020-10-12 16:09:48 +08:00
mengxiaolong
0bf49d8297 Merge branch 'feature/GFRS-1858-【人核保单支持线上支付】' into release/1012 2020-10-12 15:14:54 +08:00
mengxiaolong
9a9eb931f9 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into release/0911上线测试(贺报,续期)
# Conflicts:
#	.gitignore
#	src/assets/js/utils/request.js
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/store/index.js
#	src/views/app/Home.vue
2020-09-10 14:10:34 +08:00
mengxiaolong
8dda53db16 Merge branch 'feature/GFRS-453【】贺报功能' into release/0911上线测试(贺报,续期)
# Conflicts:
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-09-10 13:37:59 +08:00
na.guo
01bb881388 页面修改 2020-09-01 18:42:38 +08:00
na.guo
d4df11f51a 去掉多余路由 2020-09-01 11:21:40 +08:00
mengxiaolong
dd9184b4a8 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-222【0423】续期管理-续期列表 2020-09-01 10:59:13 +08:00
mengxiaolong
21bb29d65d 续期管理优化 2020-09-01 10:58:58 +08:00
na.guo
d949ccfbbf 添加页面 2020-09-01 10:53:36 +08:00
mengxiaolong
9e402c5a3b Merge branch 'feature/GFRS-1742【待确定】收入改造' into release/0827 2020-08-27 17:08:51 +08:00
mengxiaolong
51d5622437 Merge branch 'feature/【保全】' into release/0827
# Conflicts:
#	src/store/index.js
#	src/views/app/Home.vue
2020-08-26 16:33:57 +08:00
na.guo
cc1e093086 添加判断可支付接口 2020-08-14 13:26:31 +08:00
na.guo
1bd124eade pdf加载测试 2020-08-13 15:40:44 +08:00
mengxiaolong
1843b96a2a 样式,接口修改 2020-08-12 16:31:28 +08:00
mengxiaolong
4942b0f8d2 修改页面样式, 调试接口 2020-08-12 14:59:00 +08:00
阳华祥
184311e9ee Merge remote-tracking branch 'origin/feature/GFRS-1215【待确定】国富人寿福享年年年金保险' into release/0811
# Conflicts:
#	src/views/ebiz/common/MainRiskList.vue
2020-08-11 21:55:19 +08:00
阳华祥
d649ca43ee Merge remote-tracking branch 'origin/feature/GFRS-1469【0630】nbsapp' into release/0811
# Conflicts:
#	src/views/app/Home.vue
2020-08-11 13:50:40 +08:00
阳华祥
19f72d9568 Merge remote-tracking branch 'origin/feature/GFRS-1198【待确定】自助入司改造(涉及销管)' into release/0811
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/router/ebiz/agentEenter.js
#	src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/Paction.vue
#	src/views/ebiz/agentEenter/SignContract.vue
2020-08-11 13:41:33 +08:00
heweijie
397c9c7e7c Merge branch 'feature/GFRS-1623【待确定】隐私政策' into release/0807 2020-08-07 18:24:09 +08:00
mengxiaolong
f47c0b2be4 贺报页面, 增加接口 2020-08-05 17:37:45 +08:00
mengxiaolong
7a71109148 Merge branch 'feature/GFRS-232【待确定】业绩查询' into release/0803
# Conflicts:
#	src/main.js
#	src/router/ebiz/index.js
2020-08-04 15:10:59 +08:00
mengxiaolong
0bb7547e59 更新问题件内容 2020-08-04 10:56:59 +08:00
mengxiaolong
4be7d9a9cb Merge branch 'feature/GFRS-1373【待确定】理赔银行卡鉴权' into release/0803
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-08-03 11:04:58 +08:00
mengxiaolong
1d19434ccb 修改问题件api 2020-07-31 11:01:13 +08:00
mengxiaolong
99a1f313e6 添加电投问题件页面和路由 2020-07-31 10:50:49 +08:00
zhu.wenli@ebiz-digits.com
7513948ad9 机构业绩页面 2020-07-30 21:21:28 +08:00
huichao
24e7bdef96 img路径拼接 2020-07-29 13:19:12 +08:00
huichao
3a99c0b40b 日历渲染,接口调用 2020-07-25 15:23:36 +08:00
huichao
68571f0ec3 业绩查询功能 2020-07-24 14:51:57 +08:00
huichao
73e81e37fa 业绩查询页面搭建 2020-07-21 15:05:41 +08:00
yuweiqi
dc011284bd Merge branch 'master' into feature/【保全】
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/request.js
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-07-15 12:29:02 +08:00
yuweiqi
d41e451457 [NEW]【隐私政策】新增隐私政策 2020-07-06 11:11:48 +08:00
anbbukn
8de510e14f [NEW] nbs 统计及内勤 2020-06-30 20:10:58 +08:00
yuweiqi
e4b8941a90 [FIX]【福享年年】获取主险列表-建议书,请求接口地址修改 2020-06-29 16:32:27 +08:00
tian.guangyuan
9cf8f73d52 [fix] 修改 商品商城->VIP专区, 分享会获取上一次的分享时保存的账号密码 2020-06-24 14:04:26 +08:00
yuweiqi
e9bff1ad57 [FIX]【商品商城】增加接口 2020-06-17 17:02:50 +08:00
yuweiqi
f7419c4f6b [NEW]【商品商城】新增商品商城模块相关页面 2020-06-17 10:58:05 +08:00
yuweiqi
8fe0e9024c [FIX]【保全】退保相关 2020-06-09 10:14:14 +08:00
yuweiqi
40d1deb6d0 Merge branch 'feature/【保全】' of http://112.124.100.131/GFRS/ebiz-h5 into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/views/ebiz/preserve/js/data-dictionary.js
2020-06-04 21:17:28 +08:00
yuweiqi
1a88cd470f [FIX]【保全】退保、进度查询、filters 2020-06-04 21:11:46 +08:00
阳华祥
e8577e7635 Merge branch 'PC保全' into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
2020-06-04 18:01:59 +08:00
阳华祥
cab97e8fe4 保全:续期账号变更调整 --提交人:阳华祥 2020-06-04 17:59:34 +08:00
yuweiqi
f70d800586 [FIX]【保全】保全进度查询列表 2020-06-04 14:14:24 +08:00
yuweiqi
19c240d882 [FIX]【保全】分支整理 2020-06-03 09:29:14 +08:00
yuweiqi
40d9451339 [fix]【自助入司改造】新增撤销申请功能 2020-05-29 18:14:02 +08:00
tian.guangyuan
137098f7a2 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into release/0528
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-05-29 14:05:15 +08:00
tian.guangyuan
0dd45a54bd 【fix】 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into feature/【0529】银行卡鉴权-理赔银行卡鉴权
# Conflicts:
#	src/api/ebiz/sale/sale.js

开发理赔中的银行卡鉴权
2020-05-29 10:45:50 +08:00
yuweiqi
a188edca0e Merge branch 'feature/GFRS-1237【0525】国富人寿桂企保重大疾病保险' into release/0528
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/data-dictionary.js
#	src/views/ebiz/common/CalculatePremium.vue
2020-05-27 20:54:07 +08:00
tian.guangyuan
a920cebfc2 Merge branch 'feature/GFRS【】理赔_claim' into release/0526 2020-05-25 14:57:39 +08:00