Merge remote-tracking branch 'origin/test' into test

appdownload/index.html

@@ -164,7 +164,7 @@
         <span class="download-now">立即下载</span>
     </a>
 
-    <span class="tip-expore" style="display: none"><img src="img/up-tip.png"></span>
+    <span class="tip-expore" id="tip-expore" style="display: none"><img src="img/up-tip.png"></span>
 </div>
 
 

appdownload/js/index.js

 (function (global) {
 
-    global.onload = function() {
-		var md = new MobileDetect(window.navigator.userAgent);
-
-		var appStoreUrl = 'https://itunes.apple.com/cn/app/wei-xiu-hui-shi-fu-ban/id1034283227?mt=8';
-
-		var yingYongBaoUrl ='http://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui';
-
-		//判断是否为移动端
-		if (md.mobile()) {
-			setTimeout(function() {
-				if(md.is('iPhone') || md.is('iPad')){
-					window.location.href = appStoreUrl;
-				}else{
-					window.location.href = yingYongBaoUrl;
-				}
-			}, 1000);
-		}
+    function inWechat() {
+        var ua = navigator.userAgent.toLowerCase();
+        return (/micromessenger/.test(ua) ? true : false);
+    }
+
+    global.onload = function () {
+        var md = new MobileDetect(window.navigator.userAgent);
+
+        var appStoreUrl = 'https://itunes.apple.com/cn/app/wei-xiu-hui-shi-fu-ban/id1034283227?mt=8';
+
+        var yingYongBaoUrl = 'http://a.app.qq.com/o/simple.jsp?pkgname=com.wxhkj.weixiuhui';
+
+        var urgency = false;
+        if (urgency) {
+            yingYongBaoUrl = 'http://www.weixiuhui.cn/app_publish/banshou.apk';
+            if (inWechat()) {
+                //显示遮罩
+                $('#tip-expore').show();
+            }
+        }
+        //判断是否为移动端
+        if (md.mobile()) {
+            setTimeout(function () {
+                if (md.is('iPhone') || md.is('iPad')) {
+                    window.location.href = appStoreUrl;
+                } else {
+                    window.location.href = yingYongBaoUrl;
+                }
+            }, 1000);
+        }
+
+
     };
 
 })(window);
\ No newline at end of file

e/tool/gbook/index.php

@@ -123,7 +123,7 @@ document.write('<script src="/e/member/login/loginjs.php?t='+Math.random()+'"><'
 				<td align="left" valign="top"><table width="100%" border="0" cellpadding="4" cellspacing="0" bgcolor="#FFFFFF">
 						<tr>
 							<td height="100%" valign="top" bgcolor="#FFFFFF"> 
-<?php
+<?
 while($r=$empire->fetch($sql))
 {
 	$r['retext']=nl2br($r[retext]);