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

@@ -82,4 +82,3 @@ exports.showDialog = function(data, callback) {
         }
         }
     });
     });
 };
 };
-

@@ -6,7 +6,9 @@
 
 
 var $ = require('jquery'),
 var $ = require('jquery'),
     lazyLoad = require('yoho.lazyload'),
     lazyLoad = require('yoho.lazyload'),
-    Hammer = require('yoho.hammer');
+    Hammer = require('yoho.hammer'),
+    dialog = require('./dialog'),
+    tip = require('../plugin/tip');
 
 
 var orderId = $('#order-detail').data('id');
 var orderId = $('#order-detail').data('id');
 
 
@@ -24,26 +26,64 @@ optHammer.on('tap', function(e) {
     if ($cur.hasClass('btn-del')) {
     if ($cur.hasClass('btn-del')) {
 
 
         //删除订单
         //删除订单
-        if (confirm('确定删除订单吗？')) {
+        dialog.showDialog({
+            dialogText: '确定删除订单吗？',
+            hasFooter: {
+                leftBtnText: '取消',
+                rightBtnText: '确定'
+            }
+        }, function() {
             $.ajax({
             $.ajax({
                 type: 'GET',
                 type: 'GET',
                 url: '/home/delOrder',
                 url: '/home/delOrder',
                 data: {
                 data: {
                     id: orderId
                     id: orderId
                 }
                 }
+            }).then(function(res) {
+                $('#dialog-wrapper').hide();
+                if (!res) {
+                    tip.show('网络错误');
+                }
+                if (res.code === 200) {
+                    tip.show('删除成功');
+                } else {
+                    tip.show(res.message || '网络错误');
+                }
+                window.location.href = '/home/orders';
+            }).fail(function() {
+                tip.show('网络错误');
             });
             });
-        }
+        });
     } else if ($cur.hasClass('btn-cancel')) {
     } else if ($cur.hasClass('btn-cancel')) {
 
 
         //取消订单
         //取消订单
-        if (confirm('确定取消订单吗？')) {
+        dialog.showDialog({
+            dialogText: '确定取消订单吗？',
+            hasFooter: {
+                leftBtnText: '取消',
+                rightBtnText: '确定'
+            }
+        }, function() {
             $.ajax({
             $.ajax({
                 type: 'GET',
                 type: 'GET',
                 url: '/home/cancelOrder',
                 url: '/home/cancelOrder',
                 data: {
                 data: {
                     id: orderId
                     id: orderId
                 }
                 }
+            }).then(function(res) {
+                $('#dialog-wrapper').hide();
+                if (!res) {
+                    tip.show('网络错误');
+                }
+                if (res.code === 200) {
+                    tip.show('取消成功');
+                } else {
+                    tip.show(res.message || '网络错误');
+                }
+                window.location.reload();
+            }).fail(function() {
+                tip.show('网络错误');
             });
             });
-        }
+        });
     }
     }
-});
+});