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

@@ -204,6 +204,7 @@ $yohoPage.on('touchstart', '.color-list .block', function() {
         if ($preSiblingBlock.length > 0) {
         if ($preSiblingBlock.length > 0) {
             $preSiblingBlock.removeClass('chosed');
             $preSiblingBlock.removeClass('chosed');
             curSizeBlock = $curSizeRow.children().get(curSizeIndex);
             curSizeBlock = $curSizeRow.children().get(curSizeIndex);
+            $curSizeBlock = $(curSizeBlock);
         }
         }
 
 
         // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)
         // 当前选中颜色对应的尺码行，其对应的尺码加上勾选样式 (前提是要判断下这个尺码是否存在)

@@ -25,7 +25,7 @@ $('.address-item').on('touchend', function() {
 
 
     orderInfo('addressId', addressId);
     orderInfo('addressId', addressId);
     orderInfo('address', address);
     orderInfo('address', address);
-}).on('touchend', '.edit', function() {
+}).on('touchstart', '.edit', function() {
     window.location.href = $(this).data('href');
     window.location.href = $(this).data('href');
     return false;
     return false;
 }).on('touchstart', '.del', function() {
 }).on('touchstart', '.del', function() {

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

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

@@ -80,6 +80,9 @@
         input.disabled{
         input.disabled{
             background-color:#fff;
             background-color:#fff;
             color: #000;
             color: #000;
+            opacity: 1;
+            @include border-radius(0);
+            -webkit-appearance: none;
         }
         }
         > span {
         > span {
             position: absolute;
             position: absolute;

@@ -154,7 +154,7 @@
     .vip {
     .vip {
         display: inline-block;
         display: inline-block;
         color: #fff;
         color: #fff;
-        background: #d1021c;
+        background: #e01;
         @include border-radius(16rem / $pxConvertRem);
         @include border-radius(16rem / $pxConvertRem);
         padding: 0rem / $pxConvertRem 12rem / $pxConvertRem;
         padding: 0rem / $pxConvertRem 12rem / $pxConvertRem;
         margin-left: 8rem / $pxConvertRem;
         margin-left: 8rem / $pxConvertRem;