diff --git a/app/Admin/Controllers/v3/GoodsActivityController.php b/app/Admin/Controllers/v3/GoodsActivityController.php
index 6556428..4806f5c 100644
--- a/app/Admin/Controllers/v3/GoodsActivityController.php
+++ b/app/Admin/Controllers/v3/GoodsActivityController.php
@@ -12,6 +12,7 @@ use App\Models\v3\Store as StoreModel;
 use App\Models\v3\Category as CategoryModel;
 use App\Models\v3\GoodsActivity as GoodsActivityModel;
 use Dcat\Admin\Form\NestedForm;
+use App\Models\v3\GoodsCategory as GoodsCategoryModel;
 
 class GoodsActivityController extends AdminController
 {
@@ -41,7 +42,10 @@ class GoodsActivityController extends AdminController
                 $item = CategoryModel::getInfo($categoryId,'title');
                 return empty($item) ? '' : $item->title;
             });
-            
+            $grid->goods_category_id->display(function ($goodsCategoryId){
+                $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
+                return empty($item) ? '' : $item->title;
+            });
             $grid->column('expire_time_text');
             $grid->column('sort');
             $grid->column('on_sale')->switch();
@@ -128,12 +132,13 @@ class GoodsActivityController extends AdminController
             // 店铺
             $storeList = StoreModel::getStoreArray();
             //市场
-            $marketList = MarketModel::getMarket();
+            // $marketList = MarketModel::getMarketArray();
 
-            $form->column(6, function (Form $form) use($marketList,$storeList,$categoryList ){
-                $form->text('goods_id');
-                $form->select('market_id')->required()->options($marketList);
-                $form->select('category_id')->required()->options($categoryList);
+            $form->column(6, function (Form $form) use($storeList,$categoryList ){
+                $form->text('goods_id')->default(0)->help('输入正常商品id，用于关联商品。');
+                // $form->select('market_id')->required()->options($marketList);
+                $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
+                $form->select('goods_category_id')->required();
                 $form->select('store_id')->required()->options($storeList);
                 $form->text('name')->required()->maxLength(20);
                 $form->image('cover_img')->required();
@@ -184,7 +189,13 @@ class GoodsActivityController extends AdminController
                     ->saving(function ($v) {
                         return $v;
                     });
-
+                $form->saved(function (Form $form){
+                    $storeId = $form->input('store_id');
+                    
+                    // 商品所属市场，根据店铺查询市场
+                    $info = StoreModel::getStoreInfo($storeId,'market_id');
+                    $form->market_id = $info->market_id;
+                });
                 $form->disableResetButton();
                 $form->disableViewCheck();
                 $form->disableEditingCheck();
diff --git a/app/Admin/Controllers/v3/GoodsController.php b/app/Admin/Controllers/v3/GoodsController.php
index aa5d515..eafd5e8 100644
--- a/app/Admin/Controllers/v3/GoodsController.php
+++ b/app/Admin/Controllers/v3/GoodsController.php
@@ -29,7 +29,11 @@ class GoodsController extends AdminController
             $grid->id->sortable();
             $grid->cover_img_url->image('',50);
             $grid->name;
-           
+            $grid->price;
+            $grid->column('market_id')->display(function($marketId){
+                $item = MarketModel::getMarketInfo($marketId,'name');
+                return empty($item) ? '' : $item->name;
+            });
             $grid->store_id->display(function ($storeId){
                 $store = StoreModel::getStoreInfo($storeId,'name');
                 return empty($store) ? '' : $store->name;
@@ -42,7 +46,7 @@ class GoodsController extends AdminController
                 $item = GoodsCategoryModel::getInfo($goodsCategoryId,'title');
                 return empty($item) ? '' : $item->title;
             });
-            $grid->price;
+            
 
             $grid->sort->sortable();
             $grid->on_sale->switch();
@@ -157,10 +161,10 @@ class GoodsController extends AdminController
             $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
                 // $form->select('market_id')->required()->options($marketList);
                 $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
-                $form->select('goods_category_id')->required()->options($goodsCategoryList);
+                $form->select('goods_category_id')->required();
                 $form->select('store_id')->required()->options($storeList);
                 $form->text('name')->required()->maxLength(20);
-                $form->image('cover_img')->required()->disk('image');
+                $form->image('cover_img')->required();
                 $form->number('sort');
             });
             $form->column(6, function (Form $form) {
diff --git a/config/filesystems.php b/config/filesystems.php
index 430db23..dabb99a 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -54,6 +54,12 @@ return [
             'url' => env('APP_URL').'/storage',
             'visibility' => 'public',
         ],
+        'image' => [
+            'driver' => 'local',
+            'root' => storage_path('app/public'),
+            'url' => env('APP_URL').'/public/uploads',
+            'visibility' => 'public',
+        ],
         'oss' => [
             'driver' => 'oss',
             'root' => '', // 设置上传时根前缀
diff --git a/resources/lang/zh-CN/goods-activity.php b/resources/lang/zh-CN/goods-activity.php
index e797607..af1f1f8 100644
--- a/resources/lang/zh-CN/goods-activity.php
+++ b/resources/lang/zh-CN/goods-activity.php
@@ -12,6 +12,7 @@ return [
         'market_id' => '市场',
         'store_id' => '商家',
         'category_id' => '分类',
+        'goods_category_id' => '商品类目',
         'on_sale' => '是否上架',
         'sort' => '排序',
         'price' => '售价',
@@ -30,6 +31,7 @@ return [
         'content' => '简介',
         'remark' => '备注',
         'expire_time' => '活动结束时间',
+        'expire_time_text' => '活动结束时间',
         'time_limit_days' => '限制的天数',
         'time_limit_num' => '限制购买数量',
         'can_use_coupon' => '可同时使用优惠券',