更新到201512061525静态资源

@@ -4942,7 +4942,14 @@ var $ = require("jquery"),
 var commentsNum,consultsNum;
 var commentsNum,consultsNum;
 
 
 var consultFooterEle = document.getElementById('consult-content-footer'),
 var consultFooterEle = document.getElementById('consult-content-footer'),
-    consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle);
+    consultFooterHammer = consultFooterEle && new Hammer(consultFooterEle),
+
+    navtabEle = document.getElementById('nav-tab'),
+    navtabHammer = navtabEle && new Hammer(navtabEle),
+
+    gotoConsultEle = document.getElementById('goto-consult'),
+    gotoConsultHammer = gotoConsultEle && new Hammer(gotoConsultEle);
+
 
 
 
 
 (function() {
 (function() {
@@ -4968,32 +4975,41 @@ var consultFooterEle = document.getElementById('consult-content-footer'),
 
 
 })();
 })();
 
 
-$('#nav-tab li').on('touchend', function() {
-    var index = $(this).index();
+if (navtabHammer) {
+    navtabHammer.on('tap', function(e) {
+        var $this = $(e.target).closest('li');
+        var index = $this.index();
 
 
-    if ($(this).hasClass('comment-nav') && 0 === commentsNum) {
-        tip.show('暂无商品评价');
-    } else {
-        if (!$(this).hasClass('focus')) {
+        if ($this.hasClass('comment-nav') && 0 === commentsNum) {
+            tip.show('暂无商品评价');
+        } else {
+            if (!$this.hasClass('focus')) {
 
 
-            $('#nav-tab li').each(function() {
-                $(this).removeClass('focus');
-            });
-            $('#feedback-content .content').each(function() {
-                $(this).addClass('hide');
-            });
+                $('#nav-tab li').each(function() {
+                    $(this).removeClass('focus');
+                });
+                $('#feedback-content .content').each(function() {
+                    $(this).addClass('hide');
+                });
 
 
-            $(this).addClass('focus');
-            $('#feedback-content .content:eq(' + index + ')').removeClass('hide');
+                $this.addClass('focus');
+                $('#feedback-content .content:eq(' + index + ')').removeClass('hide');
+            }
         }
         }
-    }
-});
+    });
+}
 
 
 if (consultFooterHammer) {
 if (consultFooterHammer) {
     consultFooterHammer.on('tap', function() {
     consultFooterHammer.on('tap', function() {
         location.href = $(consultFooterEle).find('a').attr('href');
         location.href = $(consultFooterEle).find('a').attr('href');
     });
     });
 }
 }
+
+if (gotoConsultHammer) {
+    gotoConsultHammer.on('tap', function() {
+        location.href = $(gotoConsultEle).find('a').attr('href');
+    });
+}
 });
 });
 define("js/product/recommend-for-you-product-desc", ["swiper","jquery","index"], function(require, exports, module){
 define("js/product/recommend-for-you-product-desc", ["swiper","jquery","index"], function(require, exports, module){
 /**
 /**
@@ -5370,7 +5386,7 @@ function getOrders(option) {
         page: order.page + 1
         page: order.page + 1
     };
     };
 
 
-    var show = option && option.showLoadingMask;
+    var show = option && !option.noLoadingMask;
 
 
     if (inAjax) {
     if (inAjax) {
         return;
         return;
@@ -7121,12 +7137,9 @@ define("js/me/address", ["jquery"], function(require, exports, module){
 
 
 var $ = require("jquery"),
 var $ = require("jquery"),
     tip = require("js/plugin/tip"),
     tip = require("js/plugin/tip"),
-    security = require("js/plugin/security"),
     loading = require("js/plugin/loading");
     loading = require("js/plugin/loading");
 
 
 var $action = $('.action'),
 var $action = $('.action'),
-    $addressForm = $('.edit-address'),
-    $submit = $('.submit'),
     $addAddress = $('.add-address'),
     $addAddress = $('.add-address'),
     $footer = $('#yoho-footer'),
     $footer = $('#yoho-footer'),
     $confim = $('.confim-mask'),
     $confim = $('.confim-mask'),
@@ -7139,12 +7152,13 @@ $pageWrap.first().css('min-height', function() {
 });
 });
 window.rePosFooter();
 window.rePosFooter();
 
 
-$confim.on('touchend', '.cancel', function() {
+$confim.on('touchend', '.cancel', function(e) {
     deleteId = null;
     deleteId = null;
-    $confim.hide();
+    $confim.fadeOut();
+    return false;
 }).on('touchend', '.confim', function() {
 }).on('touchend', '.confim', function() {
     loading.showLoadingMask();
     loading.showLoadingMask();
-    $confim.hide();
+    $confim.fadeOut();
     $.ajax({
     $.ajax({
         method: 'POST',
         method: 'POST',
         url: '/home/delAddress',
         url: '/home/delAddress',
@@ -7167,6 +7181,7 @@ $confim.on('touchend', '.cancel', function() {
     }).always(function() {
     }).always(function() {
         deleteId = null;
         deleteId = null;
     });
     });
+    return false;
 });
 });
 
 
 
 
@@ -7184,19 +7199,7 @@ $addAddress.on('touchend', function() {
 // 删除
 // 删除
 $action.on('touchend', '.del', function() {
 $action.on('touchend', '.del', function() {
     deleteId = $(this).data('id');
     deleteId = $(this).data('id');
-    $confim.show();
-});
-
-$submit.on('touchend', function() {
-    if (security.hasDangerInput(false)) {
-        return false;
-    }
-    $addressForm.submit();
-    return false;
-}).on('touchstart', function() {
-    $(this).addClass('highlight');
-}).on('touchend touchcancel', function() {
-    $(this).removeClass('highlight');
+    $confim.fadeIn();
 });
 });
 
 
 });
 });
@@ -7317,11 +7320,13 @@ $page.on('touchstart', '.del-icon', function() {
                         });
                         });
                     setTimeout(function() {
                     setTimeout(function() {
                         window.history.go(0);
                         window.history.go(0);
-                    }, 2500);
+                    }, 1200);
                 }
                 }
             },
             },
             complete: function() {
             complete: function() {
-                dialog.hideDialog(); //隐藏dialog
+                setTimeout(function() {
+                    dialog.hideDialog();
+                }, 1500);
             }
             }
         });
         });
     });
     });
@@ -7431,6 +7436,9 @@ $addressForm.on('submit', function() {
 });
 });
 
 
 $submit.on('touchend', function() {
 $submit.on('touchend', function() {
+    if (security.hasDangerInput(false)) {
+        return false;
+    }
     $input.blur();
     $input.blur();
     $addressForm.submit();
     $addressForm.submit();
     return false;
     return false;