Explorar el Código

【Mod】移除无用代码

liuxiangxin hace 4 meses
padre
commit
fb595a5913

+ 0 - 18
app/Http/Controllers/Admin/Coupon.php

@@ -42,19 +42,8 @@ class Coupon extends Auth{
 		if( $startTime )		$map[] = ['start_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['end_time','<=',strtotime($endTime)];
 		if( !is_null($status) )	$map[] = ['status','=',$status];
-        $session                = session('userRule');
-        if ($session){
-            $map[] = ['company_id','=',$session['company_id']];
-            if ($session['business_id']){
-                $map[] = ['business_id','=',$session['business_id']];
-            }
-            if ($session['menu_type'] == 1 && $session['data_type'] == 2){
-                $shopIds       =  Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray();
-            }
-        }
 		// 查询数据
 		$list					= $Model->query()->where($map);
-        if (isset($shopIds))    $list->whereIn('business_id',$shopIds);
         $list                   =  $list->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
 		// 计算各个优惠券的数量
 		$customTotal			= $CustomCoupon->whereIn('coupon_id',array_column($list->toArray()['data'],'id'))->groupBy('coupon_id')->select([DB::raw('count(*) as total'),'coupon_id'])->pluck('total','coupon_id')->toArray();
@@ -62,7 +51,6 @@ class Coupon extends Auth{
 		foreach ($list as $key => $value) {
 			// id转编号
 			$value['coupon_code']= $Model->idToCode($value['id']);
-			$value['business_name']= Business::query()->where('id',$value['business_id'])->value('name');
 			// 发放类型
 			$value['gant_name']  = $Model->getGrantType($value['grant_type'],'name');
 			// 如果已经到了结束时间。活动结束
@@ -122,7 +110,6 @@ class Coupon extends Auth{
 			$data['type_id']		= request('type_id',1);
 			$data['grant_type']		= request('grant_type',1);
 			$data['status']			= request('status',2);
-            $data['business_id']	= request('business_id',0);
 			$cityIds				= request('city_ids',[]);
 			$data['city_ids']		= implode(',',$cityIds);
 			// 转换时间,默认现在现在生效
@@ -189,11 +176,9 @@ class Coupon extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		$grantList					= $Model->getGrantTypeList();
-        $businessList 			    = $Business->getList();
 		// 分配数据
 		$this->assign('cityList',$cityList);
 		$this->assign('grantList',$grantList);
-		$this->assign('businessList',$businessList);
 		$this->assign('crumbs','新增');
 		// 加载模板
 		return 						$this->fetch();
@@ -222,7 +207,6 @@ class Coupon extends Auth{
 			$data['end_time'] 		= request('end_time','');
 			$data['type_id']		= request('type_id',1);
 			$data['grant_type']		= request('grant_type',1);
-			$data['business_id']	= request('business_id',1);
 			$cityIds				= request('city_ids',[]);
 			$data['city_ids']		= implode(',',$cityIds);
 			// 转换时间,默认现在现在生效
@@ -306,11 +290,9 @@ class Coupon extends Auth{
 		// 获取列表
 		$cityList					= $City->getCityList();
 		$grantList					= $Model->getGrantTypeList();
-        $businessList 			    = $Business->getList();
 		// 分配数据
 		$this->assign('cityList',$cityList);
 		$this->assign('grantList',$grantList);
-		$this->assign('businessList',$businessList);
 		$this->assign('oldData',$oldData);
 		$this->assign('crumbs','修改');
 		// 加载模板

+ 0 - 22
app/Http/Controllers/Admin/CouponActive.php

@@ -34,25 +34,13 @@ class CouponActive extends Auth{
 		$map 					= [];
 		// 组合条件
 		if( $name )				$map[] = ['name','=',$name];
-        $session                = session('userRule');
-        if ($session){
-            $map[] = ['company_id','=',$session['company_id']];
-            if ($session['business_id']){
-                $map[] = ['business_id','=',$session['business_id']];
-            }
-            if ($session['menu_type'] == 1 && $session['data_type'] == 2){
-                $shopIds       =  Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray();
-            }
-        }
 		// 查询数据
 		$list					= $Model->query()->where($map);
-        if (isset($shopIds))    $list->whereIn('business_id',$shopIds);
         $list					= $list->orderByDesc('id')->paginate(config('page_num',10));
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 小程序链接
 			$value['mp_urllink']= $this->getUrlLink($value['id']);
-            $value['business_name']	= Business::query()->where([['id','=',$value['business_id']]])->value('name');
 			// 重组
 			$list[$key]			= $value;
 		}
@@ -155,11 +143,6 @@ class CouponActive extends Auth{
 			$data['city_ids']		= implode(',',$cityIds);
 			$data['tag_scope']		= implode(',',$tagScope);
 			$data['status']			= 1;
-            $data['business_id']	= request('business_id',0);
-            $session                = session('userRule');
-            if ($session){
-                $data['company_id'] = $session['company_id'];
-            }
 			// 写入数据表
 			$id						= $Model->add($data);
 			// 如果操作失败
@@ -171,7 +154,6 @@ class CouponActive extends Auth{
 		}
 		// 获取列表
 		$cityList					= $City->getCityList();
-        $businessList 			    = $Business->getList();
 		// 标签列表
 		$tagData					= $WeiBanTags->query()->groupBy('group')->groupBy('name')->get(['group','name'])->toArray();
 		// 标签列表
@@ -183,7 +165,6 @@ class CouponActive extends Auth{
 		// 分配数据
 		$this->assign('cityList',$cityList);
 		$this->assign('tagList',$tagList);
-        $this->assign('businessList',$businessList);
 		$this->assign('crumbs','新增');
 		// 加载模板
 		return						$this->fetch(); 
@@ -214,7 +195,6 @@ class CouponActive extends Auth{
 			$tagScope				= request('tag_scope',[]);
 			$data['city_ids']		= implode(',',$cityIds);
 			$data['tag_scope']		= implode(',',$tagScope);
-            $data['business_id']	= request('business_id',0);
 			// 写入数据表
 			$result					= $Model->edit($id,$data);
 			// 如果操作失败
@@ -239,10 +219,8 @@ class CouponActive extends Auth{
 		foreach ($tagData as $value) {
 			$tagList[$value['group']][] = $value['name'];
 		}
-        $businessList 			    = $Business->getList();
 		// 分配数据
 		$this->assign('cityList',$cityList);
-        $this->assign('businessList',$businessList);
 		$this->assign('tagList',$tagList);
 		$this->assign('oldData',$oldData);
 		$this->assign('crumbs','修改');

+ 0 - 25
app/Http/Controllers/Admin/CouponRewardRule.php

@@ -28,25 +28,13 @@ class CouponRewardRule extends Auth{
     public function index(Model $Model,Coupon $Coupon,Business $Business){
 		// 查询条件
 		$map 					= [];
-        $session                = session('userRule');
-        if ($session){
-            $map[] = ['company_id','=',$session['company_id']];
-            if ($session['business_id']){
-                $map[] = ['business_id','=',$session['business_id']];
-            }
-            if ($session['menu_type'] == 1 && $session['data_type'] == 2){
-                $shopIds       =  Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray();
-            }
-        }
 		// 查询数据
 		$list					= $Model->query()->where($map);
-        if (isset($shopIds))    $list->whereIn('business_id',$shopIds);
         $list                   = $list->orderByDesc('id')->paginate(config('page_num',10));
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 优惠券名称
 			$value['coupon_name']	= $Coupon->query()->where([['id','=',$value['coupon_id']]])->value('name');
-			$value['business_name']	= Business::query()->where([['id','=',$value['business_id']]])->value('name');
 			// 重组
 			$list[$key]			= $value;
 		}
@@ -75,17 +63,9 @@ class CouponRewardRule extends Auth{
 			$data['start_time']		= $data['start_time'] ? strtotime($data['start_time']) : 0;
 			$data['end_time']		= $data['end_time'] ? strtotime($data['end_time']) : 0;
 			$data['status']			= 1;
-            $data['business_id']	= request('business_id',0);
-            $session                = session('userRule');
-            if ($session){
-                $data['company_id'] = $session['company_id'];
-            }
 			$cityIds				= request('city_ids',[]);
 			$data['city_ids']		= implode(',',$cityIds);
 			$removeCustom			= request('remove_custom','');
-            //店铺优惠卷是否存在
-            $res                    = $Coupon::query()->where(['id'=>$data['coupon_id'],'business_id'=>$data['business_id']])->first();
-            if (!$res)              return json_send(['code'=>'error','msg'=>'新增失败,店铺优惠卷编码错误']);
 			// 循环处理
 			if( $removeCustom )		{
 				// 兼容逗号问题
@@ -119,10 +99,8 @@ class CouponRewardRule extends Auth{
 		}
 		// 获取列表
 		$cityList					= $City->getCityList();
-        $businessList 			    = $Business->getList();
 		// 分配数据
 		$this->assign('cityList',$cityList);
-        $this->assign('businessList',$businessList);
 		$this->assign('crumbs','新增');
 		// 加载模板
 		return						$this->fetch(); 
@@ -150,7 +128,6 @@ class CouponRewardRule extends Auth{
 			$data['end_time']		= request('end_time','');
 			$data['start_time']		= $data['start_time'] ? strtotime($data['start_time']) : 0;
 			$data['end_time']		= $data['end_time'] ? strtotime($data['end_time']) : 0;
-            $data['business_id']	= request('business_id',0);
 			$cityIds				= request('city_ids',[]);
 			$data['city_ids']		= implode(',',$cityIds);
 			$removeCustom			= request('remove_custom','');
@@ -205,10 +182,8 @@ class CouponRewardRule extends Auth{
 		$oldData['city_ids']		= explode(',',$oldData['city_ids']);
 		// 获取列表
 		$cityList					= $City->getCityList();
-        $businessList 			    = $Business->getList();
 		// 分配数据
 		$this->assign('cityList',$cityList);
-        $this->assign('businessList',$businessList);
 		$this->assign('oldData',$oldData);
 		$this->assign('crumbs','修改');
 		// 加载模板

+ 0 - 12
app/Http/Controllers/Admin/CustomCoupon.php

@@ -43,20 +43,9 @@ class CustomCoupon extends Auth{
 		if( $startTime )		$map[] = ['custom_coupon.insert_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['custom_coupon.insert_time','<=',strtotime($endTime)];
 		if( !is_null($status) )	$map[] = ['custom_coupon.status','=',$status];
-        $session                = session('userRule');
-        if ($session){
-            $map[] = ['coupon.company_id','=',$session['company_id']];
-            if ($session['business_id']){
-                $map[] = ['coupon.business_id','=',$session['business_id']];
-            }
-            if ($session['menu_type'] == 1 && $session['data_type'] == 2){
-                $shopIds       =  Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray();
-            }
-        }
 		// 查询数据
 		$list					= $Model
 								->query()->join('coupon','custom_coupon.coupon_id','=','coupon.id');
-        if (isset($shopIds))    $list->whereIn('coupon.business_id',$shopIds);
         $list                   =   $list->where($map)
 								->orderBy('custom_coupon.status')
 								->orderByDesc('custom_coupon.id')
@@ -73,7 +62,6 @@ class CustomCoupon extends Auth{
 			$value['custom_name'] = $Custom->getValue($value['custom_uid'],'username');
 			// id转编号
 			$value['admin_name']  = $AdminUser->getOne($value['admin_uid'],'username');
-            $value['business_name']= Business::query()->where('id',$value['business_id'])->value('name');
 			// 如果过期时间
 			if( $value['status'] == 0 && $value['exp_time'] <= time() ) {
 				// 状态设置

+ 0 - 22
app/Http/Controllers/Admin/Promo.php

@@ -44,19 +44,8 @@ class Promo extends Auth{
 		if( $startTime )		$map[] = ['start_time','>=',strtotime($startTime)];
 		if( $endTime )			$map[] = ['end_time','<=',strtotime($endTime)];
 		if( !is_null($status) )	$map[] = ['status','=',$status];
-        $session                = session('userRule');
-        if ($session){
-            $map[] = ['company_id','=',$session['company_id']];
-            if ($session['business_id']){
-                $map[] = ['business_id','=',$session['business_id']];
-            }
-            if ($session['menu_type'] == 1 && $session['data_type'] == 2){
-                $shopIds       =  Business::query()->where('leader_uid',$session['admin_uid'])->pluck('id')->toArray();
-            }
-        }
 		// 查询数据
 		$list					= $Model->query()->where($map);
-        if (isset($shopIds))    $list->whereIn('business_id',$shopIds);
         $list                   =    $list->orderByDesc('id')->paginate(request('limit',config('page_num',10)))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
@@ -90,7 +79,6 @@ class Promo extends Auth{
 				// 返回结果
 				$value['rebate'] 	= (string) $PromoRebate->query()->join('product','promo_rebate.product_id','=','product.id')->where([['promo_id','=',$value['id']]])->value('product.name');
 			}
-            $value['business_name']	= Business::query()->where([['id','=',$value['business_id']]])->value('name');
 			// 重组
 			$list[$key]				= $value;
 		}
@@ -141,11 +129,6 @@ class Promo extends Auth{
 				// 设置为0,避免数据异常
 				$data['rebate']     = 0;
 			}
-            $data['business_id']	= request('business_id',0);
-            $session                = session('userRule');
-            if ($session){
-                $data['company_id'] = $session['company_id'];
-            }
 			// 组合数据,写入订单表,子表
 			DB::beginTransaction();
 			try {
@@ -193,12 +176,10 @@ class Promo extends Auth{
             $tagList[$value['group']][] = $value['name'];
         }
 		$grantList					= $Model->getGrantTypeList();
-        $businessList 			    = $Business->getList();
 		// 分配数据
 		$this->assign('cityList',$cityList);
 		$this->assign('grantList',$grantList);
 		$this->assign('tagList',$tagList);
-        $this->assign('businessList',$businessList);
 		$this->assign('crumbs','新增');
 		// 加载模板
 		return 						$this->fetch();
@@ -227,7 +208,6 @@ class Promo extends Auth{
             $data['type_id']		= request('type_id',1);
 			$cityIds				= request('city_ids',[]);
             $tagScope				= request('tag_scope',[]);
-            $data['business_id']	= request('business_id',0);
             $data['city_ids']		= implode(',',$cityIds);
             $data['tag_scope']		= implode(',',$tagScope);
 			// 转换时间,默认现在现在生效
@@ -315,13 +295,11 @@ class Promo extends Auth{
         foreach ($tagData as $value) {
             $tagList[$value['group']][] = $value['name'];
         }
-        $businessList 			    = $Business->getList();
 		// 分配数据
 		$this->assign('cityList',$cityList);
 		$this->assign('grantList',$grantList);
 		$this->assign('tagList',$tagList);
 		$this->assign('oldData',$oldData);
-        $this->assign('businessList',$businessList);
 		$this->assign('crumbs','修改');
 		// 加载模板
 		return 					$this->fetch();

+ 0 - 3
app/Http/Controllers/Admin/PromoProduct.php

@@ -79,9 +79,6 @@ class PromoProduct extends Auth{
             //查询产品店铺是否与活动一致
             $productInfo            =   $Product->getOne($data['product_id']);
             $promoInfo              =   $Promo->getOne($data['promo_id']);
-            if ($productInfo['business_id'] !== $promoInfo['business_id']) {
-                return json_send(['code'=>'error','msg'=>'产品所属店铺不一致']);
-            }
 			// 写入数据表
 			$id						= $Model->add($data);
 			// 如果操作失败

+ 0 - 8
resources/views/admin/coupon/add.blade.php

@@ -88,14 +88,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			@endforeach
 		</select>
 	</div>
-	<div class="form-group col-sm-2">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" selected >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		@csrf
 		<input id="send" type="submit" value="提交" class="btn btn-primary btn-block" />

+ 0 - 8
resources/views/admin/coupon/edit.blade.php

@@ -88,14 +88,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			@endforeach
 		</select>
 	</div>
-	<div class="form-group col-sm-2">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" @if( $value['id'] == $oldData['business_id']) selected @endif >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		@csrf
 		<input type="hidden" name="id" value="{{$oldData['id']}}" />

+ 0 - 1
resources/views/admin/coupon/index.blade.php

@@ -96,7 +96,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 							@endif
 						</td>
 						<td> {{$a['gant_name']}} </td>
-						<td> {{$a['business_name']}} </td>
 						<td>
 							@if ($a['status'] == 0) 
 

+ 0 - 8
resources/views/admin/coupon_active/add.blade.php

@@ -49,14 +49,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			@endforeach
 		</select>
 	</div>
-	<div class="form-group col-sm-6">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" selected >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		<label class="control-label">活动规则</label>
 		<textarea class="form-control" name="active_rule" rows="10" placeholder="请输入活动规则" maxlength="255" ></textarea>

+ 0 - 8
resources/views/admin/coupon_active/edit.blade.php

@@ -49,14 +49,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			@endforeach
 		</select>
 	</div>
-	<div class="form-group col-sm-6">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" @if( $value['id'] == $oldData['business_id']) selected @endif >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		<label class="control-label">活动规则</label>
 		<textarea class="form-control" name="active_rule" rows="10" placeholder="请输入活动规则" >{{$oldData['active_rule']}}</textarea>

+ 0 - 1
resources/views/admin/coupon_active/index.blade.php

@@ -46,7 +46,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 							<td>{{date('Y/m/d H:i:s',$a['end_time'])}}</td>
 							<td>/pages/coupon/active?id={{$a['id']}}</td>
 							<td>{{$a['mp_urllink']}}</td>
-							<td>{{$a['business_name']}}</td>
 							<td>
 								@if( $a['status'] )
 								停用

+ 0 - 8
resources/views/admin/coupon_reward_rule/add.blade.php

@@ -36,14 +36,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			@endforeach
 		</select>
 	</div>
-	<div class="form-group col-sm-12">
-		<label class="control-label">店铺</label>
-		<select name="business_id" class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" selected >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		<label class="control-label">排除客户</label>
 		<textarea class="form-control" name="remove_custom" rows="10" placeholder="需要排除的客户编码,多个使用换行" ></textarea>

+ 0 - 8
resources/views/admin/coupon_reward_rule/edit.blade.php

@@ -36,14 +36,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			@endforeach
 		</select>
 	</div>
-	<div class="form-group col-sm-2">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" @if( $value['id'] == $oldData['business_id']) selected @endif >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		<label class="control-label">排除客户</label>
 		<textarea class="form-control" name="remove_custom" rows="10" placeholder="需要排除的客户编码,多个使用换行" >{{$oldData['remove_custom']}}</textarea>

+ 0 - 1
resources/views/admin/coupon_reward_rule/index.blade.php

@@ -46,7 +46,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 							<td> {{date('Y/m/d H:i:s',$a['start_time'])}}</td>
 							<td> {{date('Y/m/d H:i:s',$a['end_time'])}}</td>
 							<td>{{$a['coupon_name']}}</td>
-							<td>{{$a['business_name']}}</td>
 							<td>{{$a['status']?'停用':'启用'}}</td>
 							<td> {{date('Y/m/d H:i:s',$a['update_time'])}}</td>
 							<td>

+ 0 - 1
resources/views/admin/custom_coupon/index.blade.php

@@ -68,7 +68,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 					<tr>
 						<td> {{$a['coupon_code']}}</td>
 						<td> {{$a['coupon_name']}}</td>
-						<td> {{$a['business_name']}}</td>
 						<td> {{$a['custom_code']}}</td>
 						<td> {{$a['custom_name']}}</td>
 						<td> 

+ 0 - 8
resources/views/admin/orders/index.blade.php

@@ -40,14 +40,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<input type="text" class="form-control" name="contact_area" value="{{request('contact_area','')}}" placeholder="请输入区县查询" />
 	</div>
-	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
-		<select name="business_id" class="form-control">
-			<option value="" >商业公司</option>
-			@foreach ($businessList as $business)
-				<option value="{{$business['id']}}" @if (request('business_id',0) == $business['id'] ) selected="selected" @endif >{{$business['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col col-lg-2 col-md-2 col-sm-2 col-xs-12" style="margin-right: 2px;">
 		<select name="status" class="form-control">
 			<option value="" >订单状态</option>

+ 0 - 8
resources/views/admin/promo/add.blade.php

@@ -72,14 +72,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			</div>
 		</div>
 	</div>
-	<div class="form-group col-sm-6">
-		<label class="control-label">店铺</label>
-		<select name="business_id" class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" selected >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		@csrf
 		<input id="send" type="submit" value="提交" class="btn btn-primary btn-block" />

+ 0 - 8
resources/views/admin/promo/edit.blade.php

@@ -72,14 +72,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			</div>
 		</div>
 	</div>
-	<div class="form-group col-sm-2">
-		<label class="control-label">店铺</label>
-		<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" @if( $value['id'] == $oldData['business_id']) selected @endif >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		@csrf
 		<input type="hidden" name="id" value="{{$oldData['id']}}" />

+ 0 - 1
resources/views/admin/promo/index.blade.php

@@ -92,7 +92,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 								全部商品
 							@endif
 						</td>
-						<td> {{$a['business_name']}}</td>
 						<td> 
 							@if ($a['status'] == 0) 
 

+ 0 - 8
resources/views/admin/regiment_active/add.blade.php

@@ -79,14 +79,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 			<label class="radio-inline"><input type="radio" value="1" name="virtually" >关闭</label>
 		</div>
 	</div>
-	<div class="form-group col-sm-6">
-		<label class="control-label">商业公司</label>
-		<select name="business_id" class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-			@foreach ($businessList as $value)
-				<option value="{{$value['id']}}" selected >{{$value['name']}}</option>
-			@endforeach
-		</select>
-	</div>
 	<div class="form-group col-sm-12">
 		@csrf
 		<input id="send" type="submit" value="提交" class="btn btn-primary btn-block" />

+ 0 - 8
resources/views/admin/regiment_active/edit.blade.php

@@ -79,14 +79,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 				<label class="radio-inline"><input type="radio" value="1" name="virtually" @if($oldData['virtually'] == 1) checked @endif>关闭</label>
 			</div>
 		</div>
-		<div class="form-group col-sm-6">
-			<label class="control-label">商业公司</label>
-			<select name="business_id" required class="form-control selectpicker" data-live-search="true" data-live-search-placeholder="搜索商业公司" data-none-results-text="未搜索到 {0}" title="选择商业公司">
-				@foreach ($businessList as $value)
-					<option value="{{$value['id']}}" @if( $value['id'] == $oldData['business_id']) selected @endif >{{$value['name']}}</option>
-				@endforeach
-			</select>
-		</div>
 		<div class="form-group col-sm-12">
 			@csrf
 			<input type="hidden" name="id" id="id" value="{{$oldData['id']}}" />