hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-23 08:46:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,467 Commits 232 Branches 17 Tags
f3ad84884a6bf869fc2a4d544f11b51e15c5889c
Commit Graph

7467 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
yuweiqi
3bd4d4258a [FIX]【建议书】被保人字段显示改为被保险人 2020-04-29 12:06:25 +08:00
wangmingzhe
ce78e72fca Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev 2020-04-29 11:58:11 +08:00
wangmingzhe
3013c8b7f6 [NEW] 卡单支付页面将银行卡信息通过路由传参传递当微信端 2020-04-29 11:57:58 +08:00
yuweiqi
69731e0133 [FIX]【建议书】被保人字段改为”被保险人“ 2020-04-29 11:54:51 +08:00
wangmingzhe
22fcc108f1 Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev 2020-04-29 11:41:02 +08:00
wangmingzhe
7e5137f58a [NEW] 放开卡单支付页面选择微信支付时银行卡信息的隐藏，添加微信端打开页面遮罩 2020-04-29 11:40:39 +08:00
yuweiqi
1e0b4fe94e Merge branch 'hotfix/bug_【保单查询】显示字段修改【电投】16岁及16岁以下工作单位默认值为无' into dev 2020-04-29 11:34:17 +08:00
yuweiqi
252dc20cb0 [FIX]【保单列表】无数据时，提示“暂无投保单” 2020-04-29 11:33:45 +08:00
yuweiqi
e9876f99b7 Merge branch 'hotfix/bug_【保单查询】显示字段修改【电投】16岁及16岁以下工作单位默认值为无' into dev 2020-04-29 11:30:57 +08:00
yuweiqi
2605cbe40a [IMP]【电投】投被保人页面-年龄小于等于16周岁，工作单位增加默认值“无” 2020-04-29 11:30:36 +08:00
yuweiqi
e5793e85bd Merge branch 'hotfix/bug_【保单查询】显示字段修改【电投】16岁及16岁以下工作单位默认值为无' into dev 2020-04-29 11:06:05 +08:00
yuweiqi
7621d559e1 [fix]【电投】投保人页面代码格式化 2020-04-29 11:05:35 +08:00
wangmingzhe
a9ef3df266 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-04-29 10:51:57 +08:00
yuweiqi
30f56a9c12 Merge branch 'hotfix/bug_【保单查询】显示字段修改【电投】16岁及16岁以下工作单位默认值为无' into dev 2020-04-29 10:44:19 +08:00
yuweiqi
307f05c0c1 [IMP]【电投】投被保人年龄小于等于16周岁时，工作单位增加默认值“无” 2020-04-29 10:43:32 +08:00
wangmingzhe
53de173323 Merge branch 'dev' of http://112.124.100.131/GFRS/ebiz-h5 into dev 2020-04-29 10:43:23 +08:00
wangmingzhe
36fa7b0b36 Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev 2020-04-29 10:43:02 +08:00
wangmingzhe
dfcfa6ec57 [NEW] 尝试修改卡单支付微信打开直接调起收银台问题 2020-04-29 10:42:47 +08:00
tian.guangyuan
3109a1cf3c Merge branch 'feature/GFRS-1020【0521】国富人寿附加豁免保险费重大疾病保险关连3款主险产品' into dev 2020-04-29 10:42:06 +08:00
yuweiqi
eb5235b2b9 [FIX]【保单列表】无数据时提示语改为"暂无保单" 2020-04-29 10:41:02 +08:00
tian.guangyuan
275674c776 【fix】 修复 国富人寿附加豁免保险费重大疾病保险在试算页面，责任取保费时，数值取错的问题 2020-04-29 10:40:37 +08:00
wangmingzhe
7b17ec78ef Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev 2020-04-29 10:14:50 +08:00
wangmingzhe
3d8c09fa5e [NEW] 尝试修复微信端打开支付页自动调起收银台问题 2020-04-29 10:14:18 +08:00
wangmingzhe
6bd7487e0a Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev 2020-04-29 09:51:38 +08:00