Merge branch 'phoenix' into develop

app/Admin/Controllers/v3/GoodsActivityController.php

@@ -191,10 +191,11 @@ class GoodsActivityController extends AdminController
                     });
                 $form->saving(function (Form $form){
                     $storeId = $form->input('store_id');
-                    
+                    if(!empty($storeId)){
                         // 商品所属市场，根据店铺查询市场
                         $info = StoreModel::getStoreInfo($storeId,'market_id');
                         $form->market_id = $info->market_id;
+                    }
                 });
                 $form->disableResetButton();
                 $form->disableViewCheck();

app/Admin/Controllers/v3/GoodsController.php

@@ -216,9 +216,11 @@ class GoodsController extends AdminController
             $form->saving(function (Form $form){
                 $storeId = $form->input('store_id');
                
+                if(!empty($storeId)){
                     // 商品所属市场，根据店铺查询市场
                     $info = StoreModel::getStoreInfo($storeId,'market_id');
                     $form->market_id = $info->market_id;
+                }
             });
         });
     }