Commit Graph

5842 Commits

Author SHA1 Message Date
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
e2866932b6 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into release/20201126 2020-11-25 13:44:05 +08:00
mengxiaolong
be1c9bf7c9 feature: 惠桂保数据查询
1. 调试数据查询接口
2. 增加分页, 筛选功能
2020-11-25 13:43:54 +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
26de917fd4 安全性问题处理:生产请求接口加密配置(接口地址调整为api/v2) --提交人:阳华祥 2020-11-25 13:35:44 +08:00
yang.huaxiang
d41c6ba236 安全性问题处理:前端请求报文打印处理(去除请求、响应报文打印) --提交人:阳华祥 2020-11-25 13:34:19 +08:00
yang.huaxiang
dcdf7dd7dc Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into release/20201126
# Conflicts:
#	src/views/ebiz/manpower/Training.vue
#	src/views/ebiz/sale/AccountInformation.vue
#	src/views/ebiz/sale/AddBeneficiaryInfo.vue
#	src/views/ebiz/sale/InsuredPerson.vue
2020-11-25 13:13:45 +08:00
mengxiaolong
7c096f283e feature: 惠桂保
1. 增加惠桂保路由, 页面
2020-11-24 18:14:10 +08:00
mengxiaolong
53a99add0d Merge branch 'feature/开门红' into dev 2020-11-24 17:52:55 +08:00
mengxiaolong
66b1b9685a fix: 开门红业绩查询
1. 外勤默认tab栏切换
2020-11-24 17:52:24 +08:00
mengxiaolong
fb5826408a Merge branch 'feature/开门红' into dev 2020-11-24 16:55:27 +08:00
mengxiaolong
0bc6f1f952 feature: 开门红业绩查询
1. 增加内外勤权限控制
2020-11-24 16:53:57 +08:00
mengxiaolong
f6c4f092f1 Merge branch 'feature/开门红' into dev 2020-11-24 10:33:44 +08:00
mengxiaolong
d82fece5b6 feature: 开门红
1. 开门红业绩查询日期筛选无法关闭问题修改
2. 添加注释
2020-11-24 10:33:21 +08:00
mengxiaolong
67305d6fc1 Merge branch 'feature/开门红首页业绩表格' into feature/开门红 2020-11-24 09:36:33 +08:00
mengxiaolong
d09cc10ca5 Merge branch 'feature/开门红业绩查询' into feature/开门红
# Conflicts:
#	src/api/ebiz/goodStart/index.js
#	src/router/ebiz/goodStart.js
2020-11-24 09:36:10 +08:00
mengxiaolong
75c706e17e Merge branch 'feature/开门红专区' into feature/开门红 2020-11-24 09:32:05 +08:00
yang.huaxiang
802a655e9f Merge remote-tracking branch 'origin/feature/万福卡产品开发' into release/20201123 2020-11-23 19:55:49 +08:00
yang.huaxiang
fa46e7863c Merge branch 'feature/GFRS-2015【待确定】开门红需求-电投改造' into dev 2020-11-23 19:13:18 +08:00
yang.huaxiang
3b82dc540a 开门红需求-电投提示:告知显示问题处理 --提交人:阳华祥 2020-11-23 19:11:42 +08:00
mengxiaolong
5e294f5049 Merge branch 'feature/开门红首页业绩表格' into dev 2020-11-23 18:54:33 +08:00
mengxiaolong
29b32b3999 fix: 查看更多按钮文本修改
1. 开门红首页表格展开收起时修改按钮文案
2020-11-23 18:53:48 +08:00
mengxiaolong
e7cd7d4f91 Merge branch 'feature/开门红业绩查询' into dev 2020-11-23 18:13:16 +08:00
mengxiaolong
fa4ed406c3 feature: 开门红业绩排名
1. 过滤name为空数据, 小数保留两位
2020-11-23 18:12:59 +08:00
mengxiaolong
c471577c78 Merge branch 'feature/开门红首页业绩表格' into dev 2020-11-23 17:50:50 +08:00
mengxiaolong
cf68e80e51 feature: 开门红首页业绩/机构排名
1. 动态改变页面高度增加参数, 增加宽度和表格是否展示更多
2020-11-23 17:50:10 +08:00
mengxiaolong
5248771070 Merge branch 'feature/开门红业绩查询' into dev
# Conflicts:
#	src/api/ebiz/goodStart/index.js
2020-11-23 17:19:57 +08:00
mengxiaolong
282bad87c4 feature: 开门红业绩排名
1. 调试业绩排名查询接口
2020-11-23 17:18:41 +08:00
yang.huaxiang
0bea9503f0 Merge remote-tracking branch 'origin/dev' into dev 2020-11-23 13:53:50 +08:00
yang.huaxiang
c2949986ae Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev 2020-11-23 13:52:56 +08:00
yang.huaxiang
d3ed844b6a 安全性问题处理:电投列表添加组件处理 --提交人:阳华祥 2020-11-23 13:52:35 +08:00
mengxiaolong
763c628b55 Merge branch 'feature/开门红专区' into dev 2020-11-23 13:51:02 +08:00
mengxiaolong
f3ff1f7f51 开门红专区菜单跳转页面参数修改 2020-11-23 13:50:35 +08:00
yang.huaxiang
d6159901e9 Merge branch 'feature/万福卡产品开发' into dev 2020-11-23 13:27:47 +08:00
yang.huaxiang
8b48a2eec8 万福卡卡单开发调整:列表查询接口调整 --提交人:阳华祥 2020-11-23 13:26:03 +08:00
mengxiaolong
018d94e5eb Merge branch 'hotfix/电子投保单详情页面报错问题' into dev
# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
2020-11-23 11:41:37 +08:00
mengxiaolong
f73365e85b hotfix: 电子投保单详情页面报错
1. 修改that为this
2020-11-23 11:39:33 +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
mengxiaolong
2186f659d5 Merge branch 'feature/开门红专区' into dev 2020-11-20 13:21:33 +08:00
mengxiaolong
7edd7c9fe0 feature: 开门红专区
1. 开门红专区导航栏颜色, 标题颜色修改
2020-11-20 13:21:08 +08:00
mengxiaolong
d1d6f05aff Merge branch 'feature/开门红首页业绩表格' into dev 2020-11-20 09:54:20 +08:00
mengxiaolong
255d32cfad 恢复获取页面高度方法 2020-11-20 09:54:03 +08:00
mengxiaolong
cf3bd93f57 Merge branch 'feature/开门红首页业绩表格' into dev 2020-11-20 09:20:59 +08:00