Commit Graph

7467 Commits

Author SHA1 Message Date
yuweiqi
bd9d75025b Merge branch 'nbs' into dev 2020-02-26 15:22:29 +08:00
yuweiqi
90cd0f1449 [FIX]nbs-nbs智能分析结果下载按钮图片大小调整、下载地址 2020-02-26 15:22:05 +08:00
yuweiqi
c084180715 Merge branch 'nbs' into dev 2020-02-26 15:06:37 +08:00
yuweiqi
bf03943536 [FIX]nbs-nbs智能分析结果下载按钮图片大小调整、下载地址 2020-02-26 15:06:03 +08:00
yuweiqi
4565df54d3 Merge branch 'nbs' into dev 2020-02-26 14:55:13 +08:00
yuweiqi
d1b41396dd [NEW]nbs-新增nbs智能分析结果pdf下载功能 2020-02-26 14:54:29 +08:00
阳华祥
c51c20381c Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-26 14:42:27 +08:00
阳华祥
98138fb1c1 GFRS-615 问卷调查VUE 图片处理 --提交人:阳华祥 2020-02-26 14:41:24 +08:00
阳华祥
a336a95d52 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-26 13:35:50 +08:00
阳华祥
06497994d4 GFRS-615 问卷调查VUE 奖品类型处理 --提交人:阳华祥 2020-02-26 13:35:16 +08:00
阳华祥
a1bd2ce8b2 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-26 11:02:37 +08:00
阳华祥
8bc8a46c84 GFRS-615 问卷调查VUE 关闭页面、样式调整 --提交人:阳华祥 2020-02-26 11:02:06 +08:00
阳华祥
cd6a3fc415 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-25 20:02:02 +08:00
阳华祥
d09cd5bd04 GFRS-615 问卷调查VUE 样式问题修复 --提交人:阳华祥 2020-02-25 20:00:09 +08:00
阳华祥
ae26ae8af0 GFRS-615 问卷调查VUE 样式问题修复 --提交人:阳华祥 2020-02-25 19:54:33 +08:00
ding.zhou
2b439a2660 需求:GFRS-221 入司审批
变更:代理人模板修改
2020-02-25 19:26:49 +08:00
ding.zhou
03721e99fb Merge branch 'feature/GFRS-221_入司审批' into release/20200225
# Conflicts:
#	src/views/ebiz/agentEenter/AgentEenterBasicFamily.vue
#	src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
#	src/views/ebiz/agentEenter/AgentEnterGuarantor.vue
#	src/views/ebiz/agentEenter/EntryProcess.vue
#	src/views/ebiz/agentEenter/SeeCause.vue
2020-02-25 18:49:44 +08:00
ding.zhou
573732d1d8 需求:GFRS-221 入司审批
变更:代理人模板修改
2020-02-25 17:25:26 +08:00
ding.zhou
ad2e21d3de 需求:GFRS-623 国富人寿鑫管家终身寿险(万能型)
变更:详情页面保额显示调整
2020-02-25 16:55:43 +08:00
28CD73C051F645E8132835671423A23F
7f197c0ea5 Merge branch 'feature/GFRS-623_【0220】国富人寿鑫管家终身寿险(万能型)产品需求' into dev 2020-02-25 14:53:52 +08:00
ding.zhou
2048d81d11 需求:GFRS-623 国富人寿鑫管家终身寿险(万能型)
变更:详情页面保额显示调整
2020-02-25 14:52:32 +08:00
阳华祥
ccb1d8c8fb Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-25 09:46:59 +08:00
阳华祥
27c7f0f1a1 GFRS-615 问卷调查VUE 分享后置提示问题 --提交人:阳华祥 2020-02-25 09:46:41 +08:00
阳华祥
fbc1b183d6 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-25 09:38:59 +08:00
阳华祥
1e97adb9e1 GFRS-615 问卷调查VUE 二次分享 --提交人:阳华祥 2020-02-25 09:38:36 +08:00
阳华祥
c7947703a9 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-25 09:24:37 +08:00
阳华祥
3c686b9837 GFRS-615 问卷调查VUE 二次分享 --提交人:阳华祥 2020-02-25 09:23:21 +08:00
阳华祥
9127ff7843 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-24 18:42:25 +08:00
阳华祥
abdbdebdb7 GFRS-615 问卷调查VUE 拨打电话 --提交人:阳华祥 2020-02-24 18:41:41 +08:00
阳华祥
c7a9bd65da Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-24 17:26:33 +08:00
阳华祥
62d76c9265 GFRS-615 问卷调查VUE代码修改3 --提交人:阳华祥 2020-02-24 17:24:45 +08:00
ding.zhou@ebiz-fooge
1df0f8bb3c Merge branch 'feature/GFRS-221_入司审批' into dev 2020-02-24 14:23:10 +08:00
ding.zhou@ebiz-fooge
57bcb87b72 需求:GFRS-221 入司审批
变更:学历校验调整、页面文字调整
2020-02-24 14:21:04 +08:00
阳华祥
6f172dcdb8 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-24 12:14:47 +08:00
阳华祥
01db29aa9e GFRS-615 问卷调查VUE修改3 --提交人:阳华祥 2020-02-24 12:13:24 +08:00
阳华祥
efb710a401 Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-23 21:24:20 +08:00
阳华祥
622f3e589c GFRS-615 问卷调查VUE按钮颜色修改 --提交人:阳华祥 2020-02-23 21:23:48 +08:00
阳华祥
42974ad06d GFRS-615 问卷调查VUE代码修改2 --提交人:阳华祥 2020-02-23 21:20:04 +08:00
阳华祥
ef05113b5d Merge branch 'feature/GFRS-615【待确定】问卷' into dev 2020-02-23 21:07:30 +08:00
阳华祥
efa86c8190 GFRS-615 问卷调查VUE修改版本1 --提交人:阳华祥 2020-02-23 21:06:45 +08:00
阳华祥
373be99831 Merge branch 'feature/GFRS-615【待确定】问卷' into dev
# Conflicts:
#	src/assets/js/utils/request.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-02-23 20:11:24 +08:00
阳华祥
92b102b8ba GFRS-615 问卷调查VUE初版代码提交 --提交人:阳华祥 2020-02-23 20:03:01 +08:00
28CD73C051F645E8132835671423A23F
b77960b50f Merge branch 'feature/GFRS-623_【0220】国富人寿鑫管家终身寿险(万能型)产品需求' into dev 2020-02-23 17:31:38 +08:00
ding.zhou
d5e09a70d8 需求:GFRS-623 国富人寿鑫管家终身寿险(万能型)
变更:修复告知 人名显示错误问题
2020-02-23 17:31:15 +08:00
lihaoda
a3828d6d4e Merge branch 'nbs' into dev 2020-02-21 16:42:56 +08:00
lihaoda
eec6dfa2f3 fix 2020-02-21 16:42:46 +08:00
lihaoda
da4e452415 Merge branch 'nbs' into dev 2020-02-21 16:27:18 +08:00
lihaoda
49911a1156 fix 2020-02-21 16:27:04 +08:00
lihaoda
eb916fb27c Merge branch 'nbs' into dev 2020-02-21 15:56:22 +08:00
lihaoda
dec1a98af2 fix 2020-02-21 15:55:29 +08:00