Commit Graph

6420 Commits

Author SHA1 Message Date
mengxiaolong
dc48b76c3b 接口地址修改 2020-11-18 14:05:34 +08:00
mengxiaolong
4d1e46af1f Merge branch 'feature/开门红专区' into dev
# Conflicts:
#	src/api/ebiz/goodStart/index.js
2020-11-18 13:53:43 +08:00
mengxiaolong
7a6f00ee25 fix: 冲突掉的代码恢复 2020-11-18 13:52:43 +08:00
mengxiaolong
61ff45d22c Merge branch 'feature/开门红专区' into dev 2020-11-18 13:37:11 +08:00
mengxiaolong
41ecaf0f64 feature: 开门红专区页面
1. 调整样式
2. 增加菜单对象数组, 遍历渲染菜单, 增加路由跳转
2020-11-18 13:36:52 +08:00
mengxiaolong
87740b1b36 Merge branch 'feature/开门红业绩查询' into dev 2020-11-17 18:05:33 +08:00
mengxiaolong
ee0842812c feature: 开门红业绩查询
1. 增加刷新按钮
2020-11-17 18:05:08 +08:00
mengxiaolong
1058bb2098 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-11-17 17:49:00 +08:00
mengxiaolong
8be4f4f593 Merge branch 'feature/个险业绩排行优化' into dev 2020-11-17 17:48:28 +08:00
mengxiaolong
ca67884ff5 fix: 个险业绩排行bug修改
1. 保费计算为NaN问题修改
2. 忽略负值保费
2020-11-17 17:48:04 +08:00
yang.huaxiang
e488c21672 电投合并问题处理 --提交人:阳华祥 2020-11-17 17:37:26 +08:00
mengxiaolong
017b0ba270 fix: 开门红专区
1. 删除重复定义的变量
2020-11-17 17:07:07 +08:00
mengxiaolong
1c9b1f1a93 Merge branch 'feature/个险业绩排行优化' into dev 2020-11-17 16:42:47 +08:00
mengxiaolong
7e2497eeb3 fix: 个险业绩排行bug修改
1. 总保费保留两位小数
2. 实时筛选标保时数据未渲染问题修改
3. 产品名称列宽固定
2020-11-17 16:40:42 +08:00
mengxiaolong
6cde652180 Merge branch 'feature/入司优化' into dev 2020-11-17 15:48:55 +08:00
mengxiaolong
9ce6b0e3ac fix: 入司优化问题修改
1. 联行号改为网点名称
2020-11-17 15:48:36 +08:00
mengxiaolong
0c64defe5f Merge branch 'feature/入司优化' into dev 2020-11-17 14:31:51 +08:00
mengxiaolong
6cb1ff7c0f fix: 入司优化bug修改
1. 审批不显示总行信息以及联行号问题修改
2. 界面反复跳转问题修改
3. 担保人类别去除"无"选项
2020-11-17 14:30:43 +08:00
mengxiaolong
ee283b3940 增加日志打印 2020-11-17 11:18:10 +08:00
mengxiaolong
d467c54f3c Merge branch 'feature/入司优化' into dev
# Conflicts:
#	src/views/ebiz/manpower/Training.vue
2020-11-17 11:08:00 +08:00
mengxiaolong
a8c5b1c516 拦截原生按钮 2020-11-17 10:44:08 +08:00
mengxiaolong
af74602030 Merge branch 'feature/开门红首页业绩表格' into dev
# Conflicts:
#	src/assets/images/goodStart/performance.png
#	src/assets/images/goodStart/performanceIcon.png
#	src/assets/images/goodStart/performanceRank.png
2020-11-17 10:00:48 +08:00
mengxiaolong
86375876f5 开门图片 2020-11-17 09:59:28 +08:00
mengxiaolong
b97205c7c8 Merge branch 'feature/开门红专区' into dev 2020-11-17 09:50:56 +08:00
mengxiaolong
faf1fefc1c 开门红专区图片 2020-11-17 09:50:11 +08:00
mengxiaolong
fd27a3d8ca Merge branch 'feature/开门红业绩查询' into dev
# Conflicts:
#	src/router/ebiz/goodStart.js
2020-11-17 09:30:03 +08:00
mengxiaolong
1b3eb465b3 开门红业绩查询路由 2020-11-17 09:27:16 +08:00
mengxiaolong
6428b3d8ff Merge branch 'feature/开门红专区' into dev 2020-11-16 18:41:09 +08:00
mengxiaolong
08bf66ed9c 百宝箱查询菜单接口 2020-11-16 18:39:44 +08:00
mengxiaolong
e18b48e243 Merge branch 'feature/开门红专区' into dev
# Conflicts:
#	src/api/ebiz/goodStart/index.js
#	src/router/ebiz/goodStart.js
2020-11-16 18:30:57 +08:00
mengxiaolong
f63df3ab55 百宝箱菜单修改 2020-11-16 18:29:10 +08:00
yang.huaxiang
00b9965319 Merge branch 'feature/GFRS-2015【待确定】开门红需求' into dev 2020-11-16 16:25:00 +08:00
yang.huaxiang
dc3d64e721 开门红:微信头像生成 --提交人:阳华祥 2020-11-16 16:24:17 +08:00
mengxiaolong
6d3ef33c97 Merge branch 'feature/开门红业绩查询' into dev
# Conflicts:
#	src/router/ebiz/goodStart.js
#	src/router/ebiz/index.js
2020-11-16 14:49:47 +08:00
mengxiaolong
8383cfbf13 Merge branch 'feature/开门红专区' into dev
# Conflicts:
#	src/assets/images/goodStart/performance.png
#	src/router/ebiz/index.js
2020-11-16 14:43:28 +08:00
mengxiaolong
d182dea378 增加百宝箱页面 2020-11-16 14:41:32 +08:00
yang.huaxiang
f28c9ee03a Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
#	src/views/ebiz/proposal/List.vue
2020-11-16 14:17:29 +08:00
yang.huaxiang
62ec89c3d4 安全性问题处理:建议书列表页面添加页面访问校验组件 --提交人:阳华祥 2020-11-16 14:14:49 +08:00
yang.huaxiang
bbb87b761f 安全性问题处理:添加页面访问校验组件修改 --提交人:阳华祥 2020-11-16 14:04:00 +08:00
mengxiaolong
739090ec4d Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-11-16 13:39:33 +08:00
mengxiaolong
c0904bd050 Merge branch 'feature/开门红首页业绩表格' into dev
# Conflicts:
#	src/views/ebiz/product/HomeProduct.vue
2020-11-16 13:39:06 +08:00
mengxiaolong
7685b6ac52 调用客户端方法动态修改WebHeight 2020-11-16 13:37:40 +08:00
yang.huaxiang
51ec942f97 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev
# Conflicts:
#	src/views/ebiz/manpower/Training.vue
#	src/views/ebiz/sale/List.vue
2020-11-16 13:35:32 +08:00
yang.huaxiang
e3deb46104 安全性问题处理:添加页面访问校验组件修改 --提交人:阳华祥 2020-11-16 13:28:16 +08:00
yang.huaxiang
f643f61ee3 安全性问题处理:添加页面访问校验组件抽出 --提交人:阳华祥 2020-11-16 11:36:58 +08:00
mengxiaolong
a9817305fc 展开更多按钮样式修改 2020-11-16 10:29:19 +08:00
mengxiaolong
91dcc86452 Merge branch 'feature/开门红首页业绩表格' into dev
# Conflicts:
#	src/views/ebiz/product/HomeProduct.vue
2020-11-16 10:22:21 +08:00
mengxiaolong
3c90ffde7c 增加开门红专区页面 2020-11-16 09:24:26 +08:00
yang.huaxiang
1171042d99 Merge branch 'feature/GFRS-1991【待确定】APP检测结果优化-整理' into dev 2020-11-14 17:04:32 +08:00
yang.huaxiang
f3fedc066c 安全性问题处理:添加页面访问校验初版代码 --提交人:阳华祥 2020-11-14 17:04:13 +08:00