Merge branch 'phoenix' into develop

5 years ago · 61d376c402
2 changed files with 10 additions and 7 deletions
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@ -191,10 +191,11 @@ class GoodsActivityController extends AdminController
                    });
                $form->saving(function (Form $form){
                    $storeId = $form->input('store_id');
-                    
-                    // 商品所属市场，根据店铺查询市场
-                    $info = StoreModel::getStoreInfo($storeId,'market_id');
-                    $form->market_id = $info->market_id;
+                    if(!empty($storeId)){
+                        // 商品所属市场，根据店铺查询市场
+                        $info = StoreModel::getStoreInfo($storeId,'market_id');
+                        $form->market_id = $info->market_id;
+                    }
                });
                $form->disableResetButton();
                $form->disableViewCheck();
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@ -216,9 +216,11 @@ class GoodsController extends AdminController
            $form->saving(function (Form $form){
                $storeId = $form->input('store_id');
               
-                // 商品所属市场，根据店铺查询市场
-                $info = StoreModel::getStoreInfo($storeId,'market_id');
-                $form->market_id = $info->market_id;
+                if(!empty($storeId)){
+                    // 商品所属市场，根据店铺查询市场
+                    $info = StoreModel::getStoreInfo($storeId,'market_id');
+                    $form->market_id = $info->market_id;
+                }
            });
        });
    }