hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-25 03:42:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,366 Commits 232 Branches 17 Tags
ca5c62d1a2c65f1cd0a93ec6fb48adf4a17df9f6
Commit Graph

2366 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
tian.guangyuan
ca5c62d1a2 Merge branch 'feature/GFRS-1036【待确定】微信支付-卡单微信支付' into dev 2020-05-08 15:44:44 +08:00
tian.guangyuan
4db2742ae1 【fix】 处理微信支付时，不在需要输入银行卡号信息 2020-05-08 15:44:26 +08:00
tian.guangyuan
39199aec19 Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev 2020-05-08 15:17:38 +08:00
tian.guangyuan
8e6a98ba26 Revert "【fix】 修复 bug GFRS-1185 【对接包容微信支付】选择支付方式页面-选择微信支付，页面缺少温馨提示" 
This reverts commit b1e20c02ed.
 2020-05-08 15:17:14 +08:00
tian.guangyuan
7d75e3290f Merge branch 'feature/GFRS-1036【待确定】对接保融微信支付' into dev 2020-05-08 14:16:26 +08:00
tian.guangyuan
b1e20c02ed 【fix】 修复 bug GFRS-1185 【对接包容微信支付】选择支付方式页面-选择微信支付，页面缺少温馨提示 
GFRS-1188 【微信支付】扫码支付页面，点击返回 电投流程（自测）
 2020-05-08 14:14:59 +08:00
yuweiqi
4309952167 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-08 13:51:59 +08:00
yuweiqi
36480504ec [FIX]【更换人脸识别厂商微信端】微信环境下-人脸识别次数使用路由传参记录传递 2020-05-08 13:51:42 +08:00
yuweiqi
d8ae673a6b Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-08 09:53:27 +08:00
yuweiqi
e2e99a402c [FIX]【更换人脸识别厂商微信端】调获取人脸识别结果接口条件更改 2020-05-08 09:53:07 +08:00
yuweiqi
b000ca3345 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 20:54:37 +08:00
yuweiqi
38b8a72bd7 [FIX]【更换人脸识别厂商微信端】调获取人脸识别结果接口条件更改 2020-05-07 20:53:26 +08:00
yuweiqi
72436fa3d9 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 20:34:58 +08:00
yuweiqi
b061a8fcfc [FIX]【更换人脸识别厂商微信端】打log调试 2020-05-07 20:33:28 +08:00
yuweiqi
2a669da314 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 20:19:44 +08:00
yuweiqi
98a91f474f [FIX]【更换人脸识别厂商微信端】打log调试 2020-05-07 20:19:28 +08:00
yuweiqi
aba8be0873 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 19:59:38 +08:00
yuweiqi
d2cd89f0db [FIX]【更换人脸识别厂商微信端】打log调试 2020-05-07 19:59:15 +08:00
yuweiqi
b7c8cafb21 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 19:33:18 +08:00
yuweiqi
63200ff1c5 [FIX]【更换人脸识别厂商微信端】打log调试 2020-05-07 19:33:02 +08:00
yuweiqi
207df84f68 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 19:00:26 +08:00
yuweiqi
8ca71cee33 [FIX]【更换人脸识别厂商微信端】获取人脸识别结果接口 2020-05-07 18:59:09 +08:00
yuweiqi
5382e226c4 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 18:37:53 +08:00
yuweiqi
8137c615c2 [FIX]【更换人脸识别厂商微信端】调整接口调用逻辑 2020-05-07 18:37:38 +08:00
yuweiqi
a801f6e5da Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 16:52:12 +08:00
yuweiqi
d848f9fccf [FIX]【更换人脸识别厂商微信端】修改调试时的字段值 2020-05-07 16:51:57 +08:00
yuweiqi
31fe6d51fe Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 16:49:02 +08:00
yuweiqi
b8348f4559 [FIX]【更换人脸识别厂商】取消调用UploadImageFile组件；签名页分享到微信url修改，减少url长度，页面初始化所需参数从请求后端接口并调用intLocalStorage方法后的localStorage中取 2020-05-07 16:47:59 +08:00
yuweiqi
901e84fe8e Merge branch 'hotfix/bug_【保单查询】显示字段修改【电投】未成年人工作单位默认值为无' into dev 2020-05-07 13:10:05 +08:00
yuweiqi
7452094a2a [IMP]【电投】投保人出生日期-日期手动选择限制为最小16周岁 2020-05-07 13:09:29 +08:00
yuweiqi
97f5f68858 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-07 11:30:43 +08:00
yuweiqi
2fe9df9a44 [FIX]【更换人脸识别厂商微信端】获取腾讯人脸识别url，并跳转到该url 2020-05-07 11:28:29 +08:00
yuweiqi
5f81586534 Merge branch 'hotfix/bug_【保单查询】显示字段修改【电投】未成年人工作单位默认值为无' into dev 2020-05-06 19:42:39 +08:00
yuweiqi
afa9b83744 [FIX]【电投】被保人页面去掉无用代码 2020-05-06 19:42:25 +08:00
yuweiqi
86df123638 Merge branch 'feature/GFRS-860【0514】更换人脸识别厂商-微信端' into dev 2020-05-06 15:38:13 +08:00
yuweiqi
679d88a58a [FIX]【更换人脸识别厂商微信端】干掉原接口白名单 2020-05-06 15:37:54 +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
ef1ec1a428 Merge branch 'hotfix/bug_【保单查询】显示字段修改【电投】16岁及16岁以下工作单位默认值为无' into dev 2020-05-06 13:17:52 +08:00
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