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

6308 Commits

Author SHA1 Message Date
阳华祥
b532f40ddb Merge branch 'feature/GFRS-454【0326】建议书优化2.0' into dev 2020-04-07 14:07:52 +08:00
阳华祥
e992d162e3 GFRS-454【0326】 建议书优化2.0 --页面调整 --提交人：阳华祥 2020-04-07 14:03:43 +08:00
tian.guangyuan
068f2383e9 Merge branch 'hotfix/nbs-返回结果页按钮功能变更' into release/0407 2020-04-07 13:38:33 +08:00
tian.guangyuan
0185a64f72 Merge branch 'hotfix/nbs-返回结果页按钮功能变更' into dev 2020-04-07 13:32:49 +08:00
tian.guangyuan
a3b2be46e7 [hotfix] 修复 nbs 结果页面 左上角返回按钮跳转功能 。 由 跳转到 返回上一页 变更为返回上两页， 
修改左上角图标为 × 状
 2020-04-07 13:32:40 +08:00
tian.guangyuan
38c02179c9 Merge branch 'hotfix/nbs-返回结果页按钮功能变更' into dev 2020-04-07 13:27:54 +08:00
tian.guangyuan
c05bf037b4 [hotfix] 修复 nbs 结果页面 左上角返回按钮跳转功能 。 由 跳转到 返回上一页 变更为返回上两页， 
修改左上角图标为 × 状
 2020-04-07 13:27:43 +08:00
tian.guangyuan
028229a478 Merge branch 'hotfix/nbs-返回结果页按钮功能变更' into dev 
# Conflicts:
#	src/router/ebiz/index.js
#	src/views/app/Home.vue
 2020-04-07 13:10:28 +08:00
tian.guangyuan
edc267d99b [hotfix] 修复 nbs 结果页面 左上角返回按钮跳转功能 。 由 跳转到 nbs/nav 修改为 nbs/list 2020-04-07 13:07:46 +08:00
tian.guangyuan
42ddddadcf Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into release/0407 
# Conflicts:
#	src/views/app/Home.vue
 2020-04-07 11:10:41 +08:00
tian.guangyuan
30611b97fc Merge branch 'feature/GFRS-717【0402】人力发展-活动量管理' into release/0407 2020-04-07 11:09:03 +08:00
tian.guangyuan
1646d0faad Merge branch 'feature/GFRS-715【0402】人力发展-个人中心' into release/0407 
# Conflicts:
#	src/assets/js/utils/validator.js
#	src/router/ebiz/index.js
 2020-04-07 11:08:42 +08:00
tian.guangyuan
f0d60eff9a Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-07 10:18:35 +08:00
tian.guangyuan
ba80e3c72b 【fix】 将 DISC性格分析列表页 的展示字段添加一项（手机号） 2020-04-07 10:18:01 +08:00
tian.guangyuan
ae58d6569e Merge branch 'feature/GFRS-730【0326】国富人寿附加综合意外伤害保险' into dev 2020-04-03 18:15:39 +08:00
tian.guangyuan
ae78daa0c3 【fix】 修复 投保流程中 27 天 的bug，修改为28天 2020-04-03 16:17:17 +08:00
tian.guangyuan
f40b7f613a Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-03 15:40:11 +08:00
tian.guangyuan
95af11c77f Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' of http://112.124.100.131/GFRS/ebiz-h5 into feature/GFRS-818【0410】人力发展-DISC性格分析 2020-04-03 15:40:00 +08:00
tian.guangyuan
2059ead985 [fix] 修复bug GFRS-897 问卷填写页面标题展示 页面名字显示"DISC性格分析结果"实际应显示"DISC性格分析" 2020-04-03 15:35:26 +08:00
tian.guangyuan
a970c4069a 【new】 完成贺报模块的部分功能 2020-04-03 14:42:37 +08:00
yuweiqi
167ac317ed Merge branch 'feature/GFRS-818【0410】人力发展-DISC性格分析' into dev 2020-04-03 13:48:56 +08:00
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