yuweiqi
|
e69b470b77
|
[IMP]【电投】优化-被保人证件类型为出生证和户口本时，默认为长期；优化-投被保人年龄小于18周岁，默认工作单位为“无”
|
2020-05-06 13:15:36 +08:00 |
|
tian.guangyuan
|
520e17fc76
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
|
2020-05-06 11:53:08 +08:00 |
|
tian.guangyuan
|
904468f9b6
|
【fix】修复微信支付分享存在的问题
|
2020-05-06 11:52:50 +08:00 |
|
tian.guangyuan
|
899bc2a6a2
|
【fix】将dev环境的卡单支付强制更新为 卡单微信支付分支 的代码
|
2020-05-06 11:22:56 +08:00 |
|
tian.guangyuan
|
3c0d43601f
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
# Conflicts:
# src/views/ebiz/cardList/Pay.vue
|
2020-05-06 11:09:06 +08:00 |
|
tian.guangyuan
|
753d63f613
|
【fix】 增加注释
|
2020-05-06 11:08:15 +08:00 |
|
tian.guangyuan
|
7bd86b51fa
|
Merge branch 'feature/GFRS-218【待确认】保全-受益人变更' into dev
# Conflicts:
# src/router/ebiz/index.js
|
2020-05-06 11:04:12 +08:00 |
|
tian.guangyuan
|
a652f3960a
|
[fix] 无变化
|
2020-05-06 11:03:10 +08:00 |
|
tian.guangyuan
|
033032f2f9
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
# Conflicts:
# src/views/ebiz/cardList/Pay.vue
|
2020-05-06 10:48:16 +08:00 |
|
tian.guangyuan
|
ef28490c24
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into feature/GFRS-1036【待确定】微信支付-卡单微信支付
# Conflicts:
# src/views/ebiz/cardList/Pay.vue
|
2020-05-06 10:45:53 +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
|
36f053a9bf
|
【fix】页面按照接口文档进行微调
|
2020-05-06 09:54:30 +08:00 |
|
yuweiqi
|
873b99b8ca
|
Merge branch 'feature/GFRS-1125【0526】国富人寿安行无忧两全保险' into dev
|
2020-05-06 09:49:48 +08:00 |
|
yuweiqi
|
d084d75c8b
|
[FIX]【国富人寿安行无忧两全保险】扩充前端数据字典-建议书利益演算、pdf分享title字典
|
2020-05-06 09:37:31 +08:00 |
|
tian.guangyuan
|
d0451f5699
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into release/0430
|
2020-04-30 15:47:41 +08:00 |
|
tian.guangyuan
|
8284e6a000
|
Merge branch 'feature/GFRS【】理赔_claim' into dev
|
2020-04-30 15:42:28 +08:00 |
|
tian.guangyuan
|
b5d80d0f76
|
【fix】 修复医院搜索时，卡顿问题；不全量加载出所有医院数据
|
2020-04-30 15:42:13 +08:00 |
|
tian.guangyuan
|
a9ab22eddd
|
Merge branch 'feature/GFRS【】理赔_claim' into dev
|
2020-04-30 13:42:01 +08:00 |
|
tian.guangyuan
|
88b19596ae
|
[fix] 修复在未填写信息下，查询时的报错提示
|
2020-04-30 13:41:48 +08:00 |
|
tian.guangyuan
|
2a3f5e6255
|
Merge branch 'hotfix/职业控件使用体验优化' into dev
|
2020-04-30 13:37:38 +08:00 |
|
tian.guangyuan
|
f3534656f5
|
Merge branch 'feature/GFRS【】理赔_claim' into dev
# Conflicts:
# src/api/ebiz/claims/claims.js
# src/components/ebiz/agentEenter/RsTop.vue
# src/router/ebiz/index.js
# src/store/index.js
|
2020-04-30 13:37:08 +08:00 |
|
tian.guangyuan
|
bf730b015f
|
Merge branch 'feature/GFRS-1020【0521】国富人寿附加豁免保险费重大疾病保险关连3款主险产品' into dev
|
2020-04-30 11:12:06 +08:00 |
|
tian.guangyuan
|
a6b9e77994
|
【fix】 解决试算页面传参错误
|
2020-04-30 10:27:09 +08:00 |
|
tian.guangyuan
|
b3d8b3f1c6
|
【fix】 理赔添加回显（前三个）
|
2020-04-30 09:59:37 +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
|
f981c2af10
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
|
2020-04-29 15:34:10 +08:00 |
|
tian.guangyuan
|
8f0a35e82f
|
【fix】 我的卡单列表中。支付失败（订单状态55/19）可以再次去支付
|
2020-04-29 15:33:55 +08:00 |
|
tian.guangyuan
|
fb1f635589
|
Merge branch 'feature/GFRS-247【待确定】卡单产品投保' into dev
|
2020-04-29 15:17:55 +08:00 |
|
tian.guangyuan
|
59e66114aa
|
【fix】 修复卡单在换卡支付时，银行卡扫描按钮未呈现的问题
|
2020-04-29 15:17:35 +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 |
|
wangmingzhe
|
1865a72ee2
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
|
2020-04-29 14:29:45 +08:00 |
|
wangmingzhe
|
2bea1654a8
|
[NEW] 优化卡单支付代码
|
2020-04-29 14:29:18 +08:00 |
|
tian.guangyuan
|
2691c79700
|
[fix] 修复格式 eslint --fix
|
2020-04-29 14:29:05 +08:00 |
|
tian.guangyuan
|
81f5427c1e
|
【fix】 完善 支付失败后的 换卡支付
|
2020-04-29 14:26:22 +08:00 |
|
wangmingzhe
|
02bfae4ddf
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
|
2020-04-29 14:18:33 +08:00 |
|
wangmingzhe
|
4288ad7b52
|
[NEW] 放开卡单微信支付页面loading，测试完毕
|
2020-04-29 14:18:01 +08:00 |
|
tian.guangyuan
|
caacb5672c
|
【fix】 卡单模块增加换卡支付
|
2020-04-29 14:13:24 +08:00 |
|
wangmingzhe
|
2af5e019b1
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
|
2020-04-29 14:05:04 +08:00 |
|
wangmingzhe
|
b2baee0a28
|
[NEW] 修改卡单支付传值
|
2020-04-29 14:04:51 +08:00 |
|
wangmingzhe
|
4e6266b237
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
|
2020-04-29 13:47:10 +08:00 |
|
wangmingzhe
|
586144ddf3
|
[NEW] 修改卡单投保支付页分享传值
|
2020-04-29 13:46:55 +08:00 |
|
tian.guangyuan
|
75cdf1b762
|
Merge branch 'feature/GFRS-247【卡单】部分变动保存' into feature/GFRS-247【待确定】卡单产品投保
|
2020-04-29 13:37:13 +08:00 |
|
tian.guangyuan
|
4e4920383d
|
【fix】 修改职业控件选择部分的高度
|
2020-04-29 13:35:55 +08:00 |
|
yuweiqi
|
2129ac4e38
|
Merge branch 'hotfix/bug_GFRS【与卡单一起上线】建议书-投保人页-年龄及校验问题' into dev
|
2020-04-29 13:29:23 +08:00 |
|
yuweiqi
|
e57f5390ae
|
[FIX]建议书-被保人字段显示修改为“被保险人”
|
2020-04-29 13:29:03 +08:00 |
|
yuweiqi
|
33320ffea8
|
Merge branch 'hotfix/bug_GFRS【与卡单一起上线】建议书-投保人页-年龄及校验问题' into dev
# Conflicts:
# src/views/ebiz/sale/InsuredInfo.vue
|
2020-04-29 13:07:07 +08:00 |
|
yuweiqi
|
19242fdc5a
|
[fix]解决代码重复提交问题
|
2020-04-29 13:04:56 +08:00 |
|
wangmingzhe
|
a7e759bdf7
|
Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev
|
2020-04-29 12:18:53 +08:00 |
|
wangmingzhe
|
386c6e4bdb
|
[NEW] 修改路由传参方式为localStorage
|
2020-04-29 12:18:29 +08:00 |
|
yuweiqi
|
1d1bcdc641
|
Merge branch 'hotfix/bug_GFRS【与卡单一起上线】建议书-投保人页-年龄及校验问题' into dev
# Conflicts:
# src/views/ebiz/sale/InsuredInfo.vue
|
2020-04-29 12:14:20 +08:00 |
|