hz/ebiz-h5
1
0
Fork 0
mirror of http://112.124.100.131/GFRS/ebiz-h5.git synced 2025-12-22 22:16:44 +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
yuweiqi
bcbd3a40f4 [FIX]bug-DISC分享到朋友圈-无标题 2020-04-03 13:48:21 +08:00
yuweiqi
6fd132013a Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-03 12:21:41 +08:00
yuweiqi
6d2fc02360 [FIX]DISC-列表页-样式调整、分页查询调整 2020-04-03 12:18:55 +08:00
阳华祥
11a448e4a2 Merge branch 'feature/GFRS-454【0326】建议书优化2.0' into dev 2020-04-03 11:27:08 +08:00
阳华祥
c0ce364118 GFRS-454【0326】 建议书优化2.0 --页面样式调整 --提交人：阳华祥 2020-04-03 11:24:17 +08:00
阳华祥
aa36a34348 Merge branch 'feature/GFRS-454【0326】建议书优化2.0' into dev 
# Conflicts:
#	src/assets/js/utils/data-dictionary.js
#	src/views/ebiz/proposal/Exhibition.vue
 2020-04-03 10:18:04 +08:00
tian.guangyuan
a771cbaa85 Merge branch 'feature/GFRS-765【0423】电投自核规则前端进行转译提示' into dev 2020-04-03 10:08:53 +08:00
tian.guangyuan
806117a135 【fix】 修复bug 
GFRS-878  受益人信息页面，2--16岁小朋友校验，校验失效
GFRS-875  受益人信息页面，缺少未满2周岁儿童，校验
GFRS-868  受益人是被保人父母、子女 ，校验提框 与 被保人信息页面不一致
 2020-04-03 10:08:03 +08:00
阳华祥
d53ad24e1e GFRS-454【0326】 建议书优化2.0 --页面跳转处理 --提交人：阳华祥 2020-04-03 09:52:23 +08:00
tian.guangyuan
9d85fd49d2 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-02 09:52:38 +08:00
tian.guangyuan
96c252a1da 【fix】 修复在 结果页面 ， 答案项 DISC 未按顺序排列， 特殊情况下， DISC 答案项缺失 2020-04-02 09:51:59 +08:00
yuweiqi
63358b6b7c [FIX]DISC-localStorage.answerList 2020-04-02 09:16:23 +08:00
yuweiqi
ffb3c7c355 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-01 18:55:44 +08:00
yuweiqi
9740e42ee4 [FIX]DISC将token和shareTime从封面页面带到答题页 2020-04-01 18:55:15 +08:00
yuweiqi
874ede2394 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-01 18:51:38 +08:00
yuweiqi
b0bdc75701 [FIX]DISC将token和shareTime从封面页面带到答题页 2020-04-01 18:51:16 +08:00
yuweiqi
10c3b73037 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-01 18:38:58 +08:00
yuweiqi
c2c0c2aa3f [FIX] 2020-04-01 18:36:57 +08:00
yuweiqi
d3ba01c3de [FIX]DISC-列表页-answerList放入localStorage中 2020-04-01 18:24:39 +08:00
yuweiqi
290acf58f6 [FIX]DISC-列表页-查看结果按钮页面跳转路径修改、列表页背景颜色修改 2020-04-01 18:20:12 +08:00
tian.guangyuan
33b1b523e9 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-01 18:06:34 +08:00
tian.guangyuan
1029ec97ab [fix] 修复 在 答题页面和 答题结果页面 提示未登录的问题 2020-04-01 18:05:45 +08:00
tian.guangyuan
6b968d14f0 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-01 17:55:05 +08:00
tian.guangyuan
3f9ef74d07 [fix] 添加 人力发展-DISC性格分析 功能到 dev 分支，含添加静态图片 2020-04-01 17:53:57 +08:00
tian.guangyuan
eff7f61d04 【fix】 修复 被覆盖的 代码文件 \ebiz-h5\src\views\ebiz\manpower\discAnalysis\List.vue bug 2020-04-01 17:45:05 +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
yuweiqi
b11a51e63e Merge branch 'feature/GFRS-597【电投页面优化】' into dev 2020-04-01 16:43:34 +08:00
yuweiqi
208e052dbf [FIX]bug-GFRS-859-修改保单详情页面标题为“投保单信息” 2020-04-01 16:43:00 +08:00
yuweiqi
da95910451 [FIX]bug_GFRS-861-电投优化-选择产品信息后需要通过下一步按钮才能进入受益人页面 2020-04-01 16:42:02 +08:00
yuweiqi
91447c9668 Merge branch 'hotfix/bug_回归测试问题及优化' into release/0401 
# Conflicts:
#	src/views/ebiz/serve/Detail.vue
 2020-04-01 16:24:10 +08:00
yuweiqi
fecf0e357d Merge branch 'hotfix/bug_GFRS-832_自助入司-影像信息上传页，影像上传有误' into release/0401 2020-04-01 15:59:17 +08:00
yuweiqi
0578ef1cff Merge branch 'hotfix/bug_回归测试问题及优化' into dev 2020-04-01 15:43:08 +08:00
yuweiqi
48abf29739 [FIX]保单查询-核心查询失败返回result为“1”时，resultMessage也为空时，页面显示暂无投保单 2020-04-01 15:42:43 +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
abc0a8607f Merge branch 'feature/GFRS-834【0402】国富人寿国富栋梁定期寿险' into dev 2020-04-01 10:27:28 +08:00
tian.guangyuan
ec0af28171 人发模块 代码格式化 2020-04-01 10:26:09 +08:00
tian.guangyuan
62be77957b Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析 2020-04-01 10:21:53 +08:00
yuweiqi
ef634bf9d3 [FIX]DISC-修改图片名称 2020-04-01 10:07:22 +08:00
tian.guangyuan
1054b6ec16 Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析 2020-04-01 10:03:42 +08:00
tian.guangyuan
a6431274cb 【fix】 暂时完成 国富栋梁定期寿险 的交费期间、保险期间的联动关系验证从后台获取。 
待测试配置是否正确
 2020-04-01 09:46:05 +08:00
yuweiqi
86f8c19994 [FIX]DISC-修改错误路由 2020-03-31 19:09:19 +08:00
yuweiqi
53da4c6d33 [NEW]DISC-新增封面图 2020-03-31 19:08:29 +08:00
tian.guangyuan
04e4251b86 【fix】 临时保存，已完成 DISC 部分的结果页面结构，未对接 数据 2020-03-31 18:11:27 +08:00
yuweiqi
17bd612b22 Merge branch 'nbs' into dev 2020-03-31 15:30:51 +08:00
yuweiqi
7c2af127d2 [IMP]nbs-优化-应备费用-子女教育年龄 2020-03-31 15:30:24 +08:00
tian.guangyuan
b3538eb192 Merge branch 'feature/GFRS-834【0402】国富人寿国富栋梁定期寿险' into dev 2020-03-31 14:51:28 +08:00
tian.guangyuan
5903df5ef6 【fix】 暂时完成 国富栋梁定期寿险 的交费期间、保险期间的联动关系验证从后台获取。 
待确认效果是否可行
 2020-03-31 14:46:38 +08:00
yuweiqi
03f0244023 Merge branch 'nbs' into dev 2020-03-31 12:00:28 +08:00