Merge remote-tracking branch 'origin/develop'

@@ -159,6 +159,7 @@ $yohoPage.on('touchstart', '.chose-panel', function(e) {
 $yohoPage.on('touchstart', '.color-list .block', function() {
     var $this = $(this),
         index,
+        curSizeBlock,
         $preSiblingBlock,
         $curSizeRow,
         numArray,
@@ -202,13 +203,14 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
         // 之前选中的尺码去掉勾选样式
         if ($preSiblingBlock.length > 0) {
             $preSiblingBlock.removeClass('chosed');
-            $curSizeBlock = $curSizeRow.children().get(curSizeIndex);
+            curSizeBlock = $curSizeRow.children().get(curSizeIndex);
+            $curSizeBlock = $(curSizeBlock);
         }
 
         // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
-        if ($curSizeBlock) {
-            curGoodNum = $curSizeBlock.data('num');
-            $curSizeBlock.addClass('chosed');
+        if (curSizeBlock) {
+            curGoodNum = $(curSizeBlock).data('num');
+            $(curSizeBlock).addClass('chosed');
 
             //如果当前有尺码被选中，且数量等于0,则颜色块添加数量为0的样式
             if (curGoodNum > 0) {

@@ -99,3 +99,7 @@ exports.showDialog = function(data, callback, callbackForLeft) {
         event.srcEvent.stopPropagation();
     });
 };
+
+exports.hideDialog = function() {
+    $('.dialog-wrapper').remove();
+};

@@ -6,7 +6,8 @@
 
 var $ = require('jquery'),
     Hammer = require('yoho.hammer'),
-    lazyLoad = require('yoho.lazyload');
+    lazyLoad = require('yoho.lazyload'),
+    tip = require('../plugin/tip');
 
 var $navLi = $('#order-nav > li'),
     $orderContainer = $('#order-container');
@@ -132,23 +133,18 @@ orderHammer.on('tap', function(e) {
                     id: id
                 },
                 success: function(data) {
+                    dialog.hideDialog();
+                    if (data.message) {
+                        tip.show(data.message);
+                    }
                     if (data.code === 200) {
-                        dialog.showDialog({
-                            dialogText: '删除订单成功',
-                            autoHide: true,
-                            fast: true
-                        });
 
                         //删除订单页面刷新
-                        history.go(0);
+                        window.location.reload();
                     }
                 },
                 error: function() {
-                    dialog.showDialog({
-                        dialogText: '删除订单失败',
-                        autoHide: true,
-                        fast: true
-                    });
+                    tip.show('取消订单失败');
                 }
             });
         });
@@ -169,23 +165,17 @@ orderHammer.on('tap', function(e) {
                     id: id
                 },
                 success: function(data) {
+                    if (data.message) {
+                        tip.show(data.message);
+                    }
                     if (data.code === 200) {
-                        dialog.showDialog({
-                            dialogText: '取消订单成功',
-                            autoHide: true,
-                            fast: true
-                        });
 
                         //取消订单页面刷新
-                        history.go(0);
+                        window.location.reload();
                     }
                 },
                 error: function() {
-                    dialog.showDialog({
-                        dialogText: '取消订单失败',
-                        autoHide: true,
-                        fast: true
-                    });
+                    tip.show('取消订单失败');
                 }
             });
         });