mengxiaolong
|
f89ae83f8d
|
Merge branch 'feature/开门红' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-12-30 11:46:50 +08:00 |
|
mengxiaolong
|
473c7f9f84
|
开门红页面修改
1. 首页业绩/机构排名列间距调整
2. 开门红业绩排名增加合计字段
3. 开门红业绩查询接口增加loading
|
2020-12-30 11:45:05 +08:00 |
|
mengxiaolong
|
65c0c16eff
|
Merge branch 'hotfix/修改国籍编码使用字符串比较问题' into dev
# Conflicts:
# src/api/ebiz/sale/sale.js
# src/assets/js/utils/request.js
# src/router/ebiz/index.js
# src/views/ebiz/sale/List.vue
|
2020-12-16 15:58:33 +08:00 |
|
mengxiaolong
|
b3b788311b
|
Merge branch 'feature/人核保单显示撤单按钮' into release/1215
# Conflicts:
# src/views/ebiz/sale/List.vue
|
2020-12-15 10:43:06 +08:00 |
|
mengxiaolong
|
fc55ba28da
|
Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev
# Conflicts:
# src/assets/js/utils/request.js
# src/views/ebiz/agentEenter/SignContract.vue
# src/views/ebiz/sale/SignatureConfirmation.vue
|
2020-12-08 10:49:20 +08:00 |
|
mengxiaolong
|
52a13630b4
|
feature: 白名单管理
1. 增加电投/理赔白名单判断
|
2020-12-08 10:23:34 +08:00 |
|
mengxiaolong
|
a17b67f607
|
Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into release/1203
|
2020-12-03 18:21:28 +08:00 |
|
mengxiaolong
|
87cbb3c17c
|
Merge branch 'hotfix/数据报表在企业微信无法打开问题' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-11-30 14:32:05 +08:00 |
|
mengxiaolong
|
efefc05c4e
|
业绩报表企业微信无法打开问题修改
|
2020-11-30 14:31:16 +08:00 |
|
mengxiaolong
|
a36357f1bf
|
代码格式化
|
2020-11-30 14:03:55 +08:00 |
|
mengxiaolong
|
75c27e4bba
|
Merge branch 'feature/GFRS-2065【1125】惠桂保数据导入' into dev
# Conflicts:
# src/assets/js/utils/request.js
# src/router/ebiz/index.js
|
2020-11-26 10:22:54 +08:00 |
|
mengxiaolong
|
73c9d0d5fb
|
feature: 惠桂保数据查询
1. 调试数据查询接口
2. 调试详情信息接口
|
2020-11-26 10:18:56 +08:00 |
|
yang.huaxiang
|
d754af6f7c
|
Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-11-25 17:27:36 +08:00 |
|
yang.huaxiang
|
6c19829584
|
安全性问题处理：localStorage token存储异常处理 --提交人：阳华祥
|
2020-11-25 17:09:35 +08:00 |
|
mengxiaolong
|
62ed26f424
|
Merge branch 'feature/开门红' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-11-25 16:51:12 +08:00 |
|
mengxiaolong
|
75da345127
|
顺序发送接口
|
2020-11-25 16:49:22 +08:00 |
|
mengxiaolong
|
f6cbfc5a64
|
Merge branch 'feature/开门红' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-11-25 16:20:54 +08:00 |
|
mengxiaolong
|
fe34d439ed
|
打印token
|
2020-11-25 16:13:02 +08:00 |
|
yang.huaxiang
|
d27478ddb9
|
代码合并问题处理 --提交人：阳华祥
|
2020-11-25 13:42:19 +08:00 |
|
yang.huaxiang
|
64f789b0e8
|
Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-11-25 13:41:24 +08:00 |
|
yang.huaxiang
|
d41c6ba236
|
安全性问题处理：前端请求报文打印处理（去除请求、响应报文打印） --提交人：阳华祥
|
2020-11-25 13:34:19 +08:00 |
|
mengxiaolong
|
d8ecbd216b
|
Merge branch 'feature/开门红首页业绩表格' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-11-20 15:43:43 +08:00 |
|
mengxiaolong
|
b403b64559
|
feature: 开门红首页业绩报表
1. 获取代理人信息本地无token时调客户端方法获取token
2. 机构排行/业绩排行接口调试
|
2020-11-20 15:21:06 +08:00 |
|
yang.huaxiang
|
44d2efc749
|
Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
# src/assets/js/utils/request.js
# src/views/ebiz/manpower/Training.vue
# src/views/ebiz/sale/List.vue
|
2020-11-14 15:39:49 +08:00 |
|
yang.huaxiang
|
b8b04b4136
|
安全性问题处理：范文链接加密问题处理 --提交人：阳华祥
|
2020-11-13 18:32:20 +08:00 |
|
mengxiaolong
|
5fa02545bc
|
Merge branch 'feature/个险业绩排行优化' into dev
# Conflicts:
# src/assets/js/utils/request.js
# src/views/ebiz/institutionalPerform/UnderOffice.vue
|
2020-11-05 09:18:49 +08:00 |
|
mengxiaolong
|
9c30062752
|
个险业绩排行优化
|
2020-11-04 18:35:05 +08:00 |
|
yang.huaxiang
|
c65ec217f7
|
Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
# src/assets/js/business-common.js
# src/config/index.js
# src/views/ebiz/sale/AccountInformation.vue
# src/views/ebiz/sale/AddBeneficiaryInfo.vue
# src/views/ebiz/sale/InsuredPerson.vue
|
2020-10-27 13:17:52 +08:00 |
|
yang.huaxiang
|
43117c24a9
|
安全性问题处理：代码版本整理 修复版本1 --提交人：阳华祥
|
2020-10-27 11:05:01 +08:00 |
|
yang.huaxiang
|
b913e73c47
|
安全性问题处理：代码版本整理 初始版本1 --提交人：阳华祥
|
2020-10-27 10:50:12 +08:00 |
|
mengxiaolong
|
d5dc2b4b5f
|
Merge branch 'hotfix/签名bug修改' into release/1012
|
2020-10-12 16:09:48 +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
|
9a9eb931f9
|
Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into release/0911上线测试(贺报,续期)
# Conflicts:
# .gitignore
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/store/index.js
# src/views/app/Home.vue
|
2020-09-10 14:10:34 +08:00 |
|
mengxiaolong
|
51d5622437
|
Merge branch 'feature/【保全】' into release/0827
# Conflicts:
# src/store/index.js
# src/views/app/Home.vue
|
2020-08-26 16:33:57 +08:00 |
|
na.guo
|
c9fdef2574
|
Merge branch 'hotfix/签名bug修改' into dev
|
2020-08-13 17:40:24 +08:00 |
|
na.guo
|
37e112d50a
|
恢复loading
|
2020-08-13 17:39:26 +08:00 |
|
na.guo
|
5ee5257caa
|
Merge branch 'hotfix/签名bug修改' into dev
|
2020-08-13 15:41:47 +08:00 |
|
na.guo
|
1bd124eade
|
pdf加载测试
|
2020-08-13 15:40:44 +08:00 |
|
阳华祥
|
19f72d9568
|
Merge remote-tracking branch 'origin/feature/GFRS-1198【待确定】自助入司改造（涉及销管）' into release/0811
# Conflicts:
# src/assets/js/utils/data-dictionary.js
# src/router/ebiz/agentEenter.js
# src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
# src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
# src/views/ebiz/agentEenter/Paction.vue
# src/views/ebiz/agentEenter/SignContract.vue
|
2020-08-11 13:41:33 +08:00 |
|
yuweiqi
|
dc011284bd
|
Merge branch 'master' into feature/【保全】
# Conflicts:
# src/api/ebiz/sale/sale.js
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/views/app/Home.vue
|
2020-07-15 12:29:02 +08:00 |
|
yuweiqi
|
809c598fc4
|
Merge branch 'feature/GFRS-1523【待确定】商品商城' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-06-19 13:48:03 +08:00 |
|
yuweiqi
|
9f01e682da
|
[FIX]【商品商城】转发记录-修改转发时间字段；增加加载中覆盖弹窗
|
2020-06-19 13:45:00 +08:00 |
|
yuweiqi
|
2a6227da8d
|
Merge branch 'feature/GFRS-1198【待确定】自助入司改造（涉及销管）' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-06-16 09:45:15 +08:00 |
|
yuweiqi
|
e001cd5d88
|
Merge branch 'feature/【保全】' into dev
|
2020-06-09 11:48:37 +08:00 |
|
yuweiqi
|
24ef0c5df2
|
[FIX]保全-退保pdf预览调试
|
2020-06-09 11:47:16 +08:00 |
|
yuweiqi
|
73898ffa71
|
Merge branch 'feature/【保全】' into dev
# Conflicts:
# src/api/ebiz/sale/sale.js
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/store/index.js
# src/views/app/Home.vue
|
2020-06-09 10:38:19 +08:00 |
|
yuweiqi
|
f70d800586
|
[FIX]【保全】保全进度查询列表
|
2020-06-04 14:14:24 +08:00 |
|
yuweiqi
|
19c240d882
|
[FIX]【保全】分支整理
|
2020-06-03 09:29:14 +08:00 |
|
yuweiqi
|
accdbbf095
|
[NEW]【自助入司改造】新增审批记录、审批详细信息页；原待审批信息接口调整；影像上传页增加身份证正反面图片上传张数校验
|
2020-05-29 16:00:28 +08:00 |
|