|
@@ -55,7 +55,7 @@ class Index extends Common
|
|
|
'deletetime' => NULL,
|
|
|
];
|
|
|
$seckill = Db::name('shopro_activity')->field('id,title,start_time,end_time')->where($where)
|
|
|
- ->where('start_time', '<=', time())->where('end_time', '>=', time())->order('starttime asc')->find();
|
|
|
+ ->where('start_time', '<=', time())->where('end_time', '>=', time())->order('start_time','asc')->find();
|
|
|
$seckill['seconds'] = $seckill['end_time'] - time();
|
|
|
if($seckill){
|
|
|
$seckill_product = $this->seckill_productsku_list($seckill['id']);
|
|
@@ -83,6 +83,7 @@ class Index extends Common
|
|
|
'cart_num' => $cart_num,
|
|
|
'banner' => $banner,
|
|
|
'category' => $category,
|
|
|
+ 'seckill' => $seckill,
|
|
|
'seckill_product' => $seckill_product,
|
|
|
'groupon_product' => $groupon_product,
|
|
|
'kan_product' => $kan_product,
|
|
@@ -100,9 +101,9 @@ class Index extends Common
|
|
|
|
|
|
$list = Db::name('shopro_activity_sku_price')->alias('asp')
|
|
|
->field([
|
|
|
- 'asp.activity_id','asp.goods_sku_price_id','asp.goods_id','asp.stock','asp.sales','asp.price',
|
|
|
+ 'asp.activity_id','asp.goods_sku_price_id','asp.goods_id','asp.price',
|
|
|
'g.title','g.image',
|
|
|
- 'gsp.goods_sku_text','gsp.image as sku_image','gsp.price as old_price']
|
|
|
+ 'gsp.image as sku_image']
|
|
|
)
|
|
|
->join('shopro_activity a','asp.activity_id = a.id','LEFT')
|
|
|
->join('shopro_goods g' ,'asp.goods_id = g.id','LEFT')
|
|
@@ -121,11 +122,7 @@ class Index extends Common
|
|
|
}
|
|
|
unset($val['sku_image']);
|
|
|
|
|
|
- //折扣
|
|
|
- $val['zhekou'] = bcdiv($val['price'],$val['old_price'],2);
|
|
|
|
|
|
- //已抢百分比
|
|
|
- $val['bili'] = bcdiv($val['sales'],$val['stock'],0).'%';
|
|
|
|
|
|
$list[$key] = $val;
|
|
|
}
|
|
@@ -139,9 +136,8 @@ class Index 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',
|
|
|
- 'a.rules',
|
|
|
'g.title','g.image',
|
|
|
- 'gsp.goods_sku_text','gsp.image as sku_image','gsp.price as old_price']
|
|
|
+ 'gsp.image as sku_image']
|
|
|
)
|
|
|
->join('shopro_activity a','asp.activity_id = a.id','LEFT')
|
|
|
->join('shopro_goods g' ,'asp.goods_id = g.id','LEFT')
|
|
@@ -160,8 +156,6 @@ class Index extends Common
|
|
|
}
|
|
|
unset($val['sku_image']);
|
|
|
|
|
|
- $val['team_num'] = json_decode($val['rules'],true)['team_num'];
|
|
|
- unset($val['rules']);
|
|
|
|
|
|
$list[$key] = $val;
|
|
|
}
|