Merge branch 'master' of http://101.200.220.49:8001/sunhao/seafood

app/CustomerGiftReceives.php

+<?php
+/**
+ * Created by PhpStorm.
+ * User: shensong
+ * Date: 2019/11/29
+ * Time: 17:31
+ */
+
+namespace App;
+
+
+use Illuminate\Database\Eloquent\Model;
+
+class CustomerGiftReceives extends Model
+{
+    protected $table = 'customer_gift_receives';
+    public $timestamps = false;
+}

app/Http/Controllers/Admin/CustomerDepositController.php

  */
 namespace  App\Http\Controllers\Admin;
 use App\CustomerCoupons;
+use App\CustomerGiftReceives;
 use App\CustomerMonthGift;
 use App\CustomerVip;
 use App\Goods;
             if( !empty($saler_ids) ) $query->whereIn('admin_id', $saler_ids);
         })->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
+        foreach($result as &$value) {
+            $admin = Admin::find($value['admin_id']);
+            $value['admin_name'] = $admin->realname;
+        }
 
 
         $teamList = DB::table('teams')->select('id', 'name')->where(function($query) use($team_id, $self_role){

app/Http/routes.php

         Route::get('customer/giftEdit','Admin\CustomerDepositController@editMonthGift');
         Route::post('customer/giftStore','Admin\CustomerDepositController@monthGiftStore');
         Route::post('customer/giftUpdate','Admin\CustomerDepositController@monthGiftUpdate');
+
+        //检索会员信息
+        Route::get('customer/vipInformation','Admin\CustomerDepositController@queryVipView');
+        Route::post('customer/queryVip','Admin\CustomerDepositController@queryVipInformation');
     });
     
 });

resources/views/admin/index.blade.php

                         <li @if(!isset($res['custreport/detail'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/custreport/detailindex')}}" data-title="销售上报加粉数据" href="javascript:void(0)">销售上报加粉数据</a></li>
                         <li @if(!isset($res['custreport/disCostList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/custreport/disCostList')}}" data-title="上报地域投入数据" href="javascript:void(0)">上报地域投入数据</a></li>
                         <li @if(!isset($res['admin/qrcode'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/admin/uploadQrcodeEdit')}}" data-title="微信二维码上传" href="javascript:void(0)">微信二维码上传</a></li>
-                        <li @if(!isset($res['customer/vipList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/customer/vipList')}}" data-title="会员用户录入" href="javascript:void(0)">会员用户录入</a></li>
+
                     </ul>
                 </dd>
             </dl>
                     </ul>
                 </dd>
             </dl>
+            <dl id="menu-deposit">
+                <dt @if(!isset($res['customer/vipManage'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe692;</i> 会员管理<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
+                <dd>
+                    <ul>
+                        <li @if(!isset($res['customer/vipList'])) style="display:none;list-style-type:none;" @endif><a data-href="{{url('admin/customer/vipList')}}" data-title="会员用户录入" href="javascript:void(0)">会员用户录入</a></li>
+                    </ul>
+                </dd>
+            </dl>
             <dl id="menu-order">
                 <dt @if(!isset($res['statistics/manage'])) style="display:none;list-style-type:none;" @endif><i class="Hui-iconfont">&#xe623;</i>业务数据报表<i class="Hui-iconfont menu_dropdown-arrow">&#xe6d5;</i></dt>
                 <dd>

resources/views/customer/vipCustomerList.blade.php

                 <th width="10%">手机号</th>
                 <th width="10%">到期时间</th>
                 <th width="10%">生日</th>
+                <th width="10%">销售</th>
                 <th width="10%">状态</th>
                 <th width="10%">操作</th>
             </tr>
                 <td class="text-c">{{$a['phone']}}</td>
                 <td class="text-c">{{$a['vip_end_time']}}</td>
                 <td class="text-c">{{$a['birthday']}}</td>
+                <td class="text-c">{{$a['admin_name']}}</td>
                 <td class="text-c">{{$a['is_del'] == 0 ? '启用' : '禁用'}}</td>
                 <td class="f-14 product-brand-manage">
                     <a style="text-decoration:none" onClick='user_edit("{{$a['id']}}")' href="javascript:;" title="编辑"><span class="btn btn-primary radius">编辑</span></a>