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

# Conflicts:
#	dist/relationship.min.js
#	dist/relationship.zh-HK.min.js

index.html

@@ -67,7 +67,14 @@
 							<p class="text-gray">始于2016年3月</p>
 							<div class="picture">
 								<img src="static/image/app.png" width="512" height="320" alt="亲戚称呼换算APP"/>
-								<a class="btn" href="vue/" target="_blank">访问手机版</a>
+							</div>
+							<div class="mobile">
+								<a class="btn" href="vue/" target="_blank">
+									<span class="name">访问手机版</span>
+									<span class="qrcode">
+										<img src="static/image/qrcode.png"/>
+									</span>
+								</a>
 							</div>
 						</div>
 						<div class="bd">
@@ -684,29 +691,7 @@
 			})();
 		</script>
 		<script async defer src="https://cdn.bootcdn.net/ajax/libs/github-buttons/2.21.1/buttons.min.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') {
-			        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
-			    }
-			    else {
-			        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
-			    }
-			    var s = document.getElementsByTagName("script")[0];
-			    s.parentNode.insertBefore(bp, s);
-			})();
-		</script>
 		<script type="text/javascript" src="https://passer-by.com/public/script/projects.js"></script>
+		<script type="text/javascript" src="https://passer-by.com/public/script/stat.js"></script>
 	</body>
 </html>

src/module/data/input.js

@@ -2,6 +2,8 @@
  * 只作为输入关系链判断
 */
 export default {
-    'f,xb':['伯叔父','叔伯','几爸爸','几爸','几爹'],
+    'f,xb':['伯叔父','几爸爸','几爸','几爹'],
-    'f,xb,w':['伯叔母','几妈妈','几妈','几娘']
+    'f,xb,w':['伯叔母','几妈妈','几妈','几娘'],
+    'h,xb':['伯叔'],
+    'h,xb,w':['妯娌','娣姒','娣姒姊妹','婶子'],
 };

src/module/data/main.js

@@ -202,8 +202,6 @@ export default {
     'h,ob,w':['大婶子','大婶儿','大叔兄妇','伯兄妇','伯嫂','伯妇','伯姆','姒妇','姒姆','大伯嫂','姆姆','大姆','大伯妇','大伯娘','姐妇','阿姆'],
     'h,lb':['小叔子','小叔儿','小叔弟','叔子','叔仔','叔弟','阿叔','叔郎','小郎'],
     'h,lb,w':['小婶子','小婶儿','小叔弟妇','叔弟妇','叔嫂','叔妇','叔姆','娣妇','娣姆','小叔妇','婶婶','小婶','小婶婶'],
-    'h,[ob|lb]':['伯叔'],
-    'h,xb,w':['妯娌','娣姒','娣姒姊妹','婶子'],
     'h,xb,s':['叔侄男'],
     'h,xb,d':['叔侄女'],
     'h,os':['大姑子','大姑姐','大姑儿','大姑娘','姑姊','婆姐','婆婆姐','大娘姑'],

src/module/rule/similar.js

@@ -16,4 +16,5 @@ export default {
     '孙媳妇':'孙妇',
     '甥媳妇':'甥妇',
     '侄媳妇':'侄妇',
+    '弟媳妇':'弟妇',
 };

static/style/index.css

@@ -202,7 +202,7 @@ a:hover{
 .mod-panel .hd p.text-gray{
     color: rgba(0,0,0,0.25);
 }
-.mod-panel .hd .picture{
+.mod-panel .hd .picture,.mod-panel .hd .mobile{
     position: relative;
     width: 400px;
     text-align: center;
@@ -210,10 +210,10 @@ a:hover{
 .mod-panel .hd .picture img{
     margin-left: -56px;
 }
-.mod-panel .hd .picture .btn{
+.mod-panel .hd .btn{
+    position: relative;
     display: inline-block;
     height: 36px;
-    margin-top: -20px;
     padding: 0 24px;
     background: #2095f2;
     border: 1px solid rgba(0,0,0,0.05);
@@ -223,15 +223,52 @@ a:hover{
     text-align: center;
     font-size: 15px;
     color: #fff;
-    overflow: hidden;
     transition: color .2s,opacity .2s;
     font-family: Tahoma,Arial, Helvetica,"Microsoft YaHei";
     outline: none;
     -webkit-appearance: none;
 }
-.mod-panel .hd .picture .btn:hover {
+.mod-panel .hd .btn span.name{
+    display: inline-block;
+    padding-right: 30px;
+    background: url('../image/scan.png') right center / 16px 16px no-repeat;
+}
+.mod-panel .hd .btn span.qrcode{
+    display: none;
+    position: absolute;
+    right: -160px;
+    top: 50%;
+    z-index:999;
+    width: 160px;
+    height: 160px;
+    margin-top: -84px;
+    border: 2px solid rgba(0,0,0,0.1);
+}
+.mod-panel .hd .btn span.qrcode img{
+    width: 150px;
+    height: 150px;
+    padding: 5px;
+    background: #fff;
+}
+.mod-panel .hd .btn span.qrcode::after{
+    position: absolute;
+    left: -6px;
+    top: 50%;
+    margin-top: -6px;
+    display: block;
+    content: '';
+    width: 12px;
+    height: 12px;
+    background: #fff;
+    box-shadow: -2px 2px 0 rgba(0,0,0,0.1);
+    transform: rotate(45deg);
+}
+.mod-panel .hd .btn:hover {
     background: #207fcc;
 }
+.mod-panel .hd .btn:hover span.qrcode{
+    display: block;
+}
 .mod-panel .hd b{
 	margin: 0 3px;
 	color: #fd7474;
@@ -643,15 +680,25 @@ a:hover{
         width: auto;
         padding-top: 0;
     }
+    .mod-panel .hd .mobile{
+        width: auto;
+    }
     .mod-panel .hd .picture img{
         width: 256px;
         height: 160px;
         margin-left: 0;
     }
-    .mod-panel .hd .picture .btn{
+    .mod-panel .hd .btn{
         display: block;
         margin: 0 auto;
     }
+    .mod-panel .hd .btn span.name{
+        padding-right: 0;
+        background: none;
+    }
+    .mod-panel .hd .btn span.qrcode{
+        display: none!important;
+    }
     .mod-panel .bd{
         margin-left: 0;
     }

vue/index.html

@@ -34,29 +34,6 @@
         </script>
         <div id="app"></div>
         <script type="text/javascript" src="https://passer-by.com/relationship/dist/relationship.min.js"></script>
-        
+    	<script type="text/javascript" src="https://passer-by.com/public/script/stat.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') {
-			        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
-			    }
-			    else {
-			        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
-			    }
-			    var s = document.getElementsByTagName("script")[0];
-			    s.parentNode.insertBefore(bp, s);
-			})();
-		</script>
   </body>
 </html>

zh-HK.html

@@ -67,7 +67,14 @@
 							<p class="text-gray">始於2016年3月</p>
 							<div class="picture">
 								<img src="static/image/app.png" width="512" height="320" alt="親戚稱呼換算APP"/>
-								<a class="btn" href="vue/" target="_blank">訪問手機版</a>
+							</div>
+							<div class="mobile">
+								<a class="btn" href="vue/" target="_blank">
+									<span class="name">訪問手機版</span>
+									<span class="qrcode">
+										<img src="static/image/qrcode.png"/>
+									</span>
+								</a>
 							</div>
 						</div>
 						<div class="bd">
@@ -684,29 +691,7 @@
 			})();
 		</script>
 		<script async defer src="https://cdn.bootcdn.net/ajax/libs/github-buttons/2.21.1/buttons.min.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') {
-			        bp.src = 'https://zz.bdstatic.com/linksubmit/push.js';
-			    }
-			    else {
-			        bp.src = 'http://push.zhanzhang.baidu.com/push.js';
-			    }
-			    var s = document.getElementsByTagName("script")[0];
-			    s.parentNode.insertBefore(bp, s);
-			})();
-		</script>
 		<script type="text/javascript" src="https://passer-by.com/public/script/projects.js"></script>
+		<script type="text/javascript" src="https://passer-by.com/public/script/stat.js"></script>
 	</body>
 </html>