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

@@ -9,6 +9,7 @@ var $ = require('jquery'),
     Hammer = require('yoho.hammer'),
     Hammer = require('yoho.hammer'),
     Handlebars = require('yoho.handlebars'),
     Handlebars = require('yoho.handlebars'),
     tip = require('../plugin/tip'),
     tip = require('../plugin/tip'),
+    loading = require('../plugin/loading'),
     orderInfo = require('./order-info').orderInfo;
     orderInfo = require('./order-info').orderInfo;
 
 
 var dispatchModeHammer,
 var dispatchModeHammer,
@@ -94,6 +95,7 @@ function orderCompute() {
 }
 }
 
 
 function submitOrder() {
 function submitOrder() {
+    loading.showLoadingMask();
     $.ajax({
     $.ajax({
         method: 'POST',
         method: 'POST',
         url: '/shoppingCart/orderSub',
         url: '/shoppingCart/orderSub',
@@ -114,6 +116,7 @@ function submitOrder() {
         var url;
         var url;
 
 
         if (!res) {
         if (!res) {
+            loading.hideLoadingMask();
             tip.show('网络出错');
             tip.show('网络出错');
             return;
             return;
         }
         }
@@ -125,11 +128,14 @@ function submitOrder() {
             } else {
             } else {
                 url = '/home/pay?order_code=' + res.data.order_code;
                 url = '/home/pay?order_code=' + res.data.order_code;
             }
             }
+            window.setCookie('order-info', '');
             window.location.href = url;
             window.location.href = url;
         } else {
         } else {
+            loading.hideLoadingMask();
             tip.show(res.messege || '网络出错');
             tip.show(res.messege || '网络出错');
         }
         }
     }).fail(function() {
     }).fail(function() {
+        loading.hideLoadingMask();
         tip.show('网络出错');
         tip.show('网络出错');
     });
     });
 }
 }