Merge branch 'master' of https://github.com/mumuy/relationship

src/module/data/main.js

@@ -235,7 +235,7 @@ export default {
     'w,m,m':['外祖岳母','毑岳母','外祖丈母娘','外祖丈母','外太岳母','姥岳母','姥丈姥','姥丈母','姥丈母娘','老丈娘'],
     'w,f':['岳父','丈人','老丈人','外父','泰山','外舅','老亲爷','丈人爹','老干爷','丈人公','丈母爷','丈爷','丈爷爹','丈父','岳老子','老丈杆子','岳丈','岳翁','妻公','妇翁','冰翁'],
     'w,m':['岳母','丈母','老丈母','外母','泰水','外姑','老亲娘','丈人娘','老干娘','丈人婆','丈母娘','丈姥','丈姥娘','丈姆','岳母娘','丈母婆','丈姆婆','丈姆娘'],
-    'w':['老婆','妻子','媳妇','媳妇儿','太太','妻','女人','新娘','爱姥','妻亲','娘子','新娘子','夫人','婆娘','老太婆','内人','内子','内助','贤内助','爱妻','发妻','婆姨','婆子','老婆子','老婆儿','老婆仔','堂客','爱人','老伴','那口子','配偶','伴侣','伉俪','卿卿'],
+    'w':['老婆','妻子','媳妇','媳妇儿','媳妇子','太太','妻','女人','新娘','爱姥','妻亲','娘子','新娘子','夫人','婆娘','老太婆','内人','内子','内助','贤内助','爱妻','发妻','婆姨','婆子','老婆子','老婆儿','老婆仔','堂客','爱人','老伴','那口子','配偶','伴侣','伉俪','卿卿'],
     'w,ob':['大舅子','大舅哥','大舅佬','大阿舅','丈人兄','舅哥'],
     'w,ob,w':['大舅妇','大妗子','大妗儿','大舅姆','大舅兄嫂','大舅嫂','大舅姐','大舅媳妇','丈人嫂'],
     'w,lb':['小舅子','小舅弟','小舅佬','小阿舅','丈人弟','舅弟'],
@@ -255,13 +255,13 @@ export default {
     // 兄弟姐妹系
     'ob':['哥哥','哥','胞兄','亲哥','兄亲','老哥','依哥','阿哥','兄台','大佬','家兄','兄长','元兄','长兄','几哥'],
     'ob,w':['嫂子','嫂','嫂嫂','阿嫂','家嫂','兄姊','兄嫂','兄妇','兄妻','几嫂'],
-    'ob,s':['侄子','侄男','兄子'],
+    'ob,s':['侄子','兄子'],
     'ob,d':['侄女','兄女'],
     'lb':['弟弟','弟','胞弟','亲弟','弟亲','老弟','依弟','阿弟','弟子','细佬','小弟','几弟'],
     'lb,w':['弟妹','弟媳','弟媳妇','弟媳妇子','弟新妇','老弟嫂'],
-    'lb,s':['侄子','侄男','弟子'],
+    'lb,s':['侄子','弟子'],
     'lb,d':['侄女','弟女'],
-    'xb,s':['侄子','侄男','侄儿','侄儿子','侄','侄仔','阿侄'],
+    'xb,s':['侄子','侄男','嫡侄','侄儿','侄儿子','侄','侄仔','阿侄'],
     'xb,s,w':['侄媳妇','侄媳','侄嫂','侄妇'],
     'xb,d':['侄女','侄囡','侄女儿','侄闺女'],
     'xb,d,h':['侄女婿','侄婿','侄郎'],

src/module/id.js

@@ -73,9 +73,8 @@ export function filterId(arr){
 // 通过ID获取世代数
 export function getGenById(id){
     let gMap = {'f':1,'m':1,'s':-1,'d':-1};
-    let arr = id.split(',');
     let gen = 0;
-    arr.forEach(function(sub){
+    id.split(',').forEach(function(sub){
         let s = sub.replace(/&[ol\d]+/,'');
         gen += gMap[s]||0;
     });

static/style/index.css

@@ -627,13 +627,13 @@ a:hover{
 }
 .mod-foot .box{
     width: 200px;
-    height: 180px;
     margin: 0 auto 20px;
     line-height: 30px;
     text-align: center;
     overflow: hidden;
 }
 .mod-foot p{
+    margin-bottom: 10px;
     line-height: 30px;
 }