冲突

app/Http/Controllers/Admin/Album/AgentController.php

@@ -29,7 +29,8 @@ class AgentController extends Controller
 
     function index(Request $request) {
         $search['keyword'] = $request->input('keyword');
-        $query = $this->repository->pushCriteria(new AgentWhere($search,$this->getStoreId()));
+        $search['status'] = $request->input('status') ?? -1;
+        $query = $this->repository->pushCriteria(new AgentWhere($search, $this->getStoreId()));
 
         if(isset($request['sort_field']) && $request['sort_field'] && isset($request['sort_field_by'])) {
         $query = $query->pushCriteria(new OrderBy($request['sort_field'],$request['sort_field_by']));
@@ -37,6 +38,7 @@ class AgentController extends Controller
             $query = $query->pushCriteria(new OrderBy('id','DESC'));
         }
         $list = $query->paginate();
+
         foreach ($list as $item){
             $product = AlbumProductPriceModel::where([['agent_id',$item->id],['store_id',$this->getStoreId()]])->first();
             if(!empty($product)){
@@ -58,6 +60,10 @@ class AgentController extends Controller
         return view('admin.album.agent.index',compact('list'));
     }
 
+    public function batch()
+    {
+        
+    }
 
     function check(Request $request) {
         $request = $request->all();

app/Http/Controllers/Api/V1/AlbumBossController.php

@@ -59,9 +59,7 @@ class AlbumBossController extends Controller
     public function getTop(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required'
         ], [
@@ -136,9 +134,7 @@ class AlbumBossController extends Controller
     public function agentCustomer(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'agent_id' => 'required',
@@ -234,9 +230,7 @@ class AlbumBossController extends Controller
     public function agentStatistical(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'agent_id' => 'required',
@@ -344,9 +338,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -421,9 +413,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -519,9 +509,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -589,9 +577,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -671,9 +657,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -761,9 +745,7 @@ class AlbumBossController extends Controller
     {
 
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -840,9 +822,7 @@ class AlbumBossController extends Controller
     public function agentAnalysis(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -900,9 +880,7 @@ class AlbumBossController extends Controller
     public function BossInteractive(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [

app/Http/Controllers/Api/V1/AlbumController.php

@@ -333,9 +333,7 @@ class AlbumController extends Controller
     public function albumGoods(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::ERROR_POWER, '登陆过期!');
-        }
+
         $validator = Validator::make($request->all(), [
             'cat_id' => 'required',
             'parent_id' => 'required',
@@ -486,9 +484,7 @@ class AlbumController extends Controller
     {
         //  $userAuth = AlbumXyxUserModel::find(1);
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'goods_id' => 'required',
             'store_id' => 'required',
@@ -638,9 +634,7 @@ class AlbumController extends Controller
     public function albumFavoriteList(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -704,9 +698,7 @@ class AlbumController extends Controller
     public function albumGetWatchRecord(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'type' => 'required'
@@ -848,9 +840,7 @@ class AlbumController extends Controller
     public function albumGetDataGoods(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required'
         ], [
@@ -928,9 +918,7 @@ class AlbumController extends Controller
     public function albumGetDataCat(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'parent_id' => 'required'
@@ -1005,9 +993,7 @@ class AlbumController extends Controller
     public function albumGetDataCatSingle(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -1105,9 +1091,7 @@ class AlbumController extends Controller
     public function albumGetCartOfWatch(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'end' => 'required',
@@ -1241,7 +1225,7 @@ class AlbumController extends Controller
     {
         //$userAuth = AlbumXyxUserModel::find(1);
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'favorite_id' => 'required',
@@ -1307,7 +1291,7 @@ class AlbumController extends Controller
     public function albumSaveFormId(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'form_id' => 'required',
@@ -1366,7 +1350,7 @@ class AlbumController extends Controller
     public function albumAddFavorite(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'product_id' => 'required',
@@ -1643,7 +1627,7 @@ class AlbumController extends Controller
     public function albumSavePhone(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'code' => 'required',
@@ -1729,7 +1713,7 @@ class AlbumController extends Controller
     public function albumSetWatch(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'type' => 'required',
@@ -2004,7 +1988,7 @@ class AlbumController extends Controller
     public function albumAddAgent(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'realname' => 'required',
             'address' => 'required',
@@ -2096,7 +2080,7 @@ class AlbumController extends Controller
     public function albumGetAgentAdress(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ],[
@@ -2209,7 +2193,7 @@ class AlbumController extends Controller
     public function albumGetCustomer(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id'=>'required'
@@ -2281,7 +2265,7 @@ class AlbumController extends Controller
     public function albumSetCustomer(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'key' => 'required',
@@ -2359,7 +2343,7 @@ class AlbumController extends Controller
     public function albumCustomerGoods(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -2441,9 +2425,7 @@ class AlbumController extends Controller
     public function albumCustomerGoodsDetail(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -2557,7 +2539,7 @@ class AlbumController extends Controller
     public function albumGetCountOfFavorite(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ],[
@@ -2626,7 +2608,7 @@ class AlbumController extends Controller
     public function albumGetUserInfo(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         if($userAuth->is_dealer == 1){
             $user_agent = AlbumAgentModel::where([['user_id',$userAuth->id],['status',1]])->first();
             $agent_id = $user_agent['id'];
@@ -2669,7 +2651,7 @@ class AlbumController extends Controller
     public function albumStatistical(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ],[
@@ -2748,7 +2730,7 @@ class AlbumController extends Controller
     public function albumGetStatistical(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'open_id' => 'required',
@@ -2848,7 +2830,7 @@ class AlbumController extends Controller
     public function albumAgentPriceSet(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if(!$userAuth) return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
+
         $validator = Validator::make($request->all(), [
             'is_show_ma_price' => 'required',
             'store_id' => 'required',

app/Http/Controllers/Api/V1/AlbumPosterController.php

@@ -61,9 +61,7 @@ class AlbumPosterController extends Controller
     public function posterInfo(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
         ], [
@@ -198,9 +196,7 @@ class AlbumPosterController extends Controller
     public function createPoster(Request $request)
     {
         $userAuth = Auth('api')->user();
-        if (!$userAuth) {
-            return $this->error(ErrorCode::CLIENT_WRONG_PARAMS, '未登录!');
-        }
+
         $validator = Validator::make($request->all(), [
             'store_id' => 'required',
             'image' => 'required',

app/Http/Middleware/AuthenticateApi.php

@@ -28,3 +28,4 @@ class AuthenticateApi
         return $next($request);
     }
 }
+

app/Models/AlbumAgentModel.php

@@ -61,4 +61,8 @@ class AlbumAgentModel extends BaseModel
         'share_times'
     ];
 
+    public function user()
+    {
+        return $this->belongsTo('App\Models\AlbumUserModel', 'user_id');
+    }
 }

app/Repositories/Album/Criteria/AgentWhere.php

@@ -23,7 +23,7 @@ class AgentWhere extends Criteria {
      * @param array $search
      *
      */
-    public function __construct(array $search,int $store_id)
+    public function __construct(array $search, int $store_id)
     {
         $this->search = $search;
         $this->store_id = $store_id;
@@ -36,16 +36,28 @@ class AgentWhere extends Criteria {
      */
     public function apply($model, Repository $repository)
     {
-        if(isset($this->search['keyword']) && $this->search['keyword']) {
-            $keyword = '%'.$this->search['keyword'].'%';
+        if (isset($this->search['keyword']) && $this->search['keyword']) {
+            $keyword = '%' . $this->search['keyword'] . '%';
             $model = $model->where([['name','like',$keyword],['store_id',$this->store_id]])
                 ->orwhere([['id','like',$keyword],['store_id',$this->store_id]])
                 ->orwhere([['address','like',$keyword],['store_id',$this->store_id]])
                 ->orwhere([['phone','like',$keyword],['store_id',$this->store_id]]);
-        } else if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-            $model = $model->where('updated_at',$this->search['updated_at']);
         } else {
-            $model = $model->where([['store_id',$this->store_id]]);
+            $model = $model->where([['store_id', $this->store_id]]);
+        }
+        if (isset($this->search['status']) && $this->search['status']) {
+            $status = $this->search['status'];
+            $model = $model->whereHas('user', function ($model) use ($status) {
+                if ($status == 3) {
+                    $model->where('is_boss', 1);
+                }
+            })->with(['user:username as nickname,is_boss']);
+            if ($status == 2) {
+                $model = $model->where([['status', 1]]);
+            }
+            if ($status == 1) {
+                $model = $model->where([['status', 0]]);
+            }
         }
 
         return $model;

resources/views/admin/album/agent/index.blade.php

@@ -25,23 +25,29 @@
     						</div>
 				        </div>
 				        </form>
-						{{--@if(role('Album/Agent/create'))
+						<div class="col-sm-4 pull-left">
+							<a href="{{ U('Album/Agent/index', ['status' => -1])}}" class="btn btn-sm btn-primary pull-left" style="margin-left: 1px;">全部</a>
+							<a href="{{ U('Album/Agent/index', ['status' => 1])}}" class="btn btn-sm btn-primary pull-left" style="margin-left: 1px;">未审核</a>
+							<a href="{{ U('Album/Agent/index', ['status' => 2])}}" class="btn btn-sm btn-primary pull-left" style="margin-left: 1px;">已审核</a>
+							<a href="{{ U('Album/Agent/index', ['status' => 3])}}" class="btn btn-sm btn-primary pull-left" style="margin-left: 1px;">BOSS</a>
+						</div>
+						@if(role('Album/Agent/batch'))
     					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Album/Agent/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+    					   <a href="{{ U('Album/Agent/batch')}}" class="btn btn-sm btn-primary pull-right" onclick="return confirm('你确定批量通过审核？');">批量审核</a>
     					</div>
-						@endif--}}
+						@endif
 					</div>
 					
 					<table class="table table-striped table-bordered table-hover dataTables-example dataTable">
 						<thead>
     						<tr>
-								
-            <th class="sorting" data-sort="id"> ID </th>
-            <th> 微信昵称 </th>
-            <th class="sorting" data-sort="user_id"> 电话 </th>
-            <th class="sorting" data-sort="address"> 地址 </th>
-            <th class="sorting" data-sort="name"> 名称 </th>
-            <th class="sorting" data-sort="status"> 状态 </th>
+								<th><input type="checkbox"></th>
+								<th class="sorting" data-sort="id"> ID </th>
+								<th> 微信昵称 </th>
+								<th class="sorting" data-sort="name"> 名称 </th>
+								<th class="sorting" data-sort="user_id"> 电话 </th>
+								<th class="sorting" data-sort="address"> 地址 </th>
+								<th class="sorting" data-sort="status"> 审核状态 </th>
 								<th>是否为boss</th>
         						<th width="22%">相关操作</th>
         					</tr>
@@ -52,9 +58,9 @@
 								
             <td>{{ $item->id }}</td>
             <td>{{ $item->nickname }}</td>
+			<td>{{ $item->name }}</td>
             <td>{{ $item->phone }}</td>
             <td>{{ $item->address }}</td>
-            <td>{{ $item->name }}</td>
             <td>{{ $item->status }}</td>
 								@if($item->is_boss != 1)
 									<td>不是</td>
@@ -85,7 +91,9 @@
 												<a href="{{ U('Album/Agent/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
 										@endif
 										@if(role('Album/Product/Price/index'))
-												<a href="{{ U('Album/Product/Price/index',['id'=>$item->id])}}" class="btn btn-sm btn-primary pull-right">查看报价</a>
+											@if($item->status == '已审核')
+												<a href="{{ U('Album/Product/Price/index',['id'=>$item->id])}}" class="btn btn-sm btn-primary pull-left">查看报价</a>
+											@endif
 										@endif
 
 									</div>

resources/views/admin/album/manufacturer/edit.blade.php

@@ -71,7 +71,7 @@
 
                                     <div class="form-group">
 
-                                        <label class="control-label col-sm-3">厂家LOGO(130*130)</label>
+                                        <label class="control-label col-sm-3">厂家LOGO(130像素 * 130像素)</label>
                                         <div class="col-sm-9">
                                             {!!  widget('Tools.ImgUpload')->single2('/upload/logo','logo',"logo",  isset($data['logo'])? $data['logo'] : '',array("sizex"=>130,"sizey"=>130)) !!}
                                         </div>
@@ -223,7 +223,7 @@
 
                                     <div class="form-group">
 
-                                        <label class="control-label col-sm-3">画册广告图</label>
+                                        <label class="control-label col-sm-3">开屏广告图</label>
                                         <div class="col-sm-9">
                                             {!!  widget('Tools.ImgUpload')->multi2('/upload/banner','banner',"data[banner]", isset($data['banner'])? $data['banner'] : '',[]) !!}
                                         </div>
@@ -301,18 +301,9 @@
                                     <td>{{ $video['name'] }}</td>
                                     <td>{{ $video['url'] }}</td>
                                     <td>
-                                        <div class="btn-group">
-                                            <button data-toggle="dropdown"
-                                                    class="btn btn-warning btn-sm dropdown-toggle"
-                                                    aria-expanded="false">
-                                                操作 <span class="caret"></span>
-                                            </button>
-                                            <ul class="dropdown-menu">
-                                                <li><a href="{{ U('Album/Manufactuier/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
-                                            </ul>
+                                        <div class="pull-right">
+                                            <a href="{{ U('Album/Manufactuier/videoDel',['id'=>$video['id']])}}" onclick="return confirm('你确定执行删除操作？');" class="btn btn-sm btn-danger pull-right">删除</a>
                                         </div>
-
-
                                     </td>
                                 </tr>
                             @else

routes/api.php

@@ -341,10 +341,10 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
         'as' => 'address.update',
         'uses' => 'AddressController@update',
     ]);
-  /*  $api->post('my/address/store', [
-        'as' => 'address.store',
-        'uses' => 'AddressController@store',
-    ]);*/
+    /*  $api->post('my/address/store', [
+          'as' => 'address.store',
+          'uses' => 'AddressController@store',
+      ]);*/
     $api->get('my/address/delete', [
         'as' => 'address.delete',
         'uses' => 'AddressController@delete',
@@ -422,8 +422,6 @@ $api->version('v1', ['namespace' => 'App\Http\Controllers\Api\V1'], function ($a
     ]);
 
 
-
-
     /*$api->get('album/get-banner', [
         'as' => 'album.GetBanner',
         'uses' => 'AlbumController@albumGetBanner',