Browse Source

活动商品的店铺用线上的,市场添加失败修复

master
liangyuyan 5 years ago
parent
commit
caa7c1ccf0
  1. 4
      app/Admin/Controllers/v3/GoodsActivityController.php
  2. 2
      app/Admin/Controllers/v3/GoodsController.php
  3. 2
      app/Admin/Controllers/v3/GoodsNewController.php

4
app/Admin/Controllers/v3/GoodsActivityController.php

@ -8,7 +8,7 @@ use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Controllers\AdminController;
use App\Models\v3\Market as MarketModel; use App\Models\v3\Market as MarketModel;
use App\Models\v3\Store as StoreModel;
use App\Models\v3\StoreNew as StoreModel;
use App\Models\v3\Category as CategoryModel; use App\Models\v3\Category as CategoryModel;
use App\Models\v3\GoodsActivity as GoodsActivityModel; use App\Models\v3\GoodsActivity as GoodsActivityModel;
use Dcat\Admin\Form\NestedForm; use Dcat\Admin\Form\NestedForm;
@ -136,7 +136,7 @@ class GoodsActivityController extends AdminController
$form->column(6, function (Form $form) use($storeList,$categoryList ){ $form->column(6, function (Form $form) use($storeList,$categoryList ){
$form->text('goods_id')->default(0)->help('输入正常商品id,用于关联商品。'); $form->text('goods_id')->default(0)->help('输入正常商品id,用于关联商品。');
// $form->select('market_id')->required()->options($marketList);
$form->hidden('market_id')->default(0);
$form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list'); $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
$form->select('goods_category_id'); $form->select('goods_category_id');
$form->select('store_id')->required()->options($storeList); $form->select('store_id')->required()->options($storeList);

2
app/Admin/Controllers/v3/GoodsController.php

@ -159,7 +159,7 @@ class GoodsController extends AdminController
// $marketList = MarketModel::getMarketArray(); // $marketList = MarketModel::getMarketArray();
$form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){ $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
// $form->select('market_id')->required()->options($marketList);
$form->hidden('market_id')->default(0);
$form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list'); $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
$form->select('goods_category_id')->required(); $form->select('goods_category_id')->required();
$form->select('store_id')->required()->options($storeList); $form->select('store_id')->required()->options($storeList);

2
app/Admin/Controllers/v3/GoodsNewController.php

@ -165,7 +165,7 @@ class GoodsNewController extends AdminController
// $marketList = MarketModel::getMarketArray(); // $marketList = MarketModel::getMarketArray();
$form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){ $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
// $form->select('market_id')->required()->options($marketList);
// $form->hidden('market_id')->default(0);
$form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list'); $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
$form->select('goods_category_id'); $form->select('goods_category_id');
$form->select('store_id')->required()->options($storeList); $form->select('store_id')->required()->options($storeList);

Loading…
Cancel
Save