Commit Graph

5842 Commits

Author SHA1 Message Date
mengxiaolong
85d245a2e3 Merge branch 'hotfix/【20210115】电投省市区编码变更' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/ebiz/sale/SignatureConfirmation.vue
2021-01-15 11:04:57 +08:00
mengxiaolong
f84c2f1294 省市区编码变更(只修改了电投流程) 2021-01-15 10:58:36 +08:00
mengxiaolong
5af7fe3233 Merge branch 'feature/【20210113】入司最低文化程度调整' into release/20210113 2021-01-14 15:38:15 +08:00
mengxiaolong
dd249ed702 Merge branch 'feature/【20210114】百宝箱增加用户使用手册PDF预览' into release/20210113 2021-01-14 15:37:55 +08:00
mengxiaolong
3937e261ac Merge branch 'feature/【20210114】百宝箱增加用户使用手册PDF预览' into dev 2021-01-14 15:28:51 +08:00
mengxiaolong
004c6f54be PDF地址修改 2021-01-14 15:28:31 +08:00
mengxiaolong
cb06730e70 Merge branch 'feature/【20210114】百宝箱增加用户使用手册PDF预览' into dev 2021-01-14 15:20:45 +08:00
mengxiaolong
a8a572737e 用户使用手册 2021-01-14 15:20:06 +08:00
mengxiaolong
3f6aca922c 用户使用手册 2021-01-14 15:19:35 +08:00
mengxiaolong
43b8bac30a Merge branch 'feature/GFRS-2069【待确定】白名单管理' into release/20210113-test
# Conflicts:
#	src/assets/js/utils/request.js
#	src/views/ebiz/sale/SignatureConfirmation.vue
2021-01-13 18:21:38 +08:00
mengxiaolong
c90999ab01 Merge branch 'feature/优化工作单位输入' into dev 2021-01-13 14:08:35 +08:00
mengxiaolong
e78a63e4b7 调整滚动触发时机 2021-01-13 14:08:15 +08:00
mengxiaolong
c0e4a8a987 Merge branch 'feature/优化工作单位输入' into dev 2021-01-13 13:48:36 +08:00
mengxiaolong
13007bc551 工作单位组件样式调整 2021-01-13 13:48:26 +08:00
mengxiaolong
a280b018e8 Merge branch 'feature/【20210113】入司最低文化程度调整' into dev 2021-01-13 13:33:57 +08:00
mengxiaolong
bef5df75cd 入司最低文化程度调整 2021-01-13 13:32:21 +08:00
mengxiaolong
2307f7fd05 Merge branch 'feature/优化工作单位输入' into dev 2021-01-13 11:39:55 +08:00
mengxiaolong
ef79a081c0 工作单位组件优化 2021-01-13 11:39:32 +08:00
mengxiaolong
75b575a45d Merge branch 'feature/卡单投保人证件类型修改' into dev 2021-01-13 09:31:42 +08:00
mengxiaolong
2658f03de3 卡单投保人证件类型修改 2021-01-13 09:31:31 +08:00
mengxiaolong
80bc3931a3 打开卡单投保入口 2021-01-12 18:03:47 +08:00
mengxiaolong
32562c6956 关闭人脸 2021-01-12 16:44:00 +08:00
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