作者 张关杰

Merge branch 'develop' of http://47.244.231.31:8099/zhl/globalso-v6 into bate

@@ -179,7 +179,7 @@ class VideoTask extends Command @@ -179,7 +179,7 @@ class VideoTask extends Command
179 $productModel = new Product(); 179 $productModel = new Product();
180 $productList = $productModel->list(['keyword_id'=>['like','%,'.$keywordInfo['id'].',%']],['thumb','title']); 180 $productList = $productModel->list(['keyword_id'=>['like','%,'.$keywordInfo['id'].',%']],['thumb','title']);
181 if(count($productList) < 5){ 181 if(count($productList) < 5){
182 - $productList = $productModel->list([],'sort',['thumb','title']); 182 + $productList = $productModel->inRandomOrder()->take(100)->get()->toArray();
183 //获取7个产品主图 183 //获取7个产品主图
184 } 184 }
185 $product_image = []; 185 $product_image = [];