hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-22 23:26:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
5,842 Commits 232 Branches 17 Tags
6ac9e4db87dffe3b86524b79fb360a8090adc67c
Commit Graph

5842 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
mengxiaolong
92279f2bfe Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-12-23 13:25:12 +08:00
mengxiaolong
7a131e576f Merge branch 'feature/个险业绩排行优化' into dev 2020-12-23 13:23:44 +08:00
mengxiaolong
5fde868db3 总保费字段误差处理 2020-12-23 13:21:53 +08:00
yang.huaxiang
5d2abad960 Merge branch 'feature/GFRS-2116【待确定】国富人寿附加住院医疗保险' into dev 
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
 2020-12-23 13:20:17 +08:00
yang.huaxiang
70caa4fa4f 国富人寿附加住院医疗保险(B款): 产品上线代码调整 --提交人：阳华祥 2020-12-22 15:50:17 +08:00
yang.huaxiang
1b1e4e8c0a Merge remote-tracking branch 'origin/dev' into dev 2020-12-22 11:24:48 +08:00
yang.huaxiang
a57d62eac1 国富人寿附加住院医疗保险(B款): 产品上线代码调整 --提交人：阳华祥 2020-12-22 11:23:58 +08:00
mengxiaolong
bbd3716beb Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-12-22 10:28:49 +08:00
mengxiaolong
aa06bd4f4c Merge branch 'hotfix/账户信息回显银行卡省市' into dev 
# Conflicts:
#	src/views/ebiz/sale/AccountInformation.vue
 2020-12-22 10:28:22 +08:00
mengxiaolong
bf2450a6b8 银行卡账户省市信息回显 2020-12-22 10:23:06 +08:00
yang.huaxiang
d6b5a6a2f5 Merge branch 'feature/GFRS-2117【待确定】国富人寿附加豁免重大疾病保险（B款）' into dev 
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
 2020-12-22 10:09:42 +08:00
mengxiaolong
c033fe3dc7 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 2020-12-21 17:23:33 +08:00
mengxiaolong
3482433229 从建议书进入, 豁免险保费空值特殊处理 2020-12-21 17:22:42 +08:00
mengxiaolong
3cdd3b236d Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 2020-12-21 14:30:57 +08:00
mengxiaolong
616fc616c5 GFRS_A0007与GFRS_0001做相同特殊处理 2020-12-21 14:29:55 +08:00
mengxiaolong
1738134b4a Revert "民鑫、瑞利年金、鑫享年金、稳赢两全+附加定寿B特殊处理" 
This reverts commit 46fd38ef5d.
 2020-12-21 14:09:24 +08:00
mengxiaolong
06df43187a Revert "附加豁免定寿B+民鑫年金、瑞利年金、鑫享年金、稳赢两全保险: 附加险保额取主险保费" 
This reverts commit 1a5a5d2982.
 2020-12-21 14:09:03 +08:00
mengxiaolong
1bd2e7cc42 Revert "附加豁免定寿B+民鑫年金、瑞利年金、鑫享年金、稳赢两全保险: 附加险保额取主险保费" 
This reverts commit d33046db43.
 2020-12-21 14:08:48 +08:00
mengxiaolong
3ba66302b4 Revert "附加豁免定寿B+孝心,栋梁,稳赢: 保险期间同主险交费期间" 
This reverts commit 12aa74f980.
 2020-12-21 14:08:19 +08:00
yang.huaxiang
2229a1f81f 新产品开发: 国富人寿附加豁免重大疾病保险（B款）产品调整 --提交人：阳华祥 2020-12-21 13:39:48 +08:00
mengxiaolong
942438783d Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 2020-12-21 13:30:02 +08:00
mengxiaolong
12aa74f980 附加豁免定寿B+孝心,栋梁,稳赢: 保险期间同主险交费期间 2020-12-21 13:29:51 +08:00
mengxiaolong
1983e4d973 关闭测试电投人脸 2020-12-21 10:39:39 +08:00
yang.huaxiang
80bbdb7097 Merge branch 'feature/惠桂保添加访问授权控制' into release/1218 2020-12-18 18:05:21 +08:00
mengxiaolong
3442680fb7 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 
# Conflicts:
#	src/views/ebiz/common/CalculatePremium.vue
 2020-12-18 16:59:07 +08:00
mengxiaolong
d33046db43 附加豁免定寿B+民鑫年金、瑞利年金、鑫享年金、稳赢两全保险: 附加险保额取主险保费 2020-12-18 16:57:36 +08:00
yang.huaxiang
1850f582e1 Merge branch 'feature/GFRS-2116【待确定】国富人寿附加住院医疗保险' into dev 2020-12-18 16:46:36 +08:00
yang.huaxiang
ea3864a97a 国富人寿附加住院医疗保险(B款): 产品上线代码调整GFRS_M0031 搭配处理 --提交人：阳华祥 2020-12-18 16:43:32 +08:00
mengxiaolong
4ed57cad72 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 2020-12-18 16:20:06 +08:00
mengxiaolong
1a5a5d2982 附加豁免定寿B+民鑫年金、瑞利年金、鑫享年金、稳赢两全保险: 附加险保额取主险保费 2020-12-18 16:19:55 +08:00
mengxiaolong
1bad45a6e7 Merge branch 'feature/附加定寿B保额同主险保费特殊处理' into dev 2020-12-18 15:16:31 +08:00
mengxiaolong
46fd38ef5d 民鑫、瑞利年金、鑫享年金、稳赢两全+附加定寿B特殊处理 2020-12-18 15:15:00 +08:00
mengxiaolong
4b432b68c6 Merge branch 'hotfix/邮箱校验正则表达式修改' into dev 2020-12-17 17:55:05 +08:00
mengxiaolong
932813aee1 邮箱校验正则表达式修改 2020-12-17 17:54:37 +08:00
mengxiaolong
5514ab5cb7 Merge branch 'feature/GFRS-2069【待确定】白名单管理' into dev 
# Conflicts:
#	src/views/ebiz/preserve/common/HandleResult.vue
 2020-12-17 16:40:32 +08:00
mengxiaolong
8152841e4b 保全白名单 2020-12-17 16:39:23 +08:00
yang.huaxiang
d6afb861a5 Merge branch 'feature/GFRS-2116【待确定】国富人寿附加住院医疗保险' into dev 2020-12-17 10:41:52 +08:00
yang.huaxiang
46763c48fe 国富人寿附加住院医疗保险(B款): 产品上线代码调整 --提交人：阳华祥 2020-12-17 10:18:36 +08:00
mengxiaolong
c9fb51647d 修改国籍编码使用字符串比较问题 2020-12-16 21:43:43 +08:00
mengxiaolong
65c0c16eff Merge branch 'hotfix/修改国籍编码使用字符串比较问题' into dev 
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/assets/js/utils/request.js
#	src/router/ebiz/index.js
#	src/views/ebiz/sale/List.vue
 2020-12-16 15:58:33 +08:00
mengxiaolong
cb9f342a2c 修改使用字符串比较国籍编码问题 2020-12-16 15:55:26 +08:00
mengxiaolong
5bb72f5046 Merge branch 'hotfix/修改问题件提交无响应问题' into release/1215 2020-12-15 18:02:34 +08:00
mengxiaolong
a1fc9ab37a Merge branch 'feature/开门红' into release/1215 2020-12-15 13:17:46 +08:00
mengxiaolong
187626909e Merge branch 'feature/海报默认展示产品' into release/1215 2020-12-15 10:58:33 +08:00
mengxiaolong
c374aabd89 删除多余代码 2020-12-15 10:58:21 +08:00
mengxiaolong
b3b788311b Merge branch 'feature/人核保单显示撤单按钮' into release/1215 
# Conflicts:
#	src/views/ebiz/sale/List.vue
 2020-12-15 10:43:06 +08:00
mengxiaolong
582c2bb70e Merge branch 'feature/电投自动撤单添加验证码校验' into release/1215 
# Conflicts:
#	src/views/ebiz/sale/List.vue
 2020-12-15 10:31:02 +08:00
mengxiaolong
e547871c27 Merge branch 'feature/GFRS-706【0326】电投添加自动撤单功能' into release/1215 
# Conflicts:
#	src/api/ebiz/sale/sale.js
#	src/views/ebiz/sale/List.vue
 2020-12-15 10:16:08 +08:00
mengxiaolong
d52de42b64 Merge branch 'feature/海报默认展示产品' into dev 
# Conflicts:
#	src/router/ebiz/index.js
 2020-12-15 09:48:49 +08:00
mengxiaolong
50e40cb348 格式化代码, 海报默认显示产品 2020-12-15 09:46:22 +08:00