修改bug

app/Http/Controllers/Admin/AuthManager.php

@@ -6,41 +6,41 @@ use Illuminate\Support\Facades\DB;
 
 /**
  * 权限管理
- * 
+ *
  * @author    刘相欣
  *
  */
 class AuthManager extends Auth{
-	
-	/**
-	 * 初始化
-	 * 
-	 * */
-	protected function _initialize(){
-		parent::_initialize();
-		$this->assign('breadcrumb1','系统');
-		$this->assign('breadcrumb2','权限管理');
-	}
-	
-	/**
-	 * 初始化
-	 * 
-	 * */
+
+    /**
+     * 初始化
+     *
+     * */
+    protected function _initialize(){
+        parent::_initialize();
+        $this->assign('breadcrumb1','系统');
+        $this->assign('breadcrumb2','权限管理');
+    }
+
+    /**
+     * 初始化
+     *
+     * */
     public function index(){
         $mp                     =   [];
-        $session                = session('userRule');
-        if ($session){
-            $mp['auth_group.company_id']	= $session['company_id'];
-            $mp['auth_group.menu_type']    = $session['menu_type'];
-            if ($session['business_id']){
-                $mp['auth_group.business_id']       = $session['business_id'];
-            }
-        }
         if(!in_array(admin('uid'), explode(',', config('administrator')))){
             $mp['auth_group.type']       = 1;
+            $session                = session('userRule');
+            if ($session){
+                $mp['auth_group.company_id']	= $session['company_id'];
+                $mp['auth_group.menu_type']    = $session['menu_type'];
+                if ($session['business_id']){
+                    $mp['auth_group.business_id']       = $session['business_id'];
+                }
+            }
         }
-  		// 查询列表数据
-     	$list = DB::table('auth_group')
+        // 查询列表数据
+        $list = DB::table('auth_group')
             ->join('company', 'company.id', '=', 'auth_group.company_id')
             ->where($mp)
             ->select('auth_group.*', 'company.name as company_name')
@@ -52,23 +52,23 @@ class AuthManager extends Auth{
             }
             $list[$k] = $v;
         }
-		// 分配数据
-		$this->assign('list',$list);
-		// 加载模板
-    	return $this->fetch();
-	}
+        // 分配数据
+        $this->assign('list',$list);
+        // 加载模板
+        return $this->fetch();
+    }
 
-	/**
-	 * 新增
-	 * 
-	 * */
-	public function add(Request $request){
-		if(request()->isMethod('post')){
-			// 验证参数
-			$request->scene('add')->validate();
-			// 接收参数
-			$data['title']			= request('title','');
-			$data['description']	= request('description','');
+    /**
+     * 新增
+     *
+     * */
+    public function add(Request $request){
+        if(request()->isMethod('post')){
+            // 验证参数
+            $request->scene('add')->validate();
+            // 接收参数
+            $data['title']			= request('title','');
+            $data['description']	= request('description','');
             $session                = session('userRule');
             if ($session){
                 $data['company_id']	= $session['company_id'];
@@ -78,144 +78,151 @@ class AuthManager extends Auth{
                 }
             }
             $data['type']           = 1;
-			// 返回结果
-			$result					= DB::table('auth_group')->insert($data);
-			// 如果状态停用
-			if( !$result )			return json_send(['code'=>'error','msg'=>'添加失败']);
-			// 结果
-			return json_send(['code'=>'success','msg'=>'添加成功','action'=>'add']);
-		}
-		$this->assign('crumbs','新增');
-		return $this->fetch();
-	}
-	
-	/**
-	 * 编辑
-	 * 
-	 * */
-	public function edit(Request $request){
-		if(request()->isMethod('post')){
-			// 验证参数
-			$request->scene('edit')->validate();
-			// 接收参数
-			$id						= request('id',0);
-			$data['title']			= request('title','');
-			$data['description']	= request('description','');
-			// 返回结果
-			$result					= DB::table('auth_group')->where(['id'=>$id])->update($data);
-			// 如果状态停用
-			if( !$result )			return json_send(['code'=>'error','msg'=>'编辑失败']);
-			// 结果
-			return json_send(['code'=>'success','msg'=>'编辑成功','action'=>'edit']);
-		}
-		$group = DB::table('auth_group')->find((int)request('id'));
+            // 返回结果
+            $result					= DB::table('auth_group')->insert($data);
+            // 如果状态停用
+            if( !$result )			return json_send(['code'=>'error','msg'=>'添加失败']);
+            // 结果
+            return json_send(['code'=>'success','msg'=>'添加成功','action'=>'add']);
+        }
+        $this->assign('crumbs','新增');
+        return $this->fetch();
+    }
+
+    /**
+     * 编辑
+     *
+     * */
+    public function edit(Request $request){
+        if(request()->isMethod('post')){
+            // 验证参数
+            $request->scene('edit')->validate();
+            // 接收参数
+            $id						= request('id',0);
+            $data['title']			= request('title','');
+            $data['description']	= request('description','');
+            // 返回结果
+            $result					= DB::table('auth_group')->where(['id'=>$id])->update($data);
+            // 如果状态停用
+            if( !$result )			return json_send(['code'=>'error','msg'=>'编辑失败']);
+            // 结果
+            return json_send(['code'=>'success','msg'=>'编辑成功','action'=>'edit']);
+        }
+        $group = DB::table('auth_group')->find((int)request('id'));
 
-		$merge_group = explode(',',config('CUSTOM_GROUP'));
-		array_push($merge_group,$group['id']);
-		$this->assign('group',$group);
-		$this->assign('crumbs','编辑');
-		return $this->fetch();		
-	}
-	
-	/**
-	 * 删除
-	 * 
-	 * */
-	public function del(Request $request){
-		// 验证参数
-		$request->scene('del')->validate();
-		// 接收参数
-		$id				= request('id',0);
-		// 执行删除
-		$result			= DB::table('auth_group')->delete($id);
-		// 错误告知
-		if( !$result )	return json_send(['code'=>'error','msg'=>'删除失败']);
-		// 结果
-		return json_send(['code'=>'success','msg'=>'删除成功']);
-	}
+        $merge_group = explode(',',config('CUSTOM_GROUP'));
+        array_push($merge_group,$group['id']);
+        $this->assign('group',$group);
+        $this->assign('crumbs','编辑');
+        return $this->fetch();
+    }
 
-	/**
-	 * 授权
-	 * 
-	 * */
-	public function access(Request $request){
-		// 验证参数
-		$request->scene('del')->validate();
-		// 如果是post
-		if(request()->isMethod('post')){
-			// 接收参数
-		 	$data['rules']			= (array) request('rules',[]);
-			// 权限组Id
-			$group_id				= (int) request('id',0);
-			// 删除权限
-			DB::table('auth_rule')->where(['group_id'=>$group_id])->delete();
-			// 存在权限
-		 	if( isset($data['rules']) ){
-		 		// 排序
-	            sort($data['rules']);
-				// 切割
-	            $data['rules']  = implode( ',' , array_unique($data['rules']));
-	        }
-			// 修改权限
-			$result 			= DB::table('auth_group')->where(['id'=>$group_id])->update($data);
-			// 告知结果
-			if( !$result ) 		return	json_send(['code'=>'success','msg'=>'权限组修改失败','action'=>'edit']);
-			// 权限组菜单
-			$group_menu			= DB::table('auth_group')->find($group_id);
-			// 菜单ID
-			$menu_id			= explode(',', $group_menu['rules']);
-			// 获得菜单列表
-			$menu_list			= DB::table('menu')->get()->toArray();
-			// 循环菜单ID
-			foreach ($menu_id as $v) {
-				// 循环菜单列表
-				foreach ($menu_list as $v1) {
-					// 如果对应的菜单
-					if( $v == $v1['id'] ){
-						// 组合菜单权限数据
-						$m['menu_id']	= $v;
-						$m['group_id']	= $group_id;
-						$m['name']		= !empty($v1['url']) ? $v1['url'] : '';
-						// 写入菜单权限规则表
-						DB::table('auth_rule')->insert($m);
-					}
-				}					
-			}
-			// 告知结果
-			return json_send(['code'=>'success','msg'=>'编辑成功','action'=>'edit']);
-		}
-		// 接收参数
-		$id			= request('id',0);
-		// 获取菜单
-		$menu		= DB::table('menu')->orderBy('sort_order')->get()->toArray();
-		// 获取规则
-		$rules		= DB::table('auth_group')->select('rules')->find($id);
-		// 树形
-		$menu		= array_sort(list_to_tree($menu,'id','pid','child',0),'module',SORT_ASC);
-		// 权限菜单
-		$this->assign('access_menu',$menu);
-		// 规则
-		$this->assign('rules',$rules);
-		// 加载模板
-		return $this->fetch();
-	}
+    /**
+     * 删除
+     *
+     * */
+    public function del(Request $request){
+        // 验证参数
+        $request->scene('del')->validate();
+        // 接收参数
+        $id				= request('id',0);
+        // 执行删除
+        $result			= DB::table('auth_group')->delete($id);
+        // 错误告知
+        if( !$result )	return json_send(['code'=>'error','msg'=>'删除失败']);
+        // 结果
+        return json_send(['code'=>'success','msg'=>'删除成功']);
+    }
+
+    /**
+     * 授权
+     *
+     * */
+    public function access(Request $request){
+        // 验证参数
+        $request->scene('del')->validate();
+        // 如果是post
+        if(request()->isMethod('post')){
+            // 接收参数
+            $data['rules']			= (array) request('rules',[]);
+            // 权限组Id
+            $group_id				= (int) request('id',0);
+            // 删除权限
+            DB::table('auth_rule')->where(['group_id'=>$group_id])->delete();
+            // 存在权限
+            if( isset($data['rules']) ){
+                // 排序
+                sort($data['rules']);
+                // 切割
+                $data['rules']  = implode( ',' , array_unique($data['rules']));
+            }
+            // 修改权限
+            $result 			= DB::table('auth_group')->where(['id'=>$group_id])->update($data);
+            // 告知结果
+            if( !$result ) 		return	json_send(['code'=>'success','msg'=>'权限组修改失败','action'=>'edit']);
+            // 权限组菜单
+            $group_menu			= DB::table('auth_group')->find($group_id);
+            // 菜单ID
+            $menu_id			= explode(',', $group_menu['rules']);
+            // 获得菜单列表
+            $menu_list			= DB::table('menu')->get()->toArray();
+            // 循环菜单ID
+            foreach ($menu_id as $v) {
+                // 循环菜单列表
+                foreach ($menu_list as $v1) {
+                    // 如果对应的菜单
+                    if( $v == $v1['id'] ){
+                        // 组合菜单权限数据
+                        $m['menu_id']	= $v;
+                        $m['group_id']	= $group_id;
+                        $m['name']		= !empty($v1['url']) ? $v1['url'] : '';
+                        // 写入菜单权限规则表
+                        DB::table('auth_rule')->insert($m);
+                    }
+                }
+            }
+            // 告知结果
+            return json_send(['code'=>'success','msg'=>'编辑成功','action'=>'edit']);
+        }
+        // 接收参数
+        $id			= request('id',0);
+        // 获取菜单
+        // 如果是超管
+        if( in_array(admin('uid'), explode(',', config('administrator')))){
+            // 获取菜单
+            $menu		= DB::table('menu')->orderBy('sort_order')->get()->toArray();
+        }else{
+            // 仅获取允许的菜单
+            $menu		= DB::table('menu')->join('auth_rule','menu.id','=','auth_rule.menu_id')->whereIn('auth_rule.group_id',admin('group_id'))->orderBy('sort_order')->get(['menu.*'])->toArray();
+        }
+        // 获取规则
+        $rules		= DB::table('auth_group')->select('rules')->find($id);
+        // 树形
+        $menu		= array_sort(list_to_tree($menu,'id','pid','child',0),'module',SORT_ASC);
+        // 权限菜单
+        $this->assign('access_menu',$menu);
+        // 规则
+        $this->assign('rules',$rules);
+        // 加载模板
+        return $this->fetch();
+    }
 
-	/**
-	 * 状态
-	 * 
-	 * */
-	public function set_status(Request $request){
-		// 验证参数
-		$request->scene('set_status')->validate();
-		// 接收参数
-		$id				= request('id',0);
-		$status			= request('status',0);
-		// 执行删除
-		$result			= DB::table('auth_group')->where(['id'=>$id])->update(['status'=>$status]);
-		// 错误告知
-		if( !$result )	return json_send(['code'=>'error','msg'=>'操作失败','path'=>'']);
-		// 结果
-		return			json_send(['code'=>'success','msg'=>'操作成功','path'=>'']);
-	}
+    /**
+     * 状态
+     *
+     * */
+    public function set_status(Request $request){
+        // 验证参数
+        $request->scene('set_status')->validate();
+        // 接收参数
+        $id				= request('id',0);
+        $status			= request('status',0);
+        // 执行删除
+        $result			= DB::table('auth_group')->where(['id'=>$id])->update(['status'=>$status]);
+        // 错误告知
+        if( !$result )	return json_send(['code'=>'error','msg'=>'操作失败','path'=>'']);
+        // 结果
+        return			json_send(['code'=>'success','msg'=>'操作成功','path'=>'']);
+    }
 }
 ?>

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','修改');

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;
 		}

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() ) {
 				// 状态设置

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,7 +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'];
@@ -193,12 +180,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 +212,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 +299,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();

app/Http/Requests/Admin/AuthManager.php

@@ -21,7 +21,7 @@ class AuthManager extends BaseRequest
         return [
             // 有时候我们希望某个字段在第一次验证失败后就停止运行验证规则，只需要将 bail 添加到规则中：
             // 验证字段，验证规则，提示信息
-	        'title' 			=> 'required|unique:auth_group,title,'.$id,
+	        'title' 			=> 'required',
 	        'id'                => 'required|integer|gt:0',
         ];
     }

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>

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>

resources/views/admin/coupon_active/index.blade.php

@@ -30,7 +30,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>结束时间</th>
 						<th>内部跳转</th>
 						<th>宣发链接</th>
-						<th>店铺</th>
 						<th>活动状态</th>
 						<th>修改时间</th>
 						<th>操作</th>									
@@ -46,7 +45,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'] )
 								停用

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>

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>

resources/views/admin/coupon_reward_rule/index.blade.php

@@ -30,7 +30,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>开始时间</th>
 						<th>结束时间</th>
 						<th>优惠券</th>
-						<th>店铺</th>
 						<th>配置状态</th>
 						<th>修改时间</th>
 						<th>操作</th>									
@@ -46,7 +45,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>

resources/views/admin/custom_coupon/index.blade.php

@@ -50,7 +50,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 					<tr>
 						<th>优惠券编码</th>
 						<th>优惠券名称</th>
-						<th>店铺名称</th>
 						<th>客户编码</th>
 						<th>客户名称</th>
 						<th>商品范围</th>
@@ -68,7 +67,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> 

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" />

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']}}" />

resources/views/admin/promo/index.blade.php

@@ -54,7 +54,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 						<th>活动城市</th>
 						<th>标签范围</th>
 						<th>商品范围</th>
-						<th>店铺</th>
 						<th>状态</th>
 						<th>活动时间</th>
 						<th>修改时间</th>
@@ -92,7 +91,6 @@ style="margin: 0 auto;width: 96%;padding: 30px 0px;"
 								全部商品
 							@endif
 						</td>
-						<td> {{$a['business_name']}}</td>
 						<td> 
 							@if ($a['status'] == 0)