商品详情，砍价列表

addons/shopro/controller/activity/Kan.php

@@ -16,7 +16,7 @@ class Kan extends Common
 
         $list = Db::name('shopro_activity_sku_price')->alias('asp')
             ->field([
-                    'asp.activity_id','asp.goods_sku_price_id','asp.goods_id','asp.price',
+                    'asp.activity_id','asp.goods_sku_price_id','asp.goods_id','asp.price','asp.stock',
                     'a.rules',
                     'g.title','g.image',
                     'gsp.goods_sku_text','gsp.image as sku_image','gsp.price as old_price']

addons/shopro/controller/goods/Goods.php

@@ -109,7 +109,7 @@ class Goods extends Common
         //砍价活动处理
         if($activity && $activity['type'] == 'kan'){
 
-            $kan_id = $this->request->param('kan_id',0);
+            /*$kan_id = $this->request->param('kan_id',0);
 
             if($kan_id && $goods_sku_price_id){
                 $map_kan = [
@@ -126,7 +126,9 @@ class Goods extends Common
                 }
             }else{
                 $activity_id = 0;
-            }
+            }*/
+
+            $activity_id = 0;
 
         }
 
@@ -134,16 +136,19 @@ class Goods extends Common
         // 存一下，获取器获取指定活动的时候会用到
         session('goods-activity_id:' . $id, $activity_id);
         $service = new GoodsService(function ($goods, $service) use ($activity_id) {
-            $goods->service = $goods->service;
+//            $goods->service = $goods->service;
             $goods->skus = $goods->skus;
             
-            if (!$activity_id) {
+            /*if (!$activity_id) {
                 $goods->activities = $goods->activities;
                 $goods->promos = $goods->promos;
             } else {
                 $goods->activity = $goods->activity;
                 $goods->original_goods_price = $goods->original_goods_price;
-            }
+            }*/
+
+            $goods->original_goods_price = $goods->original_goods_price;
+
             return $goods;
         });