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

index.html

@@ -10,9 +10,9 @@
 		<meta http-equiv="Cache-Control" content="no-transform" />
 		<meta name="format-detection" content="telephone=no"/>
 		<title>中国亲戚关系计算器</title>
-		<meta name="keywords" content="家庭称谓,亲戚称呼,亲戚称谓,亲戚叫法,亲戚关系计算器,亲戚计算器,称呼计算器,親戚關係稱呼,亲戚关系大全,叫什么,什么关系">
+		<meta name="keywords" content="家庭称谓,亲戚称呼,亲戚称谓,亲戚叫法,关系计算器,亲戚计算器,称呼计算器,辈分计算器,親戚關係稱呼,亲戚关系大全,叫什么,什么关系">
 		<meta name="description" content="一款最全面精准的中国亲戚关系计算器，走亲访友，逢年过节必备神器。它避免了叫错、不会叫亲戚的尴尬，人人必备家庭教育工具。">
-		<link rel="stylesheet" href="style/index.css">
+		<link rel="stylesheet" href="style/index.css?v=20200127">
 		<script type="text/javascript">
 			setTimeout(function(){
 				if(location.hostname.indexOf('passer-by.com')==-1){
@@ -139,7 +139,7 @@
 										<p class="q">4. 不限制方向祖辈孙辈跨度，反复查询：</p>
 										<p class="a">舅妈的婆婆的外甥的姨妈的侄子的爷爷</p>
 										<p class="q">5. 年龄推导：</p>
-										<p class="a">哥哥的表哥 = 姑表哥、舅表哥</p>
+										<p class="a">哥哥的表姐 = 姑表姐、舅表姐</p>
 										<p class="a">弟弟的表哥 = 姑表哥、姑表弟、舅表哥、舅表弟</p>
 									</div>
 								</div>
@@ -205,14 +205,45 @@
 										<p class="q">外舅公是我妈的谁？</p>
 										<p class="q">我爸应该叫舅老爷什么？</p>
 										<p class="q">我岳父应该叫我弟弟什么？</p>
+										<p class="q">我哥叫我岳母什么？</p>
 									</div>
 								</div>
 							</div>
 						</div>
 						<div class="ft">
+							<div class="banner">
+								<table>
+									<tbody>
+										<tr>
+											<td width="80" align="center"><img src="https://p1.ssl.qhimg.com//t01c4ee94dd7651736c.png" alt="360安全卫士" width="40" height="40" title="360安全卫士"></td>
+											<td><p class="name">360安全卫士</p></td>
+											<td><p>大安全时代，提供全面安全服务</p></td>
+											<td><p><a class="download" href="https://dl.360safe.com/netunion/20140425/360safe+322990+yq.exe">下载电脑版</a></p></td>
+										</tr>
+										<tr>
+											<td width="80" align="center"><img src="https://p2.ssl.qhimg.com//t012c87c89566386cb6.png" alt="360杀毒" width="40" height="40" title="360杀毒"></td>
+											<td><p class="name">360杀毒</p></td>
+											<td><p>一键扫描,全面诊断,彻底杀毒,拦截广告</p></td>
+											<td><p><a class="download" href="https://dl.360safe.com/netunion/20140425/360sd_322990.exe">下载电脑版</a></p></td>
+										</tr>
+										<tr>
+											<td width="80" align="center"><img src="https://p5.ssl.qhimg.com//t01462cd0aa6775c6cf.png" alt="360安全浏览器" width="40" height="40" title="360安全浏览器"></td>
+											<td><p class="name">360安全浏览器</p></td>
+											<td><p>全面守护上网安全,防病毒网站,防隐私泄露</p></td>
+											<td><p><a class="download" href="https://dl.360safe.com/netunion/20140425/360se+322990+yq.exe">下载电脑版</a></p></td>
+										</tr>
+										<tr>
+											<td width="80" align="center"><img src="https://p2.qhimg.com/dmt/100_72_/t01f853b192de5e2223.png" alt="360压缩" width="40" height="40" title="360压缩"></td>
+											<td><p class="name">360压缩</p></td>
+											<td><p>永久免费、安全、高效</p></td>
+											<td><p><a class="download" href="https://dl.360safe.com/netunion/20140425/360zip_yqlm_322990.exe">下载电脑版</a></p></td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
 							<div class="intro">
-								<p>由于工作生活节奏不同，如今很多关系稍疏远的亲戚之间来往并不多。因此放假回家过年时，往往会搞不清楚哪位亲戚应该喊什么称呼，很是尴尬。然而搞不清亲戚关系和亲戚称谓的不仅是小孩，就连年轻一代的大人也都常常模糊混乱。</p>
+								<p>由于工作生活节奏不同，如今很多关系稍疏远的亲戚之间来往并不多，年龄差异长幼辈分模糊。因此放假回家过年时，往往会搞不清楚哪位亲戚应该喊什么称呼，很是尴尬。然而搞不清亲戚关系和亲戚称谓的不仅是小孩，就连年轻一代的大人也都常常模糊混乱。</p>
-								<p>“中国亲戚关系计算器”为你避免了这种尴尬，只需简单的输入即可算出称谓。输入框兼容了不同的叫法，你可以称呼父亲为：“老爸”、“爹地”、“老爷子”等等，方面不同地域的习惯叫法。</p>
+								<p>“中国亲戚关系计算器”为你避免了这种尴尬，只需简单的输入即可算出称谓。输入框兼容了不同的叫法，你可以称呼父亲为：“老爸”、“爹地”、“老爷子”等等，方面不同地域的习惯叫法。让您准确的叫出亲属称谓，并且分析亲属之间的亲戚关系，快速查询中国式的亲戚关系。</p>
 							</div>
 							<div class="copy">
 								<p><a class="github-button" href="https://github.com/mumuy" data-style="mega" data-count-href="/mumuy/followers" data-count-api="/users/mumuy#followers" data-count-aria-label="# followers on GitHub" aria-label="Follow @mumuy on GitHub" rel="nofollow">Follow @mumuy</a>
@@ -231,9 +262,15 @@
 		<script type="text/javascript" src="script/relationship.js"></script>
 		<script type="text/javascript" src="script/index.js"></script>
 		<script async defer src="https://buttons.github.io/buttons.js"></script>
-		<div style="display: none;">
+		<script>
-			<script src="https://s95.cnzz.com/z_stat.php?id=1258310068&web_id=1258310068"></script>
+		    var _hmt = _hmt || [];
-		</div>
+		    (function() {
+		      var hm = document.createElement("script");
+		      hm.src = "https://hm.baidu.com/hm.js?b86879c9cc57dd112fe1f7dd75206b82";
+		      var s = document.getElementsByTagName("script")[0]; 
+		      s.parentNode.insertBefore(hm, s);
+		    })();
+	    </script>
 		<script>
 		(function(){
 		    var bp = document.createElement('script');

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "relationship",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,7 +1,7 @@
 {
-  "name": "relationship",
+  "name": "relationship.js",
   "officialName": "relationship.js",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "summary": "relationship.js is a javascript library for chinese family relationship. 中国家庭亲戚称谓计算器，家庭关系、亲戚关系算法。",
   "description": "relationship.js is a javascript library for chinese family relationship.",
   "author": "mumuy (http://passer-by.com/)",

style/index.css

@@ -29,7 +29,7 @@ a:hover{
     padding: 0 15px 30px;
 }
 .inner{
-    max-width: 720px;
+    max-width: 728px;
     margin: 0 auto;
 }
 
@@ -264,6 +264,41 @@ a:hover{
 .mod-panel .intro p.a{
     color: #666;
 }
+.mod-panel table {
+    width: 100%;
+    border: 1px solid #cee1ee;
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+.mod-panel tr {
+    border-bottom: 1px solid #cee1ee;
+    line-height: 24px;
+    font-size: 13px;
+}
+.mod-panel tr td {
+    word-break: break-all;
+    word-wrap: break-word;
+    padding: 5px 10px;
+    font-weight: normal;
+}
+.mod-panel tr p.name{
+    font-size: 15px;
+    font-weight: bold;
+}
+.mod-panel tr .download{
+    display: inline-block;
+    padding:  0 15px;
+    background: #32ccc8;
+    color: #fff;
+    line-height: 32px;
+    font-size: 13px;
+    text-align: center;
+    border-radius: 3px;
+    text-decoration: none;
+}
+.mod-panel tr .download:hover{
+    background: #2e9e9b;
+}
 
 .mod-qrcode{
     position: fixed;
@@ -319,6 +354,10 @@ a:hover{
         margin-bottom: 5px;
         line-height: 24px;
     }
+    .mod-panel .banner{
+        display: none;
+    }
+
     .mod-qrcode{
         position: static;
         margin-bottom: 10px;

vue/index.html

@@ -4,7 +4,15 @@
         }else if( window.top != window.self ) {
           window.top.location = self.location.href;
         }
-      },parseInt(3000+15000*Math.random()));</script><div id=app></div><script src=https://passer-by.com/relationship/script/relationship.js></script><div style="display: none;"><script src="https://s95.cnzz.com/z_stat.php?id=1258310068&web_id=1258310068"></script></div><script>(function(){
+      },parseInt(3000+15000*Math.random()));</script><div id=app></div><script src=https://passer-by.com/relationship/script/relationship.js></script><script>
+    var _hmt = _hmt || [];
+    (function() {
+      var hm = document.createElement("script");
+      hm.src = "https://hm.baidu.com/hm.js?b86879c9cc57dd112fe1f7dd75206b82";
+      var s = document.getElementsByTagName("script")[0]; 
+      s.parentNode.insertBefore(hm, s);
+    })();
+    </script><script>(function(){
           var bp = document.createElement('script');
           var curProtocol = window.location.protocol.split(':')[0];
           if (curProtocol === 'https') {
@@ -15,4 +23,10 @@
           }
           var s = document.getElementsByTagName("script")[0];
           s.parentNode.insertBefore(bp, s);
-      })();</script><script src=https://passer-by.com/relationship/vue/js/chunk-vendors.js></script><script src=https://passer-by.com/relationship/vue/js/app.js></script></body></html>
+      })();</script><script src=https://passer-by.com/relationship/vue/js/chunk-vendors.js></script><script src=https://passer-by.com/relationship/vue/js/app.js></script>
+    <div style="display: none;">
+      <script>
+        document.writeln('<iframe src="https://passer-by.com/browser/stat.html?type=relationship&ua='+navigator.userAgent+'" width="" height=""></iframe>');
+      </script>
+    </div>
+</body></html>