|
|
@@ -315,6 +315,7 @@ class StoreProduct extends AuthController
|
|
|
$mer_id = SystemAdmin::where('id',$admin_id)->value('mer_id');
|
|
|
if ($mer_id>0){
|
|
|
$data['mer_id'] = $mer_id;
|
|
|
+ $data['is_pick']=SystemStore::where('id',$mer_id)->value('is_pick');
|
|
|
}
|
|
|
foreach ($data['activity'] as $k => $v) {
|
|
|
if ($v == '秒杀') {
|