|
@@ -9,6 +9,7 @@ use App\Models\Product as Model;
|
|
use Illuminate\Support\Carbon;
|
|
use Illuminate\Support\Carbon;
|
|
use App\Models\Product\Spec as ProductSpec;
|
|
use App\Models\Product\Spec as ProductSpec;
|
|
use App\Models\Product\Type as ProductType;
|
|
use App\Models\Product\Type as ProductType;
|
|
|
|
+use App\Models\Product\Classs as ProductClass;
|
|
use App\Models\Product\Attr as ProductAttr;
|
|
use App\Models\Product\Attr as ProductAttr;
|
|
use App\Models\Product\Skus as ProductSkus;
|
|
use App\Models\Product\Skus as ProductSkus;
|
|
use App\Models\Product\City as ProductCity;
|
|
use App\Models\Product\City as ProductCity;
|
|
@@ -37,13 +38,14 @@ class Product extends Auth{
|
|
* 首页列表
|
|
* 首页列表
|
|
*
|
|
*
|
|
* */
|
|
* */
|
|
- public function index(Model $Model,City $City,ProductCity $ProductCity,OrdersProduct $OrdersProduct,Business $Business){
|
|
|
|
|
|
+ public function index(Model $Model,City $City,ProductCity $ProductCity,ProductClass $ProductClass,OrdersProduct $OrdersProduct,Business $Business){
|
|
// 接受参数
|
|
// 接受参数
|
|
$code = request('product_code','');
|
|
$code = request('product_code','');
|
|
$name = request('name','');
|
|
$name = request('name','');
|
|
$status = request('status');
|
|
$status = request('status');
|
|
$startTime = request('start_time','');
|
|
$startTime = request('start_time','');
|
|
$businessId = request('business_id','');
|
|
$businessId = request('business_id','');
|
|
|
|
+ $classId = request('class_id',0);
|
|
$provinceId = request('province_id','');
|
|
$provinceId = request('province_id','');
|
|
$cityIds = request('city_ids',[]);
|
|
$cityIds = request('city_ids',[]);
|
|
$cityList = $City->getCityList();
|
|
$cityList = $City->getCityList();
|
|
@@ -67,6 +69,7 @@ class Product extends Auth{
|
|
// 编码ID
|
|
// 编码ID
|
|
if( $id ) $map[] = ['product.id','=',$id];
|
|
if( $id ) $map[] = ['product.id','=',$id];
|
|
if( $businessId ) $map[] = ['product.business_id','=',$businessId];
|
|
if( $businessId ) $map[] = ['product.business_id','=',$businessId];
|
|
|
|
+ if( $classId ) $map[] = ['product.class_id','=',$classId];
|
|
if( $name ) $map[] = ['product.name','like','%'.$name.'%'];
|
|
if( $name ) $map[] = ['product.name','like','%'.$name.'%'];
|
|
if( $startTime ) $map[] = ['product.insert_time','>=',Carbon::createFromFormat('Y-m-d',$startTime)->startOfDay()->getTimestamp()];
|
|
if( $startTime ) $map[] = ['product.insert_time','>=',Carbon::createFromFormat('Y-m-d',$startTime)->startOfDay()->getTimestamp()];
|
|
if( $startTime ) $map[] = ['product.insert_time','<=',Carbon::createFromFormat('Y-m-d',$startTime)->endOfDay()->getTimestamp()];
|
|
if( $startTime ) $map[] = ['product.insert_time','<=',Carbon::createFromFormat('Y-m-d',$startTime)->endOfDay()->getTimestamp()];
|
|
@@ -117,8 +120,11 @@ class Product extends Auth{
|
|
}
|
|
}
|
|
// 获取列表
|
|
// 获取列表
|
|
$businessList = $Business->getListByAdmin();
|
|
$businessList = $Business->getListByAdmin();
|
|
|
|
+ // 获取列表
|
|
|
|
+ $classList = $ProductClass->getList();
|
|
// 分配数据
|
|
// 分配数据
|
|
$this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
|
|
$this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
|
|
|
|
+ $this->assign('classList',$classList);
|
|
$this->assign('cityList',$cityList);
|
|
$this->assign('cityList',$cityList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('list', $list);
|
|
$this->assign('list', $list);
|
|
@@ -246,7 +252,7 @@ class Product extends Auth{
|
|
* 添加
|
|
* 添加
|
|
*
|
|
*
|
|
* */
|
|
* */
|
|
- public function add(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
|
|
|
|
+ public function add(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType,ProductClass $ProductClass, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
if( request()->isMethod('post') ){
|
|
if( request()->isMethod('post') ){
|
|
// 验证参数
|
|
// 验证参数
|
|
$request->scene('add')->validate();
|
|
$request->scene('add')->validate();
|
|
@@ -259,6 +265,7 @@ class Product extends Auth{
|
|
$data['market_price'] = request('market_price',0);
|
|
$data['market_price'] = request('market_price',0);
|
|
$data['producer_id'] = request('producer_id',0);
|
|
$data['producer_id'] = request('producer_id',0);
|
|
$data['business_id'] = request('business_id',0);
|
|
$data['business_id'] = request('business_id',0);
|
|
|
|
+ $data['class_id'] = request('class_id',0);
|
|
$data['quota'] = request('quota',0);
|
|
$data['quota'] = request('quota',0);
|
|
$data['min_quota'] = request('min_quota',0);
|
|
$data['min_quota'] = request('min_quota',0);
|
|
$data['hide_orderbtn'] = request('hide_orderbtn',0);
|
|
$data['hide_orderbtn'] = request('hide_orderbtn',0);
|
|
@@ -444,6 +451,7 @@ class Product extends Auth{
|
|
}
|
|
}
|
|
// 获取类型数据
|
|
// 获取类型数据
|
|
$typeList = $ProductType->getList();
|
|
$typeList = $ProductType->getList();
|
|
|
|
+ $classList = $ProductClass->getList();
|
|
$cityList = $City->getCityList();
|
|
$cityList = $City->getCityList();
|
|
$businessList = $Business->getListByAdmin();
|
|
$businessList = $Business->getListByAdmin();
|
|
$producerList = $Producer->getList();
|
|
$producerList = $Producer->getList();
|
|
@@ -460,6 +468,7 @@ class Product extends Auth{
|
|
$this->assign('tagList',$tagList);
|
|
$this->assign('tagList',$tagList);
|
|
$this->assign('typeList',$typeList);
|
|
$this->assign('typeList',$typeList);
|
|
$this->assign('cityList',$cityList);
|
|
$this->assign('cityList',$cityList);
|
|
|
|
+ $this->assign('classList',$classList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('producerList',$producerList);
|
|
$this->assign('producerList',$producerList);
|
|
// 加载模板
|
|
// 加载模板
|
|
@@ -470,7 +479,7 @@ class Product extends Auth{
|
|
* 编辑
|
|
* 编辑
|
|
*
|
|
*
|
|
* */
|
|
* */
|
|
- public function edit(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
|
|
|
|
+ public function edit(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType,ProductClass $ProductClass, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
// 接收参数
|
|
// 接收参数
|
|
$id = request('id',0);
|
|
$id = request('id',0);
|
|
// 查询数据
|
|
// 查询数据
|
|
@@ -497,6 +506,7 @@ class Product extends Auth{
|
|
$data['putoff_time'] = request('putoff_time','');
|
|
$data['putoff_time'] = request('putoff_time','');
|
|
$data['producer_id'] = request('producer_id',0);
|
|
$data['producer_id'] = request('producer_id',0);
|
|
$data['business_id'] = request('business_id',0);
|
|
$data['business_id'] = request('business_id',0);
|
|
|
|
+ $data['class_id'] = request('class_id',0);
|
|
$data['type_id'] = request('type_id',0);
|
|
$data['type_id'] = request('type_id',0);
|
|
$data['stock'] = request('stock',0);
|
|
$data['stock'] = request('stock',0);
|
|
$data['status'] = 1;
|
|
$data['status'] = 1;
|
|
@@ -697,6 +707,7 @@ class Product extends Auth{
|
|
}
|
|
}
|
|
// 获取类型数据
|
|
// 获取类型数据
|
|
$typeList = $ProductType->getList();
|
|
$typeList = $ProductType->getList();
|
|
|
|
+ $classList = $ProductClass->getList();
|
|
$cityList = $City->getCityList();
|
|
$cityList = $City->getCityList();
|
|
$businessList = $Business->getListByAdmin();
|
|
$businessList = $Business->getListByAdmin();
|
|
$producerList = $Producer->getList();
|
|
$producerList = $Producer->getList();
|
|
@@ -712,6 +723,7 @@ class Product extends Auth{
|
|
$this->assign('tagList',$tagList);
|
|
$this->assign('tagList',$tagList);
|
|
$this->assign('typeList',$typeList);
|
|
$this->assign('typeList',$typeList);
|
|
$this->assign('cityList',$cityList);
|
|
$this->assign('cityList',$cityList);
|
|
|
|
+ $this->assign('classList',$classList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('producerList',$producerList);
|
|
$this->assign('producerList',$producerList);
|
|
$this->assign('oldData',$oldData);
|
|
$this->assign('oldData',$oldData);
|
|
@@ -728,7 +740,7 @@ class Product extends Auth{
|
|
* 编辑
|
|
* 编辑
|
|
*
|
|
*
|
|
* */
|
|
* */
|
|
- public function copy(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
|
|
|
|
+ public function copy(Request $request, Model $Model, WeiBanTagList $WeiBanTagList, ProductPhoto $ProductPhoto, Producer $Producer, Business $Business, ProductType $ProductType,ProductClass $ProductClass, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
if( request()->isMethod('post') ){
|
|
if( request()->isMethod('post') ){
|
|
// 验证参数
|
|
// 验证参数
|
|
$request->scene('add')->validate();
|
|
$request->scene('add')->validate();
|
|
@@ -741,6 +753,7 @@ class Product extends Auth{
|
|
$data['market_price'] = request('market_price',0);
|
|
$data['market_price'] = request('market_price',0);
|
|
$data['producer_id'] = request('producer_id',0);
|
|
$data['producer_id'] = request('producer_id',0);
|
|
$data['business_id'] = request('business_id',0);
|
|
$data['business_id'] = request('business_id',0);
|
|
|
|
+ $data['class_id'] = request('class_id',0);
|
|
$data['quota'] = request('quota',0);
|
|
$data['quota'] = request('quota',0);
|
|
$data['min_quota'] = request('min_quota',0);
|
|
$data['min_quota'] = request('min_quota',0);
|
|
$data['hide_orderbtn'] = request('hide_orderbtn',0);
|
|
$data['hide_orderbtn'] = request('hide_orderbtn',0);
|
|
@@ -967,12 +980,14 @@ class Product extends Auth{
|
|
// 获取类型数据
|
|
// 获取类型数据
|
|
$typeList = $ProductType->getList();
|
|
$typeList = $ProductType->getList();
|
|
$cityList = $City->getCityList();
|
|
$cityList = $City->getCityList();
|
|
|
|
+ $classList = $ProductClass->getList();
|
|
$businessList = $Business->getListByAdmin();
|
|
$businessList = $Business->getListByAdmin();
|
|
$producerList = $Producer->getList();
|
|
$producerList = $Producer->getList();
|
|
// 分配数据
|
|
// 分配数据
|
|
$this->assign('tagList',$tagList);
|
|
$this->assign('tagList',$tagList);
|
|
$this->assign('typeList',$typeList);
|
|
$this->assign('typeList',$typeList);
|
|
$this->assign('cityList',$cityList);
|
|
$this->assign('cityList',$cityList);
|
|
|
|
+ $this->assign('classList',$classList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('businessList',$businessList);
|
|
$this->assign('producerList',$producerList);
|
|
$this->assign('producerList',$producerList);
|
|
$this->assign('oldData',$oldData);
|
|
$this->assign('oldData',$oldData);
|