Merge branch 'test01'

# Conflicts:
#	resources/views/admin/index.blade.php
#	resources/views/customer/vipCustomerList.blade.php

app/Http/Controllers/Admin/CustomerDepositController.php

@@ -469,7 +469,7 @@ class CustomerDepositController extends Controller
         $customerVip->discount = 95;
         $customerVip->create_time = date('Y-m-d H:i:s',time());
         $customerVip->vip_end_time = date('Y-m-d H:i:s',strtotime('+1 year'));
-        $customerVip->birthday = $request->input('birthday');
+        $customerVip->birthday = date('Y',time()).'-'.$request->input('birthday');
         $customerVip->is_del = 0;
 
         if($customerVip->save()) {
@@ -521,7 +521,7 @@ class CustomerDepositController extends Controller
         //修改vip用户信息
         $customerVip = CustomerVip::findOrFail($id);
         $customerVip->name = $request->input('name');
-        $customerVip->birthday = $request->input('birthday');
+        $customerVip->birthday = date('Y',time()).'-'.$request->input('birthday');
         $customerVip->admin_id = $request->input('admin_id');
         if($customerVip->save()){
             return redirect('/admin/customer/vipList')->with('info', '编辑成功');
@@ -706,4 +706,54 @@ class CustomerDepositController extends Controller
         }
     }
 
+    /**
+     * 查询会员信息页面
+     * @param Request $request
+     */
+    public function queryVipView(Request $request) {
+        return view('customer/customerInformationQuery');
+    }
+
+    /**
+     * 查询会员信息操作
+     * @param Request $request
+     */
+    public function queryVipInformation(Request $request) {
+        $phone = $request->input('phone');
+
+        #查询数据
+        $customer = CustomerVip::where('phone',$phone)->first();
+        if(!$customer){
+            //不是会员
+            $couponsList = null;
+            $giftList = null;
+        } else {
+            $couponsList = CustomerCoupons::where('phone',$phone)->get();
+            $giftList = CustomerGiftReceives::where('phone',$phone)->where('is_del',0)->get();
+        }
+
+        #处理数据
+        if($couponsList){
+            $coupons = array();
+            foreach($couponsList as $value) {
+                if($value['is_use'] == 1) {
+                    $coupons['use']++;
+                } else {
+                    $coupons['nouse']++;
+                }
+            }
+        }
+
+        if($giftList){
+            $gifts = array();
+            foreach($giftList as $value) {
+                if($value['gift_type'] == 1){
+
+                } else if($value['gift_type'] == 0){
+
+                }
+            }
+        }
+    }
+
 }

resources/views/admin/index.blade.php

@@ -75,7 +75,6 @@
                         <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>
-
                     </ul>
                 </dd>
             </dl>
@@ -87,7 +86,7 @@
                     </ul>
                 </dd>
             </dl>
-            <dl id="menu-deposit">
+            <dl id="menu-vip">
                 <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>

resources/views/customer/vipCustomerCreate.blade.php

@@ -30,7 +30,7 @@
                 <label class="form-label col-xs-4 col-sm-2">
                     生日：</label>
                 <div class="formControls col-xs-6 col-sm-6">
-                    <input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" autocomplete="off" class="input-text Wdate" name="birthday" value="{{old('birthday')}}">
+                    <input type="text" onfocus="WdatePicker({dateFmt:'MM-dd'})" autocomplete="off" class="input-text Wdate" name="birthday" value="{{old('birthday')}}">
                     <br>
                 </div>
             </div>

resources/views/customer/vipCustomerEdit.blade.php

@@ -41,7 +41,7 @@
                     <label class="form-label col-xs-4 col-sm-2">
                         生日：</label>
                     <div class="formControls col-xs-6 col-sm-6">
-                        <input type="text" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd' })" autocomplete="off" class="input-text Wdate" name="birthday" value="{{$info['birthday']}}">
+                        <input type="text" onfocus="WdatePicker({ dateFmt:'MM-dd' })" autocomplete="off" class="input-text Wdate" name="birthday" value="{{date("m-d",strtotime($info['birthday']))}}">
                     </div>
                 </div>
             <div class="row cl">

resources/views/customer/vipCustomerList.blade.php

@@ -53,6 +53,7 @@
                 <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">{{date("m-d",strtotime($a['birthday']))}}</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>