m

刘传洋
Commit 071d1c889071c05ff4c13cc54345cc2135c8e860 1 parent 01504b9f
Showing 2 changed files with 31 additions and 28 deletions
public/js/cart/cart-action.js
public/js/cart/cart.page.js
--- a/public/js/cart/cart-action.js
View file @071d1c8
+++ b/public/js/cart/cart-action.js
View file @071d1c8
@@ -38,12 +38,12 @@ function toggleCheckAllPros() {
 // checkbox提交ajax
 function choiceOut(items) {
-    var skuList = $.isArray(items) ? items: [items];
+    var skuList = $.isArray(items) ? items : [items];
     var hasPromotion = false;
-    $.each(skuList, function(idx, it){
+    $.each(skuList, function(idx, it) {
-        if(it.promotion_id) {
+        if (it.promotion_id) {
             hasPromotion = true;
             return false;
         }
@@ -78,11 +78,11 @@ function choiceOut(items) {
  */
 function cartItemDel(items, type, cookieList) {
-    var selList = $.isArray(items) ? items: [items];
+    var selList = $.isArray(items) ? items : [items];
     var hasPromotion = false;
-    $.each(selList, function(idx, it){
-        if(it.promotion_id) {
+    $.each(selList, function(idx, it) {
+        if (it.promotion_id) {
             hasPromotion = true;
             return false;
         }
@@ -91,7 +91,7 @@ function cartItemDel(items, type, cookieList) {
     return $.ajax({
         type: 'POST',
         dataType: 'json',
-        url: type === true ? CART_ITEM_DEL_URL: CART_ITEM_FAV_URL,
+        url: type === true ? CART_ITEM_DEL_URL : CART_ITEM_FAV_URL,
         data: {
             skuList: JSON.stringify(selList),
             hasPromotion: hasPromotion
@@ -122,14 +122,14 @@ function cartItemDel(items, type, cookieList) {
     });
 }
-//购物车商品增减
+// 购物车商品增减
 var cartItemNumChg = (function(data) {
     var countBusy = false;   // 保证一次只请求完成前不能再次发起
-    return function(data){
+    return function(data) {
-        if(countBusy) {
+        if (countBusy) {
             return;
         }
@@ -147,7 +147,7 @@ var cartItemNumChg = (function(data) {
             }
             countBusy = false;
         });
-    }
+    };
 })();
 function getProductInfo(pid, skn) {
@@ -163,7 +163,7 @@ function getProductInfo(pid, skn) {
     });
 }
-//加入购物车，弹出框中加入购物车
+// 加入购物车，弹出框中加入购物车
 function addcart(data, cookieList) {
     $.ajax({
         type: 'POST',
@@ -189,6 +189,7 @@ function parseProductInfo(productInfo, defaultInfo) {
     var colors;
     var colorsLen;
     var color;
+
     // 前端处理后的集合
     var filterSet = [];
@@ -263,7 +264,7 @@ function renderAndShowSelWin($edit, pinfo) {
 }
 var Cart = {
-    addToCart: function(params){
+    addToCart: function(params) {
     },
     toggleSelectOne: function() { // 单选
@@ -377,7 +378,7 @@ var Cart = {
             new Alert('请至少选择一件商品').show();
         }
     },
-    toFav: function () {
+    toFav: function() {
         var $this = $(this);
         var $item = $this.closest('li[data-role="pitem"]');
@@ -389,7 +390,7 @@ var Cart = {
         cartItemDel(item);
     },
-    toFavAll: function(){
+    toFavAll: function() {
         var selectArray = [];
@@ -471,7 +472,7 @@ var Cart = {
             new Alert('请至少选择一件商品').show();
         }
     },
-    showColorSizePanel: function(){
+    showColorSizePanel: function() {
         var $this = $(this);
         var $item = $this.closest('li[data-role="pitem"]');
@@ -486,18 +487,18 @@ var Cart = {
             skn: skn
         };
-        if($selWin && $selWin.length && $selWin.is(':visible')) {
+        if ($selWin && $selWin.length && $selWin.is(':visible')) {
             $selWin.hide();
             return;
         }
-        if(!pinfo) {
-            getProductInfo(pid, skn).done(function(productInfo){
+        if (!pinfo) {
+            getProductInfo(pid, skn).done(function(productInfo) {
                 pinfo = parseProductInfo(productInfo, defaultInfo);
                 $this.data('_p_info', pinfo);
                 renderAndShowSelWin($this, pinfo);
-            }).fail(function(){
+            }).fail(function() {
                 new Alert('此商品无法编辑颜色和尺寸').show();
             });
             return;
@@ -509,7 +510,7 @@ var Cart = {
     },
     submit: function() {
-        /*understock = '';
+        /* understock = '';
         if ($('.pay-wapper input:checked').parents('tr').find('.tipNoStore').length > 0) {
             shopName = $('.pay-wapper input:checked').parents('tr').find('.tipNoStore');
             $.each(shopName.parents('tr').find('.pay-pro-info a'), function() {
@@ -562,7 +563,7 @@ $('.btn_account').on('click', Cart.submit);    // 结算
 $payWapper.on('click', 'li[data-role="pitem"] .pay-pro-detail', Cart.showColorSizePanel);
-///  绑定颜色尺码弹窗事件 begin
+// /  绑定颜色尺码弹窗事件 begin
 /*
 oldProductSku = editTarget.find('.current').attr('data-sku');
@@ -645,7 +646,7 @@ editTarget.find('.sizes-list.mb10').each(function() {
     }
 });*/
-///  绑定颜色尺码弹窗事件 end
+// /  绑定颜色尺码弹窗事件 end
 // 显示赠品
 var giftBtn = '[data-role=gift-view-btn],[data-role=gift-resel-btn],[data-role=gift-sel-btn]';
--- a/public/js/cart/cart.page.js
View file @071d1c8
+++ b/public/js/cart/cart.page.js
View file @071d1c8
@@ -80,7 +80,7 @@ $('.bottom-tab-slide').on('click', '.bottom-title', function() {
 });
-//删除购物车商品，把删除的商品移入cookie中
+// 删除购物车商品，把删除的商品移入cookie中
 function cartDel(data, delUrl, cookieList) {
     $.ajax({
         type: 'POST',
@@ -259,7 +259,7 @@ $cartGoodsDetail.on('click', '.btn-favCount', function() {
 // 购物车列表 赠品
-//购物车列表 显示
+// 购物车列表 显示
 function showPromotion(id) {
     if (!id) {
@@ -279,7 +279,8 @@ function showPromotion(id) {
     dialog.show();
 }
-//购物车列表 大小图切换
+
+// 购物车列表 大小图切换
 $('body').on('click', '.piclist li', function() {
     pacList = $(this).index();
     $('.detail-bigpic:not(.none) .piclist li').removeClass('active');
@@ -382,9 +383,10 @@ $goodsChoose.on('click', '.choose-color .dt', function() {
     $('.bigImg').addClass('none').eq($(this).index()).removeClass('none');
 });
-//结算
-$paySum.on('click','.btn-account', function() {
+// 结算
+$paySum.on('click', '.btn-account', function() {
     understock = '';
+
     // if ($('.pay-wapper .cart-item-checked').parents('.tr').find('.tipNoStore').length > 0) {
     //     shopName = $('.pay-wapper .cart-item-checked').parents('.tr').find('.tipNoStore');
     //     $.each(shopName.parents('.tr').find('.pay-pro-info a'), function() {