mengxiaolong
|
9a9eb931f9
|
Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into release/0911上线测试(贺报,续期)
# Conflicts:
# .gitignore
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/store/index.js
# src/views/app/Home.vue
|
2020-09-10 14:10:34 +08:00 |
|
mengxiaolong
|
51d5622437
|
Merge branch 'feature/【保全】' into release/0827
# Conflicts:
# src/store/index.js
# src/views/app/Home.vue
|
2020-08-26 16:33:57 +08:00 |
|
na.guo
|
c9fdef2574
|
Merge branch 'hotfix/签名bug修改' into dev
|
2020-08-13 17:40:24 +08:00 |
|
na.guo
|
37e112d50a
|
恢复loading
|
2020-08-13 17:39:26 +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 |
|
阳华祥
|
19f72d9568
|
Merge remote-tracking branch 'origin/feature/GFRS-1198【待确定】自助入司改造（涉及销管）' into release/0811
# Conflicts:
# src/assets/js/utils/data-dictionary.js
# src/router/ebiz/agentEenter.js
# src/views/ebiz/agentEenter/AgentEenterBasicImage.vue
# src/views/ebiz/agentEenter/AgentEenterBasicInfor.vue
# src/views/ebiz/agentEenter/Paction.vue
# src/views/ebiz/agentEenter/SignContract.vue
|
2020-08-11 13:41:33 +08:00 |
|
yuweiqi
|
dc011284bd
|
Merge branch 'master' into feature/【保全】
# Conflicts:
# src/api/ebiz/sale/sale.js
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/views/app/Home.vue
|
2020-07-15 12:29:02 +08:00 |
|
yuweiqi
|
809c598fc4
|
Merge branch 'feature/GFRS-1523【待确定】商品商城' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-06-19 13:48:03 +08:00 |
|
yuweiqi
|
9f01e682da
|
[FIX]【商品商城】转发记录-修改转发时间字段；增加加载中覆盖弹窗
|
2020-06-19 13:45:00 +08:00 |
|
yuweiqi
|
2a6227da8d
|
Merge branch 'feature/GFRS-1198【待确定】自助入司改造（涉及销管）' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2020-06-16 09:45:15 +08:00 |
|
yuweiqi
|
e001cd5d88
|
Merge branch 'feature/【保全】' into dev
|
2020-06-09 11:48:37 +08:00 |
|
yuweiqi
|
24ef0c5df2
|
[FIX]保全-退保pdf预览调试
|
2020-06-09 11:47:16 +08:00 |
|
yuweiqi
|
73898ffa71
|
Merge branch 'feature/【保全】' into dev
# Conflicts:
# src/api/ebiz/sale/sale.js
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/store/index.js
# src/views/app/Home.vue
|
2020-06-09 10:38:19 +08:00 |
|
yuweiqi
|
f70d800586
|
[FIX]【保全】保全进度查询列表
|
2020-06-04 14:14:24 +08:00 |
|
yuweiqi
|
19c240d882
|
[FIX]【保全】分支整理
|
2020-06-03 09:29:14 +08:00 |
|
yuweiqi
|
accdbbf095
|
[NEW]【自助入司改造】新增审批记录、审批详细信息页；原待审批信息接口调整；影像上传页增加身份证正反面图片上传张数校验
|
2020-05-29 16:00:28 +08:00 |
|
yuweiqi
|
6d3cde6644
|
Merge branch 'feature/GFRS-217【待确定】保全-续期账号变更' into feature/【保全】
# Conflicts:
# src/assets/js/utils/request.js
# src/config/preserve.js
# src/config/urlMap.js
|
2020-05-19 19:25:33 +08:00 |
|
yuweiqi
|
86df123638
|
Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev
|
2020-05-06 15:38:13 +08:00 |
|
yuweiqi
|
679d88a58a
|
[FIX]【更换人脸识别厂商微信端】干掉原接口白名单
|
2020-05-06 15:37:54 +08:00 |
|
yuweiqi
|
bf9511cef5
|
Merge branch 'feature/GFRS-222【0423】续期管理-续期列表' into dev
# Conflicts:
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
|
2020-04-22 11:36:35 +08:00 |
|
yuweiqi
|
ab68e9ae02
|
[NEW]【续期管理】路由、api、mock设置
|
2020-04-22 11:22:28 +08:00 |
|
tian.guangyuan
|
e18aee0066
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
# Conflicts:
# src/router/ebiz/index.js
|
2020-04-20 14:36:33 +08:00 |
|
tian.guangyuan
|
dba77db331
|
【fix】 修复处理冲突时，引起的项目无法正常启动。
|
2020-04-20 14:33:45 +08:00 |
|
tian.guangyuan
|
ab4959b0de
|
Merge branch 'dev_cardList' into feature/GFRS-247【待确定】卡单产品投保
# Conflicts:
# src/assets/js/utils/request.js
# src/config/urlMap.js
# src/router/ebiz/index.js
# src/views/app/Home.vue
# src/views/ebiz/sale/InsuredInfo.vue
|
2020-04-20 14:29:27 +08:00 |
|
yuweiqi
|
5041dfc241
|
[NEW]【保全-续期账号变更】配置mock
|
2020-04-15 21:59:10 +08:00 |
|
tian.guangyuan
|
6b968d14f0
|
Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev
|
2020-04-01 17:55:05 +08:00 |
|
yuweiqi
|
42d17251ce
|
[NEW]DISC-列表页、封面页
|
2020-04-01 17:31:50 +08:00 |
|
阳华祥
|
34bd68d829
|
Merge remote-tracking branch 'origin/feature/GFRS-615【待确定】问卷' into release/GFRS-615【待确定】问卷
# Conflicts:
# src/assets/js/utils/request.js
# src/views/app/Home.vue
|
2020-02-26 18:48:56 +08:00 |
|
ding.zhou
|
573732d1d8
|
需求：GFRS-221 入司审批
变更：代理人模板修改
|
2020-02-25 17:25:26 +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 |
|
wangmingzhe
|
6feb966015
|
Merge branch 'release/1226' into dev
# Conflicts:
# src/assets/js/utils/request.js
|
2019-12-26 15:07:35 +08:00 |
|
nimengmeng_1990
|
df180f54e2
|
[IMP]电子投保模块请求白名单
|
2019-12-26 15:04:00 +08:00 |
|
皮伟
|
af44a5fc70
|
提交最新更改
|
2019-12-09 15:42:06 +08:00 |
|
nimengmeng_1990
|
7b4dabe7b2
|
loading白名单和总浏览，查看失败原因
|
2019-12-09 14:43:06 +08:00 |
|
皮伟
|
80dec42d27
|
卡单代码
|
2019-11-26 14:33:26 +08:00 |
|
邓晓坤
|
93de0d5db7
|
tiaoz
|
2019-09-25 16:53:12 +08:00 |
|
邓晓坤
|
9d7bc45a9b
|
pw
|
2019-09-25 15:59:35 +08:00 |
|
邓晓坤
|
191d614c53
|
gzPW
|
2019-09-25 15:59:14 +08:00 |
|
邓晓坤
|
70ac9ba250
|
gz
|
2019-09-25 15:01:33 +08:00 |
|
邓晓坤
|
0e2dbf4cfc
|
告知
|
2019-09-25 14:35:16 +08:00 |
|
邓晓坤
|
9be08c70c0
|
修改告知项
|
2019-09-25 14:17:05 +08:00 |
|
pang.lizong
|
0a12dc8526
|
投保流程-签名
|
2019-09-24 15:39:36 +08:00 |
|
邓晓坤
|
0067a41d4b
|
修改logo
|
2019-09-23 15:59:52 +08:00 |
|
xiaokun
|
cf45352eea
|
国富commit-2ecc58241492ab82267476b5fe7ec8c39498988b
|
2019-09-22 14:58:04 +08:00 |
|
邓晓坤
|
b6636da927
|
filter
|
2019-09-20 13:55:18 +08:00 |
|
邓晓坤
|
d5ca72a7fc
|
合并鼎诚919
|
2019-09-19 18:04:30 +08:00 |
|
邓晓坤
|
217a720b72
|
eweb
|
2019-09-19 11:36:56 +08:00 |
|
邓晓坤
|
7f5993d81f
|
修改接口ip和静态资源ip
|
2019-09-18 15:22:55 +08:00 |
|