|
@@ -1,7 +1,6 @@
|
|
|
<?php namespace App\Http\Controllers\Admin;
|
|
|
|
|
|
use App\Http\Requests\Admin\Product as Request;
|
|
|
-use App\Models\AdminHistory;
|
|
|
use App\Models\Business;
|
|
|
use App\Models\City;
|
|
|
use App\Models\OrdersProduct;
|
|
@@ -15,7 +14,7 @@ use App\Models\Product\Skus as ProductSkus;
|
|
|
use App\Models\Product\City as ProductCity;
|
|
|
use App\Models\ProductPhoto;
|
|
|
use Illuminate\Support\Facades\DB;
|
|
|
-use App\Models\WeiBan\Tags as WeiBanTags;
|
|
|
+use App\Models\WeiBan\Taglist as WeiBanTagList;
|
|
|
use Intervention\Image\Facades\Image;
|
|
|
use Intervention\Image\Gd\Font;
|
|
|
use App\Facades\Servers\WechatMini\Mini;
|
|
@@ -38,7 +37,7 @@ class Product extends Auth{
|
|
|
* 首页列表
|
|
|
*
|
|
|
* */
|
|
|
- public function index(Model $Model,City $City,ProductCity $ProductCity,OrdersProduct $OrdersProduct,AdminHistory $AdminHistory,Business $Business){
|
|
|
+ public function index(Model $Model,City $City,ProductCity $ProductCity,OrdersProduct $OrdersProduct,Business $Business){
|
|
|
// 接受参数
|
|
|
$code = request('product_code','');
|
|
|
$name = request('name','');
|
|
@@ -245,7 +244,7 @@ class Product extends Auth{
|
|
|
* 添加
|
|
|
*
|
|
|
* */
|
|
|
- public function add(Request $request, Model $Model, WeiBanTags $WeiBanTags, 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, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
|
if( request()->isMethod('post') ){
|
|
|
// 验证参数
|
|
|
$request->scene('add')->validate();
|
|
@@ -446,7 +445,7 @@ class Product extends Auth{
|
|
|
$businessList = $Business->getListByAdmin();
|
|
|
$producerList = $Producer->getList();
|
|
|
// 标签列表
|
|
|
- $tagData = $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
|
|
|
+ $tagData = $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
|
|
|
// 标签列表
|
|
|
$tagList = [];
|
|
|
// 循环数据
|
|
@@ -468,7 +467,7 @@ class Product extends Auth{
|
|
|
* 编辑
|
|
|
*
|
|
|
* */
|
|
|
- public function edit(Request $request, Model $Model, WeiBanTags $WeiBanTags, 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, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
|
// 接收参数
|
|
|
$id = request('id',0);
|
|
|
// 查询数据
|
|
@@ -698,7 +697,7 @@ class Product extends Auth{
|
|
|
$businessList = $Business->getListByAdmin();
|
|
|
$producerList = $Producer->getList();
|
|
|
// 标签列表
|
|
|
- $tagData = $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
|
|
|
+ $tagData = $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
|
|
|
// 标签列表
|
|
|
$tagList = [];
|
|
|
// 循环数据
|
|
@@ -725,7 +724,7 @@ class Product extends Auth{
|
|
|
* 编辑
|
|
|
*
|
|
|
* */
|
|
|
- public function copy(Request $request, Model $Model, WeiBanTags $WeiBanTags, 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, ProductSpec $ProductSpec, ProductAttr $ProductAttr, ProductSkus $ProductSkus, City $City, ProductCity $ProductCity){
|
|
|
if( request()->isMethod('post') ){
|
|
|
// 验证参数
|
|
|
$request->scene('add')->validate();
|
|
@@ -953,7 +952,7 @@ class Product extends Auth{
|
|
|
$skuList[$key] = $value;
|
|
|
}
|
|
|
// 标签列表
|
|
|
- $tagData = $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
|
|
|
+ $tagData = $WeiBanTagList->query()->get(['tag_group_name as group','tag_name as name'])->toArray();
|
|
|
// 标签列表
|
|
|
$tagList = [];
|
|
|
// 循环数据
|