Merge branch 'dev/ver/1.0.0' of http://git.ichunt.net/semour/semour_web into dev/ver/1.0.0

app/Http/Services/CartService.php

@@ -397,7 +397,7 @@ class CartService
    * 购物车当前数量
    */
     public static function cartMyCount($user_id,$gid=""){
-        $where = $user_id ? ["user_id"=>$user_id]:["gid"=>$gid];
+        $where = $user_id ? ["user_id"=>$user_id,"status"=>1]:["gid"=>$gid,"status"=>1];
         return CartModel::where($where)->count();
     }