Merge branch 'develop' of http://git.dev.yoho.cn/web/yohobuy into develop

@@ -183,7 +183,7 @@ orderHammer.on('tap', function(e) {
                 }
                 }
             });
             });
         });
         });
-    } else {
+    } else if ($cur.closest('.order-goods').length > 0) {
 
 
         //Location to order detail
         //Location to order detail
         url = $order.data('href');
         url = $order.data('href');

@@ -90,7 +90,7 @@ function callpay(orderCode) {
 
 
 
 
 function isWXOpen() {
 function isWXOpen() {
-    var ua = navigator.userAgent.toLowerCase();
+    var ua = window.navigator.userAgent.toLowerCase();
 
 
     if (ua.match(/MicroMessenger/i) === 'micromessenger') {
     if (ua.match(/MicroMessenger/i) === 'micromessenger') {
         return true;
         return true;

@@ -36,7 +36,7 @@
       > div {
       > div {
         width: 60rem / $pxConvertRem;
         width: 60rem / $pxConvertRem;
         height: 60rem / $pxConvertRem;
         height: 60rem / $pxConvertRem;
-        background-image: image-url("/img/layout/pay-icon.png");
+        background-image: image-url("layout/pay-icon.png");
         background-size: 90%;
         background-size: 90%;
         background-position-y: 8rem / $pxConvertRem;
         background-position-y: 8rem / $pxConvertRem;
         background-position-x: center;
         background-position-x: center;