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

@@ -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')) {
@@ -84,6 +94,7 @@ exports.showDialog = function(data, callback, callbackForLeft) {
             callback();
             callback();
         }
         }
 
 
+        // 防止出现点透问题
         event.preventDefault();
         event.preventDefault();
         event.srcEvent.stopPropagation();
         event.srcEvent.stopPropagation();
     });
     });

@@ -155,10 +155,10 @@
         display: inline-block;
         display: inline-block;
         color: #fff;
         color: #fff;
         background: #d1021c;
         background: #d1021c;
-        border: 1px solid #9d0000;
-        @include border-radius(0.5rem);
-        padding: 4rem / $pxConvertRem 0.5rem;
-        margin-left: 0.2rem;
+        @include border-radius(16rem / $pxConvertRem);
+        padding: 0rem / $pxConvertRem 12rem / $pxConvertRem;
+        margin-left: 8rem / $pxConvertRem;
+        font-size: 20rem / $pxConvertRem;
     }
     }
 
 
     .la-tag {
     .la-tag {