1

app/admin/controller/store/StoreProduct.php

@@ -311,13 +311,13 @@ class StoreProduct extends AuthController
             ['store_type', 1],
             ['mer_id',0]
         ], $this->request, false, true);
-        $admin_id=$this->adminId;
-        $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');
-            var_dump($data);die();
-        }
+//        $admin_id=$this->adminId;
+//        $mer_id = SystemAdmin::where('id',$admin_id)->value('mer_id');
+//        if ($data['mer_id']>0){
+//            $data['mer_id'] = $mer_id;
+            $data['is_pick']=SystemStore::where('id',$data['mer_id'])->value('is_pick');
+//            var_dump($data);die();
+//        }
         foreach ($data['activity'] as $k => $v) {
             if ($v == '秒杀') {
                 $data['activity'][$k] = 1;