Merge branch 'feature/shoppingCart' of http://git.yoho.cn/fe/yohobuy-node into feature/shoppingCart

@@ -299,8 +299,18 @@ var Cart = {
     },
     },
     submit: function() {
     submit: function() {
 
 
+        if ($(this).hasClass('btn-account-disable')) {
+            return false;
+        }
+
         if ($('[data-role="gift-sel-btn"]').length) {
         if ($('[data-role="gift-sel-btn"]').length) {
-            alert('还有赠品未领取！');
+            var content = '<div><i class="iconfont">&#xe6c2;</i>您还未选择赠品</div><p>是否去选择赠品？</p>';
+
+            new RConfirm(content, function() {
+                var firstGift = $('[data-role="gift-sel-btn"]')[0];
+
+                $("html,body").animate({scrollTop: $(firstGift).offset().top + "px"}, 500);
+            }, '去选择', '不要赠品');
         }
         }
 
 
         capi.showMDialog('#Y_CartSelectDialog');
         capi.showMDialog('#Y_CartSelectDialog');

@@ -79,6 +79,8 @@ function isCheckFav() {
 
 
 
 
 $(function() {
 $(function() {
+    var $itemChecked = $('[data-role=pitem] .cart-item-checked');
+
     $('.bottom-tab .change').click(function() {
     $('.bottom-tab .change').click(function() {
         $('.img-brand-switch .next').trigger('click');
         $('.img-brand-switch .next').trigger('click');
     });
     });
@@ -93,6 +95,10 @@ $(function() {
 
 
     isCheckAll();
     isCheckAll();
     isCheckFav();
     isCheckFav();
+
+    if ($itemChecked.length === 0) {
+        $('#Y_SubmitBtn').addClass('btn-account-disable');
+    }
 });
 });
 
 
 require('./cart-action');
 require('./cart-action');

@@ -23,13 +23,13 @@ RDialog.prototype = new Dialog({
 });
 });
 RDialog.prototype.constructor = RDialog;
 RDialog.prototype.constructor = RDialog;
 
 
-function RConfirm(content, ok, cancel) {
+function RConfirm(content, ok, cancel, okName, cancelName) {
     var rd = new RDialog({
     var rd = new RDialog({
         content: content,
         content: content,
         btns: [{
         btns: [{
             id: 'confirm-btn-ok',
             id: 'confirm-btn-ok',
             btnClass: ['alert-sure'],
             btnClass: ['alert-sure'],
-            name: '确定',
+            name: okName || '确定',
             cb: function() {
             cb: function() {
                 rd.close();
                 rd.close();
                 (typeof ok === 'function') && ok();
                 (typeof ok === 'function') && ok();
@@ -37,7 +37,7 @@ function RConfirm(content, ok, cancel) {
         }, {
         }, {
             id: 'confirm-btn-cencel',
             id: 'confirm-btn-cencel',
             btnClass: ['btn-cancel'],
             btnClass: ['btn-cancel'],
-            name: '取消',
+            name: cancelName || '取消',
             cb: function() {
             cb: function() {
                 rd.close();
                 rd.close();
             }
             }

@@ -1125,6 +1125,9 @@
             cursor: pointer;
             cursor: pointer;
             float: right;
             float: right;
         }
         }
+        .btn-account-disable {
+            background-color: #b0b0b0;
+        }
     }
     }
 
 
     .shop-cart-empty {
     .shop-cart-empty {