Commit Graph

5842 Commits

Author SHA1 Message Date
mengxiaolong
5ce023f3c8 feature: 白名单管理
1. 自助入司白名单校验
2020-12-07 18:24:19 +08:00
mengxiaolong
242c1bfdb9 Merge branch 'feature/开门红' into dev 2020-12-07 15:06:25 +08:00
mengxiaolong
b266051f67 style: 百宝箱样式修改
1. 删除多余的border样式
2020-12-07 15:05:48 +08:00
yang.huaxiang
d2cba1eafd Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into dev 2020-12-04 19:01:19 +08:00
yang.huaxiang
c0967b5f44 Merge remote-tracking branch 'origin/feature/GFRS-2015【待确定】开门红需求-电投改造' into feature/GFRS-2015【待确定】开门红需求-电投改造 2020-12-04 18:58:35 +08:00
yang.huaxiang
068af610cc 开门红需求-电投提示:开门红弹框提示调整 --提交人:阳华祥 2020-12-04 18:56:03 +08:00
mengxiaolong
409d78382c Merge branch 'feature/开门红' into dev 2020-12-04 10:49:26 +08:00
mengxiaolong
4d940776cb feature: 开门红方案
1. 分享图片使用图片url
2. 拦截原生按钮, 关闭图片时不返回上级
2020-12-04 10:49:13 +08:00
mengxiaolong
68889220fd Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into dev 2020-12-03 18:31:30 +08:00
mengxiaolong
8cb8011d4f 开门红产品试算增加标识 2020-12-03 18:31:13 +08:00
mengxiaolong
a17b67f607 Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into release/1203 2020-12-03 18:21:28 +08:00
mengxiaolong
19e4ecf056 Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into dev
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
2020-12-03 17:49:47 +08:00
mengxiaolong
69a583286f 开门红产品试算增加标识 2020-12-03 17:48:43 +08:00
mengxiaolong
8b988da47f Merge branch 'hotfix/电投工作单位校验修改' into dev 2020-12-03 16:17:06 +08:00
mengxiaolong
e7ee8c098d 电投工作单位校验修改 2020-12-03 16:16:49 +08:00
yang.huaxiang
f8f9191f7a Merge branch 'hotfix/前端优化处理' into dev 2020-12-03 15:39:48 +08:00
mengxiaolong
5d6078c5c2 Merge branch 'feature/开门红' into dev 2020-12-03 14:24:40 +08:00
mengxiaolong
64d9a02b64 机构简称字段修改 2020-12-03 14:24:25 +08:00
mengxiaolong
2a87d710b1 Merge branch 'hotfix/贺报表格样式修改' into dev 2020-12-03 14:14:37 +08:00
mengxiaolong
7a6a7240ce 修改表格样式 2020-12-03 14:14:24 +08:00
mengxiaolong
652e4d3820 Merge branch 'hotfix/贺报表格样式修改' into dev 2020-12-03 14:10:09 +08:00
mengxiaolong
7b5f20eeae 贺报机构名称未显示问题修改 2020-12-03 14:09:50 +08:00
mengxiaolong
443ec2bf36 Merge branch 'feature/开门红' into dev 2020-12-03 13:50:10 +08:00
mengxiaolong
9c060cf3a4 机构名称简称字段修改 2020-12-03 13:49:58 +08:00
mengxiaolong
6263279bf6 Merge branch 'feature/开门红' into dev 2020-12-03 13:24:10 +08:00
mengxiaolong
3408f309e5 loading样式居中 2020-12-03 13:23:58 +08:00
yang.huaxiang
20e20b1a0f 上传文件调整:接口超时处理调整未30秒 --提交人:阳华祥 2020-12-03 13:09:44 +08:00
mengxiaolong
3e7d81805b Merge branch 'feature/开门红' into dev 2020-12-03 11:37:21 +08:00
mengxiaolong
87e7ad59f2 Merge branch 'feature/增加机构名称简称' into feature/开门红
# Conflicts:
#	src/assets/js/utils/request.js
2020-12-03 11:37:02 +08:00
mengxiaolong
eb33587e21 Merge branch 'feature/个险业绩排行优化' into dev 2020-12-03 11:05:36 +08:00
mengxiaolong
b61f08c44d 机构名称简称修改 2020-12-03 11:05:17 +08:00
mengxiaolong
29276b887e Merge branch 'feature/增加机构名称简称' into feature/个险业绩排行优化
# Conflicts:
#	src/views/ebiz/institutionalPerform/UnderOffice.vue
2020-12-03 11:03:04 +08:00
mengxiaolong
58a542b8b9 增加机构名称简称js 2020-12-03 11:00:34 +08:00
mengxiaolong
b638fc460b Merge branch 'feature/开门红' into dev 2020-12-03 09:29:32 +08:00
mengxiaolong
ed257c61ed 开门红方案分页 2020-12-03 09:29:09 +08:00
mengxiaolong
692edc499f Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev 2020-12-02 17:19:26 +08:00
mengxiaolong
7e23b93cf6 增加agentIdNo字段 2020-12-02 17:19:02 +08:00
mengxiaolong
29abd491ef Merge branch 'feature/开门红' into dev 2020-12-02 17:09:23 +08:00
mengxiaolong
11043623b5 开门红方案分页 2020-12-02 17:08:51 +08:00
mengxiaolong
504b2320ad 开门红方案分享图片 2020-12-02 16:19:11 +08:00
mengxiaolong
241e53e7c7 Merge branch 'feature/开门红' into dev 2020-12-02 16:07:50 +08:00
mengxiaolong
4253c2e7ff 生成图片base64 2020-12-02 16:07:23 +08:00
mengxiaolong
7962b9c1be Merge branch 'feature/开门红' into dev 2020-12-02 15:58:26 +08:00
mengxiaolong
346f7b4a07 开门红图片分享功能 2020-12-02 15:57:59 +08:00
mengxiaolong
4e33fe260a Merge branch 'feature/开门红' into dev 2020-12-02 14:20:39 +08:00
mengxiaolong
d0715e3c73 Merge branch 'feature/个险业绩排行优化' into dev 2020-12-02 14:20:26 +08:00
mengxiaolong
65bd7e067a 固定机构名称列 2020-12-02 14:19:43 +08:00
mengxiaolong
26ad646d17 固定机构名称列 2020-12-02 14:16:23 +08:00
mengxiaolong
b56166bd51 Merge branch 'feature/开门红' into dev 2020-12-02 14:00:25 +08:00
mengxiaolong
1ea7872bb9 固定机构名称列 2020-12-02 13:58:51 +08:00