Commit Graph

6308 Commits

Author SHA1 Message Date
mengxiaolong
36aabef43b Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-08-13 18:16:00 +08:00
mengxiaolong
3bda286aba 添加搜索,loading 2020-08-13 18:15:26 +08:00
mengxiaolong
aa53501a90 Merge branch 'feature/GFRS-1742【待确定】收入改造' into dev 2020-08-13 17:46:46 +08:00
na.guo
c9fdef2574 Merge branch 'hotfix/签名bug修改' into dev 2020-08-13 17:40:24 +08:00
mengxiaolong
58007a7994 优化暂无数据展示等 2020-08-13 17:40:09 +08:00
na.guo
37e112d50a 恢复loading 2020-08-13 17:39:26 +08:00
na.guo
2dc66fb701 Merge branch 'hotfix/签名bug修改' into dev 2020-08-13 16:58:45 +08:00
na.guo
3b45936cfc 解决iframe左右晃动的问题 2020-08-13 16:57:29 +08:00
mengxiaolong
34c9f2b49e 收入改造样式 2020-08-13 16:31:03 +08:00
na.guo
9b8b94db19 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-13 15:50:23 +08:00
na.guo
45286f3b52 Merge branch 'hotfix/签名bug修改' into dev 2020-08-13 15:49:58 +08:00
mengxiaolong
f9aad8a256 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-13 15:49:41 +08:00
na.guo
3717597fcb 延迟方法修改 2020-08-13 15:49:14 +08:00
mengxiaolong
1980e150ae 完善问题件微信端签名 2020-08-13 15:49:06 +08:00
na.guo
059fc8727a Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-13 15:42:05 +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
mengxiaolong
8fe7f3a369 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-13 15:12:34 +08:00
mengxiaolong
5996111c40 调试微信端签名 2020-08-13 15:10:24 +08:00
na.guo
1a6c825164 Merge branch 'hotfix/签名bug修改' into dev 2020-08-13 14:23:09 +08:00
na.guo
b0234a0705 去掉多余引用 2020-08-13 14:21:54 +08:00
na.guo
726c7d144d Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-13 14:19:40 +08:00
na.guo
a151e535ac Merge branch 'hotfix/签名bug修改' into dev 2020-08-13 14:19:13 +08:00
na.guo
8d29dc3175 frame加载测试 2020-08-13 14:17:49 +08:00
mengxiaolong
938d5a0e11 Merge branch 'feature/GFRS-213【待确定】电投问题件-前端开发-new' into dev 2020-08-13 13:35:20 +08:00
mengxiaolong
1093be7619 修改log打印 2020-08-13 13:34:54 +08:00
mengxiaolong
266e4fa962 详情页增加正在扣款分类展示 2020-08-13 10:08:30 +08:00
mengxiaolong
0d1ac44c22 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev
# Conflicts:
#	src/router/ebiz/index.js
2020-08-13 09:45:30 +08:00
mengxiaolong
145dc48db8 恢复被覆盖的路由 2020-08-13 09:43:31 +08:00
mengxiaolong
c4ef1d2599 Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev 2020-08-13 09:34:01 +08:00
mengxiaolong
4a57a789e6 增加续期拨打电话 2020-08-13 09:33:38 +08:00
mengxiaolong
d8ea07943f 调试列表和详情接口 2020-08-13 09:17:23 +08:00
na.guo
013c39dcdc Merge branch 'hotfix/签名bug修改' into dev 2020-08-12 17:59:28 +08:00
na.guo
1906a70a18 title修改 2020-08-12 17:58:05 +08:00
na.guo
540ebd005e Merge branch 'hotfix/签名bug修改' into dev 2020-08-12 17:50:14 +08:00
na.guo
89018c24a1 双主险产品说明书页面title修改, 改成第二个主险的title 2020-08-12 17:49:16 +08:00
mengxiaolong
55fa014cf2 收入改造调整 2020-08-12 17:01:01 +08:00
mengxiaolong
1843b96a2a 样式,接口修改 2020-08-12 16:31:28 +08:00
na.guo
702f4295f7 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-08-12 15:43:59 +08:00
na.guo
095015cb0c Merge branch 'hotfix/签名bug修改' into dev 2020-08-12 15:43:41 +08:00
na.guo
69c3313b63 判断双主险 2020-08-12 15:40:43 +08:00
mengxiaolong
bbe63d77b3 Merge branch 'hotfix/nbs文本过长未换行问题' into dev
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/views/app/Home.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
#	src/views/ebiz/nbs/CrewList.vue
2020-08-12 15:38:06 +08:00
mengxiaolong
ce2af7eaf1 nbs统计文本过长问题修改 2020-08-12 15:33:47 +08:00
mengxiaolong
44b79ae7c0 收入改造页面调整 2020-08-12 15:29:53 +08:00
mengxiaolong
ca6b62e6f6 收入改造页面样式调整 2020-08-12 15:14:38 +08:00
mengxiaolong
4942b0f8d2 修改页面样式, 调试接口 2020-08-12 14:59:00 +08:00
na.guo
c6a627d718 调试参数 2020-08-12 12:48:05 +08:00
mengxiaolong
5628ebfc9a 修改微信保存回显图片 2020-08-12 09:02:15 +08:00
阳华祥
5da9727c97 Merge remote-tracking branch 'origin/feature/GFRS-1844【待确定】业绩快报中介渠道增加险种名称' into release/0811 2020-08-11 23:02:01 +08:00
阳华祥
f8533ff58e NBS 统计页面跳转问题处理 --提交人:阳华祥 2020-08-11 23:00:42 +08:00