Commit Graph

6308 Commits

Author SHA1 Message Date
mengxiaolong
46a358a82e Merge branch 'feature/nbs统计增加时间区间' into release/0917 2020-09-17 14:20:38 +08:00
mengxiaolong
8097ba620c Merge branch 'feature/增加马来西亚' into dev 2020-09-17 14:16:53 +08:00
mengxiaolong
3e1007a10a 增加国籍 2020-09-17 14:16:02 +08:00
mengxiaolong
a98e0d78f6 Merge branch 'feature/电投自动撤单添加验证码校验' into dev 2020-09-17 11:31:00 +08:00
mengxiaolong
0aae973fc3 撤单优化成功提示 2020-09-17 11:30:32 +08:00
mengxiaolong
0d6cc52c70 Merge branch 'feature/电投自动撤单添加验证码校验' into dev
# Conflicts:
#	src/views/ebiz/sale/List.vue
2020-09-17 09:06:38 +08:00
mengxiaolong
2c41a87ccc 撤单接口增加验证码参数 2020-09-17 09:04:59 +08:00
mengxiaolong
97bcb6b022 撤单增加验证码校验 2020-09-16 18:31:55 +08:00
mengxiaolong
83d60b6537 Merge branch 'feature/增加马来西亚' into dev
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
2020-09-16 18:27:19 +08:00
mengxiaolong
d045c8dd54 增加马来西亚 2020-09-16 18:26:28 +08:00
mengxiaolong
bee156ad6b Merge branch 'feature/nbs统计增加时间区间' into dev
# Conflicts:
#	src/components/ebiz/nbs/InternalList.vue
#	src/views/ebiz/nbs/InternalService.vue
2020-09-16 13:43:46 +08:00
mengxiaolong
ec62f4c8d6 跳转下级页面传递路径修改 2020-09-16 13:41:08 +08:00
mengxiaolong
34420cdca0 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-16 13:24:58 +08:00
mengxiaolong
52ff285e38 接收短信手机号码修改 2020-09-16 13:24:34 +08:00
mengxiaolong
284e8834ac Merge branch 'feature/保单列表回显保单号修改' into dev 2020-09-16 10:32:47 +08:00
mengxiaolong
d10a5faca6 保单列表回显保单号修改 2020-09-16 10:32:19 +08:00
mengxiaolong
bbac1b437d 修改样式,添加注释 2020-09-16 09:25:35 +08:00
mengxiaolong
a85140aa55 Merge branch 'hotfix/豁免险保额计算保费修改' into dev 2020-09-15 18:32:00 +08:00
mengxiaolong
80d118284d 取值字段修改 2020-09-15 18:31:40 +08:00
mengxiaolong
c024173d3a Merge branch 'hotfix/豁免险保额计算保费修改' into dev 2020-09-15 18:02:44 +08:00
mengxiaolong
ce49396704 豁免险保费计算入库不正确修改 2020-09-15 18:02:32 +08:00
mengxiaolong
234a120de8 nbs只能统计查询增加时间区间 2020-09-15 17:50:37 +08:00
mengxiaolong
a16a04837f Merge branch 'hotfix/nbs统计添加头部背景色' into dev 2020-09-15 14:33:54 +08:00
mengxiaolong
b081afa566 nbs智能分析统计头部固定栏背景色修改 2020-09-15 14:33:36 +08:00
mengxiaolong
bcaeb17f90 Merge branch 'hotfix/GFRS-1918国富人寿附加一年期定期寿险' into dev
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
2020-09-15 09:27:39 +08:00
mengxiaolong
61bd80afcd 国富人寿附加一年期定期寿险增加产品信息 2020-09-15 09:26:44 +08:00
mengxiaolong
5c2b856b77 Merge branch 'hotfix/豁免险保额计算保费修改' into dev 2020-09-14 17:36:22 +08:00
mengxiaolong
62f66e41ff 豁免险保额计算保费不正确问题修改 2020-09-14 17:36:09 +08:00
mengxiaolong
465c59d033 删除dev多余代码 2020-09-14 10:22:08 +08:00
mengxiaolong
8ccf047684 Merge branch 'hotfix/移动展业问题件功能测试问题修改' into dev
# Conflicts:
#	.gitignore
#	src/assets/js/utils/request.js
#	src/config/urlMap.js
#	src/router/ebiz/index.js
2020-09-14 10:14:29 +08:00
mengxiaolong
a9c19a1ee8 添加log打印 2020-09-14 10:06:10 +08:00
mengxiaolong
e2f135bf47 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-14 09:23:29 +08:00
mengxiaolong
9e539a1e50 删除多余字 2020-09-14 09:23:07 +08:00
mengxiaolong
055abd128d Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-11 18:20:46 +08:00
mengxiaolong
96cc28598b 投被同人签名修改 2020-09-11 18:20:28 +08:00
mengxiaolong
ed1eb830fb Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-11 17:57:56 +08:00
mengxiaolong
f7fdfb9ad1 日期显示问题 2020-09-11 17:57:33 +08:00
mengxiaolong
5e9fad3ea3 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into release/0911上线测试(贺报,续期) 2020-09-11 17:23:43 +08:00
mengxiaolong
97f5ff767b 加载完成提示 2020-09-11 17:23:09 +08:00
mengxiaolong
5d0684c986 Merge branch 'feature/商品商城优化' into release/0911上线测试(贺报,续期) 2020-09-11 16:18:01 +08:00
mengxiaolong
3301ea195e Merge branch 'feature/商品商城优化' into dev 2020-09-11 15:22:06 +08:00
mengxiaolong
bd33bee0d3 修改跳转三方提示 2020-09-11 15:21:49 +08:00
mengxiaolong
c1a3fa109e Merge branch 'feature/商品商城优化' into dev 2020-09-11 15:11:14 +08:00
mengxiaolong
d1be1af950 增加loading 2020-09-11 15:11:01 +08:00
mengxiaolong
d6288d19d5 Merge branch 'feature/商品商城优化' into dev 2020-09-11 11:35:37 +08:00
mengxiaolong
49445a1d2d 使用iframe打开三方链接 2020-09-11 11:35:20 +08:00
mengxiaolong
059241f520 Merge branch 'feature/商品商城优化' into dev 2020-09-11 11:19:43 +08:00
mengxiaolong
7e58c1e916 右上角菜单不能点击问题 2020-09-11 11:19:31 +08:00
mengxiaolong
651eef8745 增加跳转第三方链接类型菜单 2020-09-11 11:14:04 +08:00
mengxiaolong
54cdc0b277 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-09-11 09:33:59 +08:00