Merge branch 'master' into test02

# Conflicts:
#	app/Http/Controllers/Admin/CustomerDepositController.php

app/Http/Controllers/Admin/CustomerDepositController.php

@@ -380,7 +380,7 @@ class CustomerDepositController extends Controller
             if($name) $query->where('name', 'like', '%'. $name. '%');
             if($admin_id) $query->where('admin_id', $admin_id);
             if( !empty($saler_ids) ) $query->whereIn('admin_id', $saler_ids);
-        })->count();
+        })->where('is_del',0)->count();
         if ($count > 1) {
             // 总页数
             $pages = ceil($count/$pageSize);
@@ -393,7 +393,7 @@ class CustomerDepositController extends Controller
             if($name) $query->where('name', 'like', '%'. $name. '%');
             if($admin_id) $query->where('admin_id', $admin_id);
             if( !empty($saler_ids) ) $query->whereIn('admin_id', $saler_ids);
-        })->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
+        })->where('is_del',0)->orderBy('id','desc')->offset($offset)->limit($pageSize)->get();
         $result = json_decode(json_encode($result),true);
 
         $result = array_map(function($value){
@@ -420,6 +420,15 @@ class CustomerDepositController extends Controller
             //销售人员
             $item['admin_name'] = $admin->realname;
 
+            $item['phone'] = is_numeric($item['phone']) ? substr_replace($item['phone'], '****', 3, 4) : $item['phone'];
+
+            if($item['payment_type'] == 1){
+                $item['payment'] = '微信支付';
+            } else if($item['payment_type'] == 3){
+                $item['payment'] = '个体户支付';
+            } else {
+                $item['payment'] = '';
+            }
             return $item;
         },$result);
 
@@ -493,6 +502,8 @@ class CustomerDepositController extends Controller
         $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 = date('Y',time()).'-'.$request->input('birthday');
+        $customerVip->price = $request->input('price');
+        $customerVip->payment_type = $request->input('payment_type',1);
         $customerVip->is_del = 0;
 
         if($customerVip->save()) {
@@ -546,6 +557,8 @@ class CustomerDepositController extends Controller
         $customerVip->name = $request->input('name');
         $customerVip->birthday = date('Y',time()).'-'.$request->input('birthday');
         $customerVip->admin_id = $request->input('admin_id');
+        $customerVip->price = $request->input('price');
+        $customerVip->payment_type = $request->input('payment_type',1);
         if($customerVip->save()){
             return redirect('/admin/customer/vipList')->with('info', '编辑成功');
         } else {

app/Http/Controllers/Api/TemplateController.php

@@ -69,7 +69,7 @@ class TemplateController extends Controller {
         $saler_ids = array_keys($result);
         
         $ip = $this->getRealIp();
-        if($saler_id){
+        if($saler_id && $t_id !=17){
             //记录行为
             $log = array();
             $log['t_id'] = $t_id;
@@ -114,7 +114,7 @@ class TemplateController extends Controller {
         $t_id = $request->input('t_id');
 
         $ip = $this->getRealIp();
-        if($saler_id && $t_id){
+        if($saler_id && $t_id && $t_id !=17){
             //记录行为
             $log = array();
             $log['t_id'] = $t_id;

resources/views/customer/vipCustomerCreate.blade.php

@@ -35,6 +35,23 @@
                 </div>
             </div>
             <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    金额：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" class="input-text" value="{{old('price')}}" placeholder="" name="price">
+                    <br>
+                </div>
+            </div>
+            <div class="row cl">
+                <label for="" class="form-label col-xs-4 col-sm-2">充值方式:</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <select style="text-align:center" id='' class="select-box" name="payment_type">
+                            <option value="1" @if(old('payment_type')==1) selected @endif class="select-option">微信支付</option>
+                            <option value="3" @if(old('payment_type')==3) selected @endif class="select-option">个体户支付</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row cl">
                 <label for="" class="form-label col-xs-4 col-sm-2">选择销售:</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <select style="text-align:center" id='admin_id' class="select-box" name="admin_id">

resources/views/customer/vipCustomerEdit.blade.php

@@ -45,6 +45,22 @@
                     </div>
                 </div>
             <div class="row cl">
+                <label class="form-label col-xs-4 col-sm-2">
+                    金额：</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <input type="text" class="input-text" value="{{$info['price']}}" placeholder="请输入金额" name="price">
+                </div>
+            </div>
+            <div class="row cl">
+                <label for="" class="form-label col-xs-4 col-sm-2">充值方式:</label>
+                <div class="formControls col-xs-6 col-sm-6">
+                    <select style="text-align:center" id='' class="select-box" name="payment_type">
+                        <option value="1" @if($info['payment_type']==1) selected @endif class="select-option">微信支付</option>
+                        <option value="3" @if($info['payment_type']==3) selected @endif class="select-option">个体户支付</option>
+                    </select>
+                </div>
+            </div>
+            <div class="row cl">
                 <label for="" class="form-label col-xs-4 col-sm-2">选择销售:</label>
                 <div class="formControls col-xs-6 col-sm-6">
                     <select style="text-align:center" id='admin_id' class="select-box" name="admin_id">

resources/views/customer/vipCustomerList.blade.php

@@ -40,7 +40,9 @@
                 <th width="10%">到期时间</th>
                 <th width="10%">生日</th>
                 <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>
             </thead>
@@ -53,14 +55,16 @@
                 <td class="text-c">{{$a['vip_end_time']}}</td>
                 <td class="text-c">{{date("m-d",strtotime($a['birthday']))}}</td>
                 <td class="text-c">{{$a['admin_name']}}</td>
-                <td class="text-c">{{$a['is_del'] == 0 ? '启用' : '禁用'}}</td>
+                <td class="text-c">{{$a['price']}}</td>
+                <td class="text-c">{{$a['payment']}}</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>
-                    @if($a['is_del']==0)
-                        <a style="text-decoration:none" class="ml-5" onClick="user_del(this, '{{$a["id"]}}')" href="javascript:;" title="禁用"><span class="btn btn-danger radius">禁用</span></a>
-                    @elseif($a['is_del']==1)
-                        <a style="text-decoration:none" class="ml-5" onClick="user_up(this, '{{$a['id']}}')" href="javascript:;" title="启用"><span class="btn btn-success radius">启用</span></a>
-                    @endif
+                    {{--@if($a['is_del']==0)--}}
+                        {{--<a style="text-decoration:none" class="ml-5" onClick="user_del(this, '{{$a["id"]}}')" href="javascript:;" title="禁用"><span class="btn btn-danger radius">禁用</span></a>--}}
+                    {{--@elseif($a['is_del']==1)--}}
+                        {{--<a style="text-decoration:none" class="ml-5" onClick="user_up(this, '{{$a['id']}}')" href="javascript:;" title="启用"><span class="btn btn-success radius">启用</span></a>--}}
+                    {{--@endif--}}
                 </td>
             </tr>
             @endforeach