Commit Graph

81 Commits

Author SHA1 Message Date
heweijie
397c9c7e7c Merge branch 'feature/GFRS-1623【待确定】隐私政策' into release/0807 2020-08-07 18:24:09 +08:00
mengxiaolong
7a71109148 Merge branch 'feature/GFRS-232【待确定】业绩查询' into release/0803
# Conflicts:
#	src/main.js
#	src/router/ebiz/index.js
2020-08-04 15:10:59 +08:00
mengxiaolong
4be7d9a9cb Merge branch 'feature/GFRS-1373【待确定】理赔银行卡鉴权' into release/0803
# Conflicts:
#	src/api/ebiz/sale/sale.js
2020-08-03 11:04:58 +08:00
zhu.wenli@ebiz-digits.com
7513948ad9 机构业绩页面 2020-07-30 21:21:28 +08:00
huichao
24e7bdef96 img路径拼接 2020-07-29 13:19:12 +08:00
huichao
3a99c0b40b 日历渲染,接口调用 2020-07-25 15:23:36 +08:00
huichao
68571f0ec3 业绩查询功能 2020-07-24 14:51:57 +08:00
huichao
73e81e37fa 业绩查询页面搭建 2020-07-21 15:05:41 +08:00
yuweiqi
d41e451457 [NEW]【隐私政策】新增隐私政策 2020-07-06 11:11:48 +08:00
tian.guangyuan
9cf8f73d52 [fix] 修改 商品商城->VIP专区, 分享会获取上一次的分享时保存的账号密码 2020-06-24 14:04:26 +08:00
yuweiqi
e9bff1ad57 [FIX]【商品商城】增加接口 2020-06-17 17:02:50 +08:00
yuweiqi
f7419c4f6b [NEW]【商品商城】新增商品商城模块相关页面 2020-06-17 10:58:05 +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
903d7cddf9 【fix】 添加校验银行卡信息接口调用 2020-05-23 20:15:19 +08:00
yuweiqi
c73ba17fc1 [NEW]【电投-桂企】增加投保人信息工作单位选择框;增加代理人售卖权限校验;增加投保人工作单位投保资格校验 2020-05-23 15:24:33 +08:00
tian.guangyuan
c984b404e1 [fix] 理赔:人脸识别在微信端修改微信的人脸识别 2020-05-14 15:18:03 +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
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
3ba1b6e12a [NEW]【卡单】增加我的订单,接口 2020-04-24 09:59:01 +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
tian.guangyuan
42ddddadcf Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into release/0407
# Conflicts:
#	src/views/app/Home.vue
2020-04-07 11:10:41 +08:00
tian.guangyuan
1646d0faad Merge branch 'feature/GFRS-715【0402】人力发展-个人中心' into release/0407
# Conflicts:
#	src/assets/js/utils/validator.js
#	src/router/ebiz/index.js
2020-04-07 11:08:42 +08:00
tian.guangyuan
b3393fd375 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析
# Conflicts:
#	src/api/ebiz/manpower/manpower.js
#	src/views/ebiz/manpower/discAnalysis/List.vue
#	src/views/ebiz/manpower/discAnalysis/Share.vue
2020-04-01 17:37:37 +08:00
tian.guangyuan
e2c2933979 [fix] 完成 DISC 问卷 部分 的问卷页和问卷结果页 2020-04-01 17:33:18 +08:00
yuweiqi
42d17251ce [NEW]DISC-列表页、封面页 2020-04-01 17:31:50 +08:00
阳华祥
01e68195ec Merge branch 'nbs' into release/0401
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/config/index.js
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
2020-04-01 15:25:33 +08:00
tian.guangyuan
ec0af28171 人发模块 代码格式化 2020-04-01 10:26:09 +08:00
tian.guangyuan
04e4251b86 【fix】 临时保存,已完成 DISC 部分的结果页面结构,未对接 数据 2020-03-31 18:11:27 +08:00
史旭文
654444fac7 添加埋点 2020-03-17 18:32:35 +08:00
tian.guangyuan
12e74957d7 [fix] 完善 人力发展-培训上岗-增员分享 的微信分享配置参数 2020-03-17 13:44:44 +08:00
tian.guangyuan
5b4e332392 【new】 完成人力发展-个人中心模块接口对接 2020-03-17 13:20:38 +08:00
ding.zhou
d760b13c1c 需求:GFRS-718 电投人脸识别不成功处理
变更:新增处理
变更人:丁洲
2020-03-16 23:19:31 +08:00
tian.guangyuan
da9c2a2a2e Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理
# Conflicts:
#	src/components/ebiz/manpower/TalentPoolItem.vue
#	src/views/ebiz/manpower/ActiveManagement.vue
2020-03-16 18:03:25 +08:00
tian.guangyuan
148e4381d9 [new] 完成 人发系统 - 人才库 - 新增、修改、列表 2020-03-16 17:31:10 +08:00
史旭文
dbcfdcc485 修改完善增员日志功能 2020-03-16 17:29:27 +08:00
史旭文
8705245e40 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理 2020-03-13 18:56:55 +08:00
史旭文
4204110102 联调统计日志接口 2020-03-13 18:56:44 +08:00
tian.guangyuan
e893a37941 Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-717【0402】人力发展-活动量管理
# Conflicts:
#	src/router/ebiz/manpower.js
2020-03-13 18:30:35 +08:00
tian.guangyuan
36c0f111bc 【new】
开发完成人才库列表
正在开发人才库-新增人才
2020-03-13 18:26:48 +08:00
史旭文
a9f74d2ad8 添加活动量管理页面也功能 2020-03-13 18:16:29 +08:00
tian.guangyuan
ffdf3d5e3c [NEW] 新增文件 : api配置文件、 mock配置文件、表单验证文件 2020-03-12 11:09:57 +08:00
阳华祥
59f2f47f39 GFRS-653【待确定】三月三活动 产品类型二维码修改 --提交人:阳华祥 2020-03-02 16:14:58 +08:00
yuweiqi
fc3a455bf5 [NEW]nbs-客户清单下载功能 2020-02-27 11:58:25 +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