Merge branch 'release/5.3' of http://git.yoho.cn/fe/yohobuywap-node into release/5.3

@@ -42,7 +42,7 @@
     "passport-weixin": "^0.1.0",
     "passport-weixin": "^0.1.0",
     "request-promise": "^3.0.0",
     "request-promise": "^3.0.0",
     "serve-favicon": "^2.3.2",
     "serve-favicon": "^2.3.2",
-    "uuid": "^3.0.1",
+    "uuid": "^2.0.3",
     "yoho-node-lib": "0.2.2",
     "yoho-node-lib": "0.2.2",
     "yoho-zookeeper": "^1.0.4"
     "yoho-zookeeper": "^1.0.4"
   },
   },

@@ -7,7 +7,8 @@ require('guang/info-index.page.css');
 
 
 var $ = require('yoho-jquery'),
 var $ = require('yoho-jquery'),
     ellipsis = require('yoho-mlellipsis'),
     ellipsis = require('yoho-mlellipsis'),
-    lazyLoad = require('yoho-jquery-lazyload');
+    lazyLoad = require('yoho-jquery-lazyload'),
+    Hammer = require('yoho-hammer');
 
 
 var $authorIntro = $('.author .intro');
 var $authorIntro = $('.author .intro');
 
 
@@ -234,7 +235,6 @@ function setCookie(name, value, options) {
 // 初始化页面,包括是否使用iscorll初始化页面
 // 初始化页面,包括是否使用iscorll初始化页面
 // 接口暴露在HTML中，使用压缩名
 // 接口暴露在HTML中，使用压缩名
 (function() {
 (function() {
-    var isIphone = navigator.userAgent.indexOf('iPhone') > 0 ? true : false;
     var isweixin = navigator.userAgent.indexOf('MicroMessenger') ? true : false;
     var isweixin = navigator.userAgent.indexOf('MicroMessenger') ? true : false;
     var $this, $title;
     var $this, $title;
 
 
@@ -272,11 +272,7 @@ function setCookie(name, value, options) {
     }
     }
 
 
     if (isweixin) {
     if (isweixin) {
-        if (isIphone) {
-            $overlay.css('position', 'relative');
-        } else {
-            $overlay.css('position', 'absolute');
-        }
+        $overlay.css('position', 'absolute');
     }
     }
 
 
     $('#float-layer-close').on('touchend', function(index) {
     $('#float-layer-close').on('touchend', function(index) {
@@ -299,6 +295,7 @@ function setCookie(name, value, options) {
 
 
     if ($('#float-layer-btn') && $('#float-layer-btn')[0]) {
     if ($('#float-layer-btn') && $('#float-layer-btn')[0]) {
         var floatLayerBtnHammer = new Hammer($('#float-layer-btn')[0]);
         var floatLayerBtnHammer = new Hammer($('#float-layer-btn')[0]);
+
         floatLayerBtnHammer.on('tap', function(e) {
         floatLayerBtnHammer.on('tap', function(e) {
             window.location = 'http://www.yohoshow.com/about/index/yohobuyqr';
             window.location = 'http://www.yohoshow.com/about/index/yohobuyqr';
             e.srcEvent.stopPropagation();
             e.srcEvent.stopPropagation();