From f7202fcf6359202ca816d089256e72b83c53a599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9E=97=E4=B8=80=E5=B3=B0?= <1feng.0595@gmail.com>
Date: Tue, 31 Oct 2017 00:36:52 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AB=8B=E5=8D=B3=E8=B4=AD=E4=B9=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Api/CartController.php   |  8 +------
 app/Http/Model/Cart.php                       | 13 ++++++----
 resources/views/weixin/cart/index.blade.php   | 24 ++++++++++++++++++-
 .../views/weixin/goods/goodsDetail.blade.php  | 11 +++++----
 routes/web.php                                |  1 +
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/Http/Controllers/Api/CartController.php b/app/Http/Controllers/Api/CartController.php
index 6e86eb2..43c869e 100644
--- a/app/Http/Controllers/Api/CartController.php
+++ b/app/Http/Controllers/Api/CartController.php
@@ -42,13 +42,7 @@ class CartController extends CommonController
             return ReturnData::create(ReturnData::PARAMS_ERROR);
         }
         
-        $res = Cart::cartAdd($data);
-		if($res !== true)
-		{
-			return ReturnData::create(ReturnData::SYSTEM_FAIL,null,$res);
-		}
-        
-		return ReturnData::create(ReturnData::SUCCESS);
+		return Cart::cartAdd($data);
     }
     
     //删除购物车
diff --git a/app/Http/Model/Cart.php b/app/Http/Model/Cart.php
index e596bec..9352a5f 100644
--- a/app/Http/Model/Cart.php
+++ b/app/Http/Model/Cart.php
@@ -1,5 +1,6 @@
 <?php
 namespace App\Http\Model;
+use App\Common\ReturnData;
 
 class Cart extends BaseModel
 {
@@ -119,19 +120,19 @@ class Cart extends BaseModel
         
         if (!$goods)
         {
-            return '商品不存在';
+            return ReturnData::create(ReturnData::PARAMS_ERROR,null,'商品不存在');
         }
         
         //判断库存 是否足够
         if($goods['goods_number']<$goods_number)
         {
-            return '库存不足';
+            return ReturnData::create(ReturnData::PARAMS_ERROR,null,'库存不足');
         }
         
         //判断购物车商品数
         if(Cart::where(['user_id'=>$user_id])->count() >= 20)
         {
-            return '购物车商品最多20件';
+            return ReturnData::create(ReturnData::PARAMS_ERROR,null,'购物车商品最多20件');
         }
         
         //查看是否已经有购物车插入记录
@@ -151,6 +152,8 @@ class Cart extends BaseModel
             );
             
             self::where(array('id'=>$cart->id))->update($updateArr);
+            
+            $cart_id = $cart->id;
         }
         else
         {
@@ -162,10 +165,10 @@ class Cart extends BaseModel
                 'add_time'			=> time(),
             );
             
-            self::insertGetId($cartInsert);
+            $cart_id = self::insertGetId($cartInsert);
         }
         
-        return true;
+        return ReturnData::create(ReturnData::SUCCESS,$cart_id,'购物车添加成功');
     }
     
     /**
diff --git a/resources/views/weixin/cart/index.blade.php b/resources/views/weixin/cart/index.blade.php
index 9720568..2b1ccdb 100644
--- a/resources/views/weixin/cart/index.blade.php
+++ b/resources/views/weixin/cart/index.blade.php
@@ -31,7 +31,7 @@
                 <!--商品勾选按钮-->
                 <span onclick="checkGoods(this)" class="che">
                  <i>
-                     <input name="checkItem" type="checkbox" style="display:none;" data-goods-id="<?php echo $v['goods_id']; ?>">
+                     <input name="checkItem" type="checkbox" style="display:none;" data-goods-id="<?php echo $v['goods_id']; ?>" data-cart-id="<?php echo $v['id']; ?>">
                  </i>
                  </span>
             </div>
@@ -117,6 +117,28 @@
 <br><br>
 <script type="text/javascript" src="<?php echo env('APP_URL'); ?>/js/layer/mobile/layer.js"></script>
 <script>
+function cart_submit()
+{
+    var cart_goods_ids = '';
+    $('[name="checkItem"][checked]').each(function(){
+        var goods_id = $(this).attr('data-cart-id');
+        if(cart_goods_ids){cart_goods_ids = cart_goods_ids+'_'+goods_id;}else{cart_goods_ids = cart_goods_ids+goods_id;}
+    });
+    
+    if(cart_goods_ids == '')
+    {
+        layer.open({
+            content: '请选择商品'
+            ,skin: 'msg'
+            ,time: 2 //2秒后自动关闭
+        });
+        
+        return false;
+    }
+    
+    location.href = '<?php echo substr(route('weixin_cart_checkout',array('ids'=>1)), 0, -1); ?>' + cart_goods_ids;
+}
+
 function change_goods_number(type, id)
 {
     var goods_number = document.getElementById('goods_number'+id).value;
diff --git a/resources/views/weixin/goods/goodsDetail.blade.php b/resources/views/weixin/goods/goodsDetail.blade.php
index b6624b3..370637d 100644
--- a/resources/views/weixin/goods/goodsDetail.blade.php
+++ b/resources/views/weixin/goods/goodsDetail.blade.php
@@ -197,17 +197,18 @@ function dosubmit()
 	{
 		if(res.code==0)
 		{
+            if(cart_type == 2)
+            {
+                location.href = '<?php echo substr(route('weixin_cart_checkout',array('ids'=>1)),0,-1); ?>' + res.data;
+                return false;
+            }
+            
             //提示
             layer.open({
                 content: res.msg
                 ,skin: 'msg'
                 ,time: 2 //2秒后自动关闭
             });
-            
-            /* if(cart_type == 2)
-            {
-                location.href = '<?php echo substr(route('weixin_order_pay',array('id'=>1)),0,strlen(route('weixin_order_pay',array('id'=>1)))-1); ?>' + res.data['id'];
-            } */
 		}
 		else
 		{
diff --git a/routes/web.php b/routes/web.php
index 9ac32a2..ea48ab7 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -92,6 +92,7 @@ Route::group(['prefix' => 'weixin', 'namespace' => 'Weixin', 'middleware' => ['w
     Route::get('/collect_goods', 'CollectGoodsController@index')->name('weixin_user_collect_goods');
     //购物车
     Route::get('/cart', 'CartController@index')->name('weixin_cart');
+    Route::get('/cart_checkout/{ids}', 'CartController@cartCheckout')->name('weixin_cart_checkout');
     //订单
     Route::get('/order_pay/{id}', 'OrderController@orderPay')->name('weixin_order_pay'); //订单支付
     //收货地址