Commit Graph

6420 Commits

Author SHA1 Message Date
mengxiaolong
10866a7ad8 Merge branch 'feature/国富之星' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/cacheUtils.js
#	src/assets/js/utils/cryptoJsUtil.js
#	src/config/index.js
#	src/main.js
2021-01-12 14:25:44 +08:00
mengxiaolong
172b4d0063 国富之星 2021-01-12 14:22:02 +08:00
mengxiaolong
12b8d63eff Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-11 17:08:51 +08:00
mengxiaolong
daf3d07458 培训系统跳转修改 2021-01-11 17:08:40 +08:00
mengxiaolong
7bf701e860 Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-11 11:41:08 +08:00
mengxiaolong
1278e5b1c4 增加延时 2021-01-11 11:39:51 +08:00
mengxiaolong
ff3082aa3b Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-11 11:28:54 +08:00
mengxiaolong
7458102ee4 函数调用时机修改 2021-01-11 11:28:41 +08:00
yang.huaxiang
0e277b65e2 Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-11 11:21:38 +08:00
yang.huaxiang
1340f9ea41 培训系统优化: 对接中转页面代码调整 --提交人:阳华祥 2021-01-11 11:21:06 +08:00
yang.huaxiang
f792e19351 Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-11 11:02:50 +08:00
yang.huaxiang
7da8381661 培训系统优化: 对接中转页面代码调整 --提交人:阳华祥 2021-01-11 11:02:16 +08:00
yang.huaxiang
5152e1aa5e Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-11 10:50:24 +08:00
yang.huaxiang
a82a955657 培训系统优化: 对接中转页面代码调整 --提交人:阳华祥 2021-01-11 10:47:56 +08:00
mengxiaolong
4fe50e5197 Merge branch 'feature/个险业绩排行优化' into dev 2021-01-08 16:28:16 +08:00
mengxiaolong
1724dcec26 个险业绩排行添加合计字段 2021-01-08 16:27:52 +08:00
yang.huaxiang
0cae619b67 Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-08 15:24:10 +08:00
yang.huaxiang
82575835fe 培训系统优化: 对接中转页面代码调整 --提交人:阳华祥 2021-01-08 15:22:32 +08:00
yang.huaxiang
22ce07205d Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-08 13:42:44 +08:00
yang.huaxiang
8e409c099b 培训系统优化: 对接中转页面代码调整 --提交人:阳华祥 2021-01-08 13:41:31 +08:00
yang.huaxiang
1ae8103782 Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-07 13:54:04 +08:00
yang.huaxiang
6c3a6f518e 培训系统优化: 对接中转页面代码调整 --提交人:阳华祥 2021-01-07 13:51:46 +08:00
yang.huaxiang
64aa0b94e9 Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-07 13:29:32 +08:00
yang.huaxiang
2634c4b8a7 培训系统优化: 对接中转页面代码调整 --提交人:阳华祥 2021-01-07 13:26:44 +08:00
mengxiaolong
e01e856695 Merge branch 'feature/婚姻状况类型修改' into release/20210105 2021-01-07 10:27:41 +08:00
mengxiaolong
07d6f4ddb4 打开人脸识别 2021-01-07 09:57:17 +08:00
mengxiaolong
43700d035c Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev
# Conflicts:
#	src/router/ebiz/index.js
2021-01-06 18:24:51 +08:00
mengxiaolong
755121ec9b 增加路由 2021-01-06 18:23:37 +08:00
mengxiaolong
db4abed07f Merge branch 'feature/GFRS-2097【待确定】培训系统优化' into dev 2021-01-06 18:19:15 +08:00
mengxiaolong
5ade8b26f5 调用客户端接口 2021-01-06 18:18:23 +08:00
mengxiaolong
af0312768f Merge branch 'feature/婚姻状况类型修改' into dev 2021-01-06 16:02:18 +08:00
mengxiaolong
61abe46c63 婚姻状况类型修改 2021-01-06 16:00:42 +08:00
yang.huaxiang
a3c782b10b Merge branch 'feature/GFRS-2116【待确定】国富人寿附加住院医疗保险' into release/20210105 2021-01-06 11:48:49 +08:00
yang.huaxiang
062ced240c Merge branch 'feature/GFRS-1989【待确定】客户核验流程优化' into release/20210105
# Conflicts:
#	package.json
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/cacheUtils.js
#	src/assets/js/utils/cryptoJsUtil.js
#	src/assets/js/utils/needCacheKey.js
#	src/config/index.js
#	src/main.js
2021-01-06 11:46:18 +08:00
mengxiaolong
6d5e747f44 Merge branch 'hotfix/GFRS-2151-重新登录继续投保流程报错问题' into release/20210105 2021-01-06 11:27:00 +08:00
mengxiaolong
e041c60c27 关闭测试人脸 2021-01-06 10:55:05 +08:00
mengxiaolong
11ebb8494f 打开人脸识别 2021-01-06 10:33:35 +08:00
yang.huaxiang
1ff727e538 Merge branch 'feature/理赔添加开户行省市区' into dev
# Conflicts:
#	src/views/ebiz/claims/ApplyInfo.vue
2021-01-06 10:01:27 +08:00
mengxiaolong
3328c4da64 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into release/20210105 2021-01-05 15:36:10 +08:00
mengxiaolong
447f7b8de1 Merge branch 'hotfix/GFRS-2151-重新登录继续投保流程报错问题' into dev 2021-01-05 13:53:01 +08:00
mengxiaolong
b6faf9767a 主险产品编码取值修改 2021-01-05 13:52:38 +08:00
mengxiaolong
0495199f60 Merge branch 'feature/卡单投保隐藏下一步入口' into dev 2021-01-05 11:16:51 +08:00
mengxiaolong
ebca8742a5 短期综合交通工具意外伤害险隐藏下一步投保按钮 2021-01-05 11:16:32 +08:00
mengxiaolong
3645206e9a Merge branch 'hotfix/GFRS-2151-重新登录继续投保流程报错问题' into dev 2021-01-05 10:46:30 +08:00
mengxiaolong
813b0fc7dd 重新登录继续投保流程报错问题修改 2021-01-05 10:46:01 +08:00
yang.huaxiang
67a20c4e80 培训系统优化: 首页底部业绩展示接口调用调整 --提交人:阳华祥 2021-01-04 15:52:00 +08:00
yang.huaxiang
266533ff4d 培训系统优化: 对接中转页面代码初始版本提交 --提交人:阳华祥 2021-01-04 15:49:48 +08:00
mengxiaolong
9224c17cf4 Merge branch 'feature/优化姓名输入组件' into dev 2021-01-04 09:28:47 +08:00
mengxiaolong
2d10e74405 优化姓名输入组件 2021-01-04 09:28:28 +08:00
mengxiaolong
72b2698f9d Merge branch 'feature/优化工作单位输入' into dev 2020-12-31 09:21:43 +08:00