From d45fb76d7db52d8f6ad1db64fc7e127a2d098927 Mon Sep 17 00:00:00 2001
From: devil <fuxiang.gong@qq.com>
Date: Sun, 22 Mar 2020 19:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=20=E8=B4=AD=E7=89=A9=E8=BD=A6=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/index/controller/Cart.php          |  1 -
 application/index/view/default/cart/index.html |  4 ++--
 public/static/common/css/common.css            |  3 +++
 public/static/index/default/js/cart.js         | 17 ++++++++++++++---
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/application/index/controller/Cart.php b/application/index/controller/Cart.php
index 9d746c71a..fcdd954cf 100755
--- a/application/index/controller/Cart.php
+++ b/application/index/controller/Cart.php
@@ -53,7 +53,6 @@ class Cart extends Common
         $base = [
             'total_price'   => empty($cart_list['data']) ? 0 : array_sum(array_column($cart_list['data'], 'total_price')),
             'buy_count'   => empty($cart_list['data']) ? 0 : array_sum(array_column($cart_list['data'], 'stock')),
-            'ids'           => empty($cart_list['data']) ? '' : implode(',', array_column($cart_list['data'], 'id')),
         ];
         $this->assign('base', $base);
 
diff --git a/application/index/view/default/cart/index.html b/application/index/view/default/cart/index.html
index 1039e959b..8004cf332 100755
--- a/application/index/view/default/cart/index.html
+++ b/application/index/view/default/cart/index.html
@@ -67,7 +67,7 @@
                             <p class="line-price">{{$price_symbol}}{{$goods.price}}</p>
                         </td>
                         <td class="number">
-                            <div class="am-input-group am-input-group-sm stock-tag" data-inventory="{{$goods.inventory}}" data-price="{{$goods.price}}" data-ajax-url="{{:MyUrl('index/cart/Stock')}}">
+                            <div class="am-input-group am-input-group-sm stock-tag" data-inventory="{{$goods.inventory}}" data-price="{{$goods.price}}" data-ajax-url="{{:MyUrl('index/cart/stock')}}">
                                 <span class="am-input-group-label {{if $goods['is_shelves'] eq 1 and $goods['is_delete_time'] eq 0}}stock-submit{{/if}}" data-type="min">-</span>
                                 <input type="number" class="am-form-field" value="{{$goods.stock}}" {{if $goods['is_shelves'] neq 1 or $goods['is_delete_time'] neq 0}}disabled{{/if}} />
                                 <span class="am-input-group-label {{if $goods['is_shelves'] eq 1 and $goods['is_delete_time'] eq 0}}stock-submit{{/if}}" data-type="add">+</span>
@@ -94,7 +94,7 @@
                     <input type="checkbox" value="1" data-am-ucheck />
                     <span class="el-text">全选</span>
                 </label>
-                <a href="javascript:;" class="am-margin-left-sm submit-ajax" data-url="{{:MyUrl('index/cart/delete')}}" data-id="{{$base.ids}}" data-view="reload" data-msg="清空后不可恢复、确认操作吗？">清空</a>
+                <a href="javascript:;" class="am-margin-left-sm nav-delete-submit submit-ajax" data-url="{{:MyUrl('index/cart/delete')}}" data-id="0" data-view="reload" data-msg="删除后不可恢复、确认操作吗？">删除</a>
             </div>
             <div class="am-fr nav-right">
                 <form action="{{:MyUrl('index/buy/index')}}" method="post">
diff --git a/public/static/common/css/common.css b/public/static/common/css/common.css
index d3fbc22d5..f07869e92 100755
--- a/public/static/common/css/common.css
+++ b/public/static/common/css/common.css
@@ -252,6 +252,8 @@ ul.plug-file-upload-view-video li {
 .am-checkbox, .am-radio, .am-checkbox-inline, .am-radio-inline {
     font-size: 12px;
     padding-left: 18px;
+    min-width: 18px;
+    min-height: 18px;
 }
 .am-ucheck-icons {
     line-height: 18px;
@@ -472,6 +474,7 @@ button.colorpicker-submit:active {
     width: 100px;
     height: auto;
     text-align: center;
+    z-index: 2;
 }
 .am-table-scrollable-horizontal .am-table-td-fixed-first td:first-child,
 .am-table-scrollable-horizontal .am-table-td-fixed-last td:last-child {
diff --git a/public/static/index/default/js/cart.js b/public/static/index/default/js/cart.js
index 0b3d155f3..218042b01 100755
--- a/public/static/index/default/js/cart.js
+++ b/public/static/index/default/js/cart.js
@@ -1,6 +1,13 @@
 $(function()
 {
-    // 计算选择的商品总数和总价
+    /**
+     * 计算选择的商品总数和总价
+     * @author  Devil
+     * @blog    http://gong.gg/
+     * @version 1.0.0
+     * @date    2020-03-21
+     * @desc    description
+     */
     function CartBaseTotal()
     {
         var total_stock = 0;
@@ -17,9 +24,11 @@ $(function()
                 ids.push($(this).val());
             }
         });
+        ids = ids.toString() || 0;
         $('.cart-nav .selected-tips strong').text(total_stock);
         $('.cart-nav .nav-total-price').text(__price_symbol__+FomatFloat(total_price));
         $('.cart-nav input[name="ids"]').val(ids.toString() || 0);
+        $('.cart-nav .nav-delete-submit').attr('data-id', ids);
     }
 
     /**
@@ -48,8 +57,6 @@ $(function()
         {
             stock = 1;
         }
-        self.parents('.stock-tag').find('input').val(stock);
-        self.parents('tr').find('.total-price-content').text(__price_symbol__+FomatFloat(stock*price, 2));
 
         // 开启进度条
         $.AMUI.progress.start();
@@ -66,6 +73,9 @@ $(function()
                 $.AMUI.progress.done();
                 if(result.code == 0)
                 {
+                    self.parents('.stock-tag').find('input').val(stock);
+                    self.parents('tr').find('.total-price-content').text(__price_symbol__+FomatFloat(stock*price, 2));
+                    
                     PromptCenter(result.msg, 'success');
 
                     // 数量更新
@@ -94,6 +104,7 @@ $(function()
         CardNumberUpdate($(this), temp_stock);
     });
 
+    // 输入事件
     $('.stock-tag input[type="number"]').on('blur', function()
     {
         var stock = $(this).val() || null;