Merge branch 'dev-xpy' into dev

app/common/repositories/store/product/ProductRepository.php

@@ -418,8 +418,12 @@ class ProductRepository extends BaseRepository
                 $value['plate_mer_profit'] = $value['gong_mer_profit'];
 
                 $sku = '';
-                if (isset($value['detail']) && is_array($value['detail'])) {
+                if (isset($value['detail']) && is_array($value['detail']) && count($value['detail']) > 0) {
                     $sku = implode(',', $value['detail']);
+                } else {
+                    // 单规格情况，detail填充默认内容
+                    $value['detail'] = ['默认'];
+                    $sku = '默认';
                 }
                 $product_data = Db::name('store_product')->where('product_id', $id)->value('spu_id');
                 if ($product_data) {