购物车，优惠券，商品评价

addons/shopro/controller/Cart.php

@@ -5,6 +5,7 @@ namespace addons\shopro\controller;
 use app\admin\model\shopro\Cart as CartModel;
 use app\admin\model\shopro\goods\Goods;
 use app\admin\model\shopro\goods\SkuPrice;
+use think\Db;
 
 class Cart extends Common
 {
@@ -12,6 +13,12 @@ class Cart extends Common
     protected $noNeedLogin = [];
     protected $noNeedRight = ['*'];
 
+    public function number(){
+        $user = auth_user();
+        $number = Db::name('shopro_cart')->where('user_id',$user['id'])->count();
+        $this->success(1,$number);
+    }
+
     public function index()
     {
         $user = auth_user();
@@ -38,6 +45,20 @@ class Cart extends Common
             $cart->sku_price->image = localpath_to_netpath($cart->sku_price->image);//规格图
         });
 
+        $carts = json_decode(json_encode($carts),true);
+
+        $choose_price = 0;
+        foreach($carts as $key => $val){
+            if($val['choose'] == 1){
+                $choose_price = bcadd($choose_price,$val['sku_price']['price'],2);
+            }
+        }
+
+        $result = [
+            'choose_price' => $choose_price,
+            'list' => $carts,
+        ];
+
         $this->success('获取成功', $carts);
     }
 

addons/shopro/controller/Coupon.php

@@ -57,10 +57,10 @@ class Coupon extends Common
             ->goods($goods)       // 符合指定商品，并且检测商品所属分类
             ->order('id', 'desc');
 
-        if ($user) {
+        /*if ($user) {
             // 关联用户优惠券
             $coupons = $coupons->with(['userCoupons']);
-        }
+        }*/
         $coupons = $coupons->select();
         
         $coupons = collection($coupons)->each(function ($coupon) {
@@ -68,6 +68,11 @@ class Coupon extends Common
             $coupon->get_status_text = $coupon->get_status_text;
         });
 
+        $coupons = json_decode(json_encode($coupons),true);
+        foreach($coupons as $key => $val){
+            unset($coupons[$key]['user_coupons']);
+        }
+
         $this->success('获取成功', $coupons);
     }
 

addons/shopro/controller/goods/Comment.php

@@ -11,7 +11,7 @@ class Comment extends Common
     protected $noNeedLogin = ['index', 'getType'];
     protected $noNeedRight = ['*'];
 
-    public function index() 
+    public function index()
     {
         $params = $this->request->param();
         $type = $params['type'] ?? 'all';
@@ -23,12 +23,21 @@ class Comment extends Common
             $comments = $comments->{$type}();
         }
 
-        $comments = $comments->order('id', 'desc')->paginate(request()->param('list_rows', 10));
-            // ->each(function ($comment) {
-            //     if ($comment->user) {
-            //         $comment->user->nickname_hide = $comment->user->nickname_hide;
-            //     }
-            // })->toArray();
+        $comments = $comments->order('id', 'desc')
+//            ->paginate(request()->param('list_rows', 10));
+            ->autopage()->select();
+        $comments = json_decode(json_encode($comments),true);
+        $comments = list_domain_image($comments,['user_avatar']);
+        foreach($comments as $key => $val){
+            $val['images'] = array_domain_image($val['images']);
+
+            $comments[$key] = $val;
+        }
+        // ->each(function ($comment) {
+        //     if ($comment->user) {
+        //         $comment->user->nickname_hide = $comment->user->nickname_hide;
+        //     }
+        // })->toArray();
 
         // $data = $comments['data'];
         // foreach ($data as $key => &$comment) {