Commit Graph

274 Commits

Author SHA1 Message Date
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
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
8fe0e9024c [FIX]【保全】退保相关 2020-06-09 10:14:14 +08:00
tian.guangyuan
196cffa0b1 Merge branch 'feature/GFRS-228【待确定】活动量管理-活动量' into dev 2020-06-08 09:11:39 +08:00
tian.guangyuan
f6040b1d40 【fix】 增加e活动微信分享统计接口调用 2020-06-08 09:11:24 +08:00
yuweiqi
40d1deb6d0 Merge branch 'feature/【保全】' of http://112.124.100.131/GFRS/ebiz-h5 into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/views/ebiz/preserve/js/data-dictionary.js
2020-06-04 21:17:28 +08:00
yuweiqi
1a88cd470f [FIX]【保全】退保、进度查询、filters 2020-06-04 21:11:46 +08:00
阳华祥
e8577e7635 Merge branch 'PC保全' into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
2020-06-04 18:01:59 +08:00
阳华祥
cab97e8fe4 保全:续期账号变更调整 --提交人:阳华祥 2020-06-04 17:59:34 +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
40d9451339 [fix]【自助入司改造】新增撤销申请功能 2020-05-29 18:14:02 +08:00
tian.guangyuan
137098f7a2 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into release/0528
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-05-29 14:05:15 +08:00
tian.guangyuan
0dd45a54bd 【fix】 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into feature/【0529】银行卡鉴权-理赔银行卡鉴权
# Conflicts:
#	src/api/ebiz/sale/sale.js

开发理赔中的银行卡鉴权
2020-05-29 10:45:50 +08:00
yuweiqi
a188edca0e Merge branch 'feature/GFRS-1237【0525】国富人寿桂企保重大疾病保险' into release/0528
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/data-dictionary.js
#	src/views/ebiz/common/CalculatePremium.vue
2020-05-27 20:54:07 +08:00
tian.guangyuan
a920cebfc2 Merge branch 'feature/GFRS【】理赔_claim' into release/0526 2020-05-25 14:57:39 +08:00
tian.guangyuan
756df36fd7 Merge branch 'feature/GFRS-1291【0529】银行卡鉴权' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-05-23 20:18:48 +08:00
tian.guangyuan
903d7cddf9 【fix】 添加校验银行卡信息接口调用 2020-05-23 20:15:19 +08:00
yuweiqi
fb582a4caa Merge branch 'feature/GFRS-1237【0525】国富人寿桂企保重大疾病保险' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/views/ebiz/sale/InsuredInfo.vue
2020-05-23 15:30:14 +08:00
yuweiqi
c73ba17fc1 [NEW]【电投-桂企】增加投保人信息工作单位选择框;增加代理人售卖权限校验;增加投保人工作单位投保资格校验 2020-05-23 15:24:33 +08:00
yuweiqi
cd3db7b6bc Merge branch 'feature/GFRS-218【待确认】保全-受益人变更' into feature/【保全】
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/config/preserve.js
#	src/router/ebiz/index.js
#	src/views/ebiz/preserve/AutopayAuthorization.vue
#	src/views/ebiz/preserve/HandleResult.vue
#	src/views/ebiz/preserve/ImageUpload.vue
#	src/views/ebiz/preserve/RenewalConfirmation.vue
#	src/views/ebiz/preserve/RenewalInfo.vue
2020-05-19 20:16:31 +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
b6aa90298a Merge branch 'feature/GFRS-216【待确定】保全-联系方式变更' into feature/【保全】
# Conflicts:
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-05-19 19:17:40 +08:00
tian.guangyuan
c984b404e1 [fix] 理赔:人脸识别在微信端修改微信的人脸识别 2020-05-14 15:18:03 +08:00
tian.guangyuan
ab251b038d Merge branch 'feature/GFRS-1146【0520】活动邀请' into dev
# Conflicts:
#	src/router/ebiz/index.js
2020-05-11 17:45:03 +08:00
tian.guangyuan
d00db5e1be 【fix】 完成活动邀请模块相关功能,并自测;存在问题:图片回显 2020-05-11 17:43:11 +08:00
tian.guangyuan
0444e1d158 【fix】 完成活动邀请部分页面的功能 2020-05-10 19:24:47 +08:00
tian.guangyuan
63ad9302b1 【fix】 完成 活动详情 的接口对接 2020-05-09 11:56:11 +08:00
tian.guangyuan
e2f4c65e7e 【new】 新增活动邀请模块的相关页面、路由、 2020-05-08 13:05:49 +08:00
yuweiqi
53f4d6b747 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-05-06 15:21:01 +08:00
yuweiqi
c6ec60eb1e [NEW]【更换人脸识别厂商】增加微信端获取腾讯人脸识别相关接口 2020-05-06 15:16:54 +08:00
yuweiqi
2a4a332aae [NEW]【保全-联系方式变更】新增保全详情查询接口 2020-05-06 13:27:34 +08:00
tian.guangyuan
83a84c8e01 Merge branch 'feature/GFRS-218【待确认】保全-受益人变更' into dev
# Conflicts:
#	src/config/urlMap.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-05-06 10:01:26 +08:00
tian.guangyuan
d0451f5699 Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into release/0430 2020-04-30 15:47:41 +08:00
tian.guangyuan
f0f87ae8b3 Merge branch 'dev_claim' into feature/GFRS【】理赔_claim
# Conflicts:
#	src/api/ebiz/claims/claims.js
#	src/assets/js/utils/data-dictionary.js
#	src/assets/js/utils/jump.js
#	src/components/ebiz/agentEenter/RsTop.vue
#	src/router/ebiz/index.js
#	src/store/index.js
#	src/views/ebiz/sale/InsuredInfo.vue
2020-04-29 15:52:55 +08:00
tian.guangyuan
da82ca7f15 Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
# Conflicts:
#	src/views/ebiz/cardList/Pay.vue
2020-04-29 14:42:00 +08:00
tian.guangyuan
caacb5672c 【fix】 卡单模块增加换卡支付 2020-04-29 14:13:24 +08:00
yuweiqi
48b5977edc Merge branch 'feature/GFRS-247【待确定】卡单产品投保' 2020-04-29 09:22:56 +08:00
yuweiqi
6fb55c2074 Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev 2020-04-24 10:02:48 +08:00
yuweiqi
3ba1b6e12a [NEW]【卡单】增加我的订单,接口 2020-04-24 09:59:01 +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
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
tian.guangyuan
d74a9601f0 职业控件优化:
1. 增加常用职业栏
2. 将常用职业栏的数据从后台获取
3. 优化搜索关键词显示词条,显示三级职业
4. 在搜索职业时,将搜索内容标红
2020-04-16 15:43:43 +08:00
yuweiqi
87614584cc [NEW]【保全-续期】增加客户搜索接口 2020-04-15 22:03:34 +08:00
tian.guangyuan
36cf165351 [new] 新增保全-受益人变更功能,页面逻辑基本完成,部分页面因接口问题暂时无法继续开发 2020-04-15 13:06:33 +08:00
tian.guangyuan
3c6972e0ed 【fix】 保全-联系方式变更 , 自测并修复bug 2020-04-14 10:04:48 +08:00
tian.guangyuan
f0abc8b160 Merge branch 'feature/GFRS-217【待确定】保全-续期账号变更' into feature/GFRS-216【待确定】保全-联系方式变更
# Conflicts:
#	src/api/ebiz/preserve/preserve.js
#	src/views/ebiz/preserve/Search.vue
2020-04-10 17:48:03 +08:00
yuweiqi
625b35f9b2 [NEW]保全-公用页面-搜索客户页面 2020-04-09 19:24:07 +08:00