From b55605afd94a59b012824d913384cd5629d68c05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=B5=A9=E4=B9=90?= <89932980@qq.com> Date: Thu, 17 Mar 2016 10:36:25 +0800 Subject: [PATCH] =?UTF-8?q?updated=20=E2=80=98=E8=80=81=E5=A9=86=E7=9A=84?= =?UTF-8?q?=E7=88=B8=E7=88=B8=E7=9A=84=E5=A5=B3=E5=84=BF=E2=80=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/relationship.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/relationship.js b/script/relationship.js index cb90774..65b1daf 100644 --- a/script/relationship.js +++ b/script/relationship.js @@ -42,12 +42,12 @@ }, {//如果自己是男性,父母的儿子是自己或者兄弟 con:/(,[fhs]|([olx]b)),[mf],s/, - exp:/^(.+)?,[mf],s(.+)$/, + exp:/^(.+)?,[mf],s(.+)?$/, str:'$1$2#$1,xb$2' }, {//如果自己是女性,父母的女儿是自己或者姐妹 con:/(,[mwd]|([olx]s)),[mf],d/, - exp:/^(.+)?,[mf],d(.+)$/, + exp:/^(.+)?,[mf],d(.+)?$/, str:'$1$2#$1,xs$2' }, {//如果自己是女性,父母的儿子是自己兄弟 @@ -476,11 +476,11 @@ function relationship(str){ var selectors = getSelectors(str); - console.log('selectors#',selectors); + // console.log('selectors#',selectors); var result = []; //匹配结果 for(var i = 0;i