Commit Graph

6308 Commits

Author SHA1 Message Date
mengxiaolong
7f2b1d09ca 增加参数获取投保人被保人信息 2020-08-04 19:06:58 +08:00
mengxiaolong
7280cb48e7 Merge branch 'hotfix/0804前端页面增加国籍' into release/0803 2020-08-04 17:00:06 +08:00
jlw
205d6079cc Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev 2020-08-04 16:45:34 +08:00
jlw
7ccda2b6c7 Merge branch 'hotfix/0804前端页面增加国籍' into dev
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
2020-08-04 16:39:50 +08:00
na.guo
0f89e26e29 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-04 16:32:03 +08:00
mengxiaolong
5342e5ffdc 删除多余逗号 2020-08-04 16:26:49 +08:00
na.guo
22d33a3ddc 机构业绩修改合并 2020-08-04 16:24:16 +08:00
mengxiaolong
570b81f759 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-04 16:23:26 +08:00
na.guo
133d2e6861 样式修改 2020-08-04 16:22:44 +08:00
mengxiaolong
5bda001a26 短信弹窗调整 2020-08-04 16:22:05 +08:00
jlw
0f3a2daa37 Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev 2020-08-04 16:02:58 +08:00
jlw
22caa3666c Merge branch 'hotfix/0804前端页面增加国籍' into dev 2020-08-04 16:02:25 +08:00
na.guo
67fdad72ff Merge branch 'feature/【机构人力排名】' of http://112.124.100.131/GFRS/ebiz-h5 into feature/【机构人力排名】 2020-08-04 15:49:57 +08:00
na.guo
3592b21d06 添加颜色变量 2020-08-04 15:46:06 +08:00
na.guo
ec16c0b8a8 机构排名修改 2020-08-04 15:45:26 +08:00
na.guo
5b963d81a9 人力排名提交 2020-08-04 15:44:26 +08:00
jlw
beafb2c35e Merge branch 'release/0803' of 112.124.100.131:GFRS/ebiz-h5 into release/0803 2020-08-04 15:27:37 +08:00
jlw
baa8e8a6ba Merge branch 'hotfix/0804前端页面增加国籍' into release/0803 2020-08-04 15:26:31 +08:00
mengxiaolong
e21171e5f4 Merge branch 'feature/GFRS-232【待确定】业绩查询' into release/0803 2020-08-04 15:24:40 +08:00
mengxiaolong
de930c3b08 修改业绩查询标题 2020-08-04 15:24:19 +08:00
jlw
53127fb871 增加哈萨克斯坦国籍 2020-08-04 15:22:57 +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
25bff4ce5f Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-04 14:50:23 +08:00
mengxiaolong
7e70d62258 测试微信分享 2020-08-04 14:50:06 +08:00
mengxiaolong
0c01a9d508 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-04 14:28:13 +08:00
mengxiaolong
fecb34f337 测试微信分享 2020-08-04 14:27:53 +08:00
mengxiaolong
dff2b38d9b Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-04 14:15:23 +08:00
mengxiaolong
58074ebea7 监听问题件列表页返回按钮 2020-08-04 14:14:54 +08:00
na.guo
e1dfd3f6d2 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-04 13:38:37 +08:00
na.guo
a226001ebe Merge remote-tracking branch 'remotes/origin/feature/【机构人力排名】' into dev 2020-08-04 13:37:38 +08:00
na.guo
e315541d29 人力排名提交 2020-08-04 13:34:59 +08:00
mengxiaolong
53c26ecfc8 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-04 13:32:42 +08:00
mengxiaolong
b337b3e90c 测试更新问题件详情 2020-08-04 13:32:23 +08:00
mengxiaolong
c9607d9395 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-04 11:14:48 +08:00
mengxiaolong
832ce7dd8c 测试签名 2020-08-04 11:14:35 +08:00
mengxiaolong
4f535efa3c Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev
# Conflicts:
#	src/views/ebiz/questions/QuestionsDetail.vue
2020-08-04 10:58:25 +08:00
mengxiaolong
0bb7547e59 更新问题件内容 2020-08-04 10:56:59 +08:00
阳华祥
438581b4e6 Merge branch 'feature/GFRS-1675【待确定】国富民鑫+鑫管家计划书关联演示' into release/0803 2020-08-04 10:32:27 +08:00
huichao
08a182ca38 Merge branch 'feature/GFRS-232【待确定】业绩查询' into dev
# Conflicts:
#	src/router/ebiz/index.js
2020-08-03 16:46:16 +08:00
huichao
21e1a8f44b 被覆盖路由添加 2020-08-03 16:40:19 +08:00
mengxiaolong
08c491686e Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-03 16:13:49 +08:00
mengxiaolong
82037a6d43 测试签名,银行卡扫描 2020-08-03 16:13:22 +08:00
jlw
53f2b7ddd0 Merge branch 'hotfix/0803业绩快报BUG修改' into dev 2020-08-03 13:42:40 +08:00
mengxiaolong
14605f23d7 Merge branch 'feature/GFRS-1377【待确定】契约、保全、理赔业务操作平台增加证件有效期校验规则' into release/0803
# Conflicts:
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
2020-08-03 11:15:14 +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
jlw
765a514a90 业绩快报BUG修改 2020-08-03 11:00:32 +08:00
mengxiaolong
a2525cd8e9 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-03 10:44:43 +08:00
mengxiaolong
fc8d92f9a4 添加路由动态参数 2020-08-03 10:44:22 +08:00
mengxiaolong
887232da08 添加跳转问题件详情页动态路由 2020-08-03 10:41:10 +08:00
mengxiaolong
a1a6eac7fc Revert "Revert "添加跳转问题件详情页动态路由""
This reverts commit 71f2b8099a.
2020-08-03 10:37:40 +08:00