Commit Graph

6420 Commits

Author SHA1 Message Date
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
mengxiaolong
d94a46c5ba feature: 开门红首页业绩报表
1. 调用客户端动态修改高度传参修改
2020-11-20 09:20:34 +08:00
mengxiaolong
8dabc79679 Merge branch 'feature/开门红专区' into dev 2020-11-19 21:59:47 +08:00
mengxiaolong
f3923bb8e4 联行号位数处理 2020-11-19 21:26:37 +08:00
mengxiaolong
48a30f1d31 Merge branch 'feature/入司优化' into dev 2020-11-19 20:13:44 +08:00
mengxiaolong
5f074f1f77 网点名称修改 2020-11-19 20:13:26 +08:00
mengxiaolong
b9a6d9d21f 网点名称更新 2020-11-19 19:46:17 +08:00
mengxiaolong
1816231d9d feature: 开门红首页业绩表格
1. 删除html和body的高度控制样式
2020-11-19 16:28:51 +08:00
mengxiaolong
64cf2ac54a Merge branch 'hotfix/贺报表格样式修改' into dev 2020-11-19 14:20:15 +08:00
mengxiaolong
ef5d887731 fix: 贺报样式修改
1. 修改页面结构, 使用table替换布局
2. 分公司字段修改为营销服务部
2020-11-19 14:19:55 +08:00
mengxiaolong
a22816bc6d feature: 开门红百宝箱
1. 百宝箱页面菜单样式调整
2020-11-19 13:27:22 +08:00
mengxiaolong
aec5b6445b fix: 入司基本信息回显总行
1. 联行号code修改
2020-11-19 11:01:43 +08:00
mengxiaolong
f3e6458094 Merge branch 'feature/入司优化' into release/1119
# Conflicts:
#	src/components/ebiz/account/SelectBankName.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/js/bankList.js
2020-11-19 10:26:59 +08:00
mengxiaolong
a4080b832d Merge branch 'feature/开门红首页业绩表格' into dev 2020-11-18 17:23:12 +08:00
mengxiaolong
3f0bfdb140 feature: 开门红首页业绩报表
1. 区分开门红与非开门红样式
2020-11-18 17:22:51 +08:00
mengxiaolong
6f20d75ef8 Merge branch 'feature/入司优化' into dev 2020-11-18 16:04:53 +08:00
mengxiaolong
39cdc0adef fix: 入司优化
1. 担保人与家属关系回显处理
2020-11-18 16:04:10 +08:00
mengxiaolong
21ad61deb0 Merge branch 'feature/入司优化' into dev 2020-11-18 15:40:32 +08:00
mengxiaolong
39907b0e1a fix: 入司优化
1. 担保人去除无的选项,家属增加无的选项
2020-11-18 15:40:10 +08:00
mengxiaolong
16633f7558 Merge branch 'feature/入司优化' into dev 2020-11-18 15:05:35 +08:00
mengxiaolong
16bd743662 fix: 入司优化
1. 联行号修改为网点名称
2020-11-18 15:05:18 +08:00
mengxiaolong
1a6112d5c0 接口地址修改 2020-11-18 14:07:20 +08:00
mengxiaolong
89591b7b80 Merge branch 'feature/开门红专区' into dev 2020-11-18 14:05:53 +08:00