Merge remote-tracking branch 'origin/release/1.0' into release/1.0

@@ -17,7 +17,7 @@ exports.index = (req, res, next) => {
     cartModel.getCartData(shoppingKey, uid).then((result) => {
     cartModel.getCartData(shoppingKey, uid).then((result) => {
         if (result.code === 200) {
         if (result.code === 200) {
 
 
-            res.header('Cache-Control', 'no-cache');
+            res.header('Cache-Control', 'no-store');
 
 
             res.display('cart', _.merge({
             res.display('cart', _.merge({
                 module: 'shopping',
                 module: 'shopping',

@@ -3,6 +3,8 @@ var confirmReceive = require('./order/confirm-receive');
 var editOrder = require('./order/edit-order');
 var editOrder = require('./order/edit-order');
 var countDown = require('./order/countdown');
 var countDown = require('./order/countdown');
 
 
+var Confirm = require('../plugins/dialog').Confirm;
+
 var lazyLoad = require('yoho-jquery-lazyload');
 var lazyLoad = require('yoho-jquery-lazyload');
 
 
 // 个人中心共用代码加载
 // 个人中心共用代码加载
@@ -32,6 +34,8 @@ $('.order .edit-btn').on('click', function() {
     var mobile = $userInfo.find('.user-mo-sel').data('mobile');
     var mobile = $userInfo.find('.user-mo-sel').data('mobile');
     var phone = $userInfo.find('.user-ph-sel').data('phone');
     var phone = $userInfo.find('.user-ph-sel').data('phone');
 
 
+    $this.removeClass('white'); // 我不知道为啥产品会有这样的需求，点一次按钮后颜色变掉，按钮颜色和可不可点状态一毛钱关系都没
+
     editOrder.start({
     editOrder.start({
         data: {
         data: {
             orderCode: code,
             orderCode: code,
@@ -47,8 +51,12 @@ $('.order .edit-btn').on('click', function() {
 $('.complete-btn').on('click', function() {
 $('.complete-btn').on('click', function() {
     var code = $(this).closest('.order').data('code');
     var code = $(this).closest('.order').data('code');
 
 
-    confirmReceive.done(code);
-
+    new Confirm({
+        content: '<h1 class="title">确认收货</h1><p>您确定要确认收货么？</p>',
+        cb: function() {
+            confirmReceive.done(code);
+        }
+    }).show();
 });
 });
 
 
 if ($('.left-time').length) {
 if ($('.left-time').length) {

@@ -7,6 +7,7 @@
 var dialog = require('../plugins/dialog');
 var dialog = require('../plugins/dialog');
 var _dialog = dialog.Dialog;
 var _dialog = dialog.Dialog;
 var _alert = dialog.Alert;
 var _alert = dialog.Alert;
+var _confirm = dialog.Confirm;
 
 
 var expressTpl = require('../../tpl/me/express.hbs');
 var expressTpl = require('../../tpl/me/express.hbs');
 
 
@@ -335,7 +336,12 @@ function bindConfirmReceiveEvent() {
     $('.confirm-receive').on('click', function() {
     $('.confirm-receive').on('click', function() {
         var code = $(this).closest('.order').data('code');
         var code = $(this).closest('.order').data('code');
 
 
-        confirmReceive.done(code);
+        new _confirm({
+            content: '<h1 class="title">确认收货</h1><p>您确定要确认收货么？</p>',
+            cb: function() {
+                confirmReceive.done(code);
+            }
+        }).show();
     });
     });
 }
 }
 
 

@@ -239,7 +239,6 @@
         .subtext {
         .subtext {
             font-size: 12px;
             font-size: 12px;
             cursor: pointer;
             cursor: pointer;
-            color: #666;
         }
         }
 
 
         .no-space {
         .no-space {
@@ -259,21 +258,26 @@
         }
         }
 
 
         .msg {
         .msg {
-            margin-top: 50px;
+            margin-top: 45px;
             text-align: center;
             text-align: center;
 
 
             .msg-zh {
             .msg-zh {
-                font-size: $bigSize;
-                margin-bottom: $space;
+                font-size: 20px;
+                line-height: 30px;
+                margin-bottom: 15px;
             }
             }
 
 
             .msg-en {
             .msg-en {
                 margin-bottom: 40px;
                 margin-bottom: 40px;
+                font-size: 14px;
             }
             }
 
 
             .btn {
             .btn {
                 display: inline-block;
                 display: inline-block;
-                width: 100px !important;
+                width: 130px !important;
+                height: 40px !important;
+                line-height: 40px !important;
+                font-size: 14px;
             }
             }
         }
         }
     }
     }

-<h1 class="dialog-title">订单修改</h1>
+<h1 class="dialog-title">修改订单</h1>
 
 
 {{# data}}
 {{# data}}
 <div class="form" data-code={{orderCode}}>
 <div class="form" data-code={{orderCode}}>