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

@@ -12,8 +12,9 @@ var $dialogWrapper,
     dialogTpl,
     dialogTpl,
     dialogTemplate;
     dialogTemplate;
 
 
-
-dialogTpl = '<div id="dialog-wrapper" class="dialog-wrapper">' +
+function getInstance() {
+    if (dialogTpl === undefined) {
+        dialogTpl = '<div id="dialog-wrapper" class="dialog-wrapper">' +
             '<div class="dialog-box">' +
             '<div class="dialog-box">' +
             '{{# hasHeader}}' +
             '{{# hasHeader}}' +
             '{{/ hasHeader}}' +
             '{{/ hasHeader}}' +
@@ -31,11 +32,15 @@ dialogTpl = '<div id="dialog-wrapper" class="dialog-wrapper">' +
             '</div>' +
             '</div>' +
             '</div>';
             '</div>';
 
 
-dialogTemplate = Handlebars.compile(dialogTpl);
+        dialogTemplate = Handlebars.compile(dialogTpl);
+    }
+    return dialogTemplate;
+}
 
 
 exports.showDialog = function(data, callback, callbackForLeft) {
 exports.showDialog = function(data, callback, callbackForLeft) {
 
 
-    var dialogStr = dialogTemplate(data),
+    var dialogTemplate = getInstance(),
+        dialogStr = dialogTemplate(data),
         $dialogBox,
         $dialogBox,
         defaultHideDuraton,
         defaultHideDuraton,
         dialogWrapperHammer;
         dialogWrapperHammer;
@@ -73,6 +78,11 @@ exports.showDialog = function(data, callback, callbackForLeft) {
         }, defaultHideDuraton);
         }, defaultHideDuraton);
     }
     }
 
 
+    //禁止在dialog上可以上下滚动
+    $dialogWrapper.on('touchmove', function() {
+        return false;
+    });
+
     dialogWrapperHammer.on('tap', function(event) {
     dialogWrapperHammer.on('tap', function(event) {
 
 
         if ($(event.target).hasClass('dialog-left-btn')) {
         if ($(event.target).hasClass('dialog-left-btn')) {
@@ -83,5 +93,9 @@ exports.showDialog = function(data, callback, callbackForLeft) {
         } else if ($(event.target).hasClass('dialog-right-btn')) {
         } else if ($(event.target).hasClass('dialog-right-btn')) {
             callback();
             callback();
         }
         }
+
+        // 防止出现点透问题
+        event.preventDefault();
+        event.srcEvent.stopPropagation();
     });
     });
 };
 };

@@ -77,7 +77,7 @@
             padding: 10px;
             padding: 10px;
             background: #000;
             background: #000;
             color: #fff;
             color: #fff;
-            font-size: 20px;
+            font-size: 12px;
             @include border-radius(5px);
             @include border-radius(5px);
             text-align: center;
             text-align: center;
             width: 7rem;
             width: 7rem;