bug

app/Http/Controllers/Admin/Order/InfoController.php

@@ -230,7 +230,8 @@ class InfoController extends Controller
                 }
             }
 
-            return $this->showMessage('操作成功');
+            $url[] = array('url' => U('Order/Info/index?status=2'), 'title' => '返回列表');
+            return $this->showMessage('操作成功',$url);
         } else {
 
             return $this->showWarning('操作失败');

app/Http/Controllers/Admin/User/ScheduleController.php

@@ -11,6 +11,7 @@ use App\Http\Controllers\Admin\Controller;
 use App\Models\ProductScheduleModel;
 use App\Models\StoreInfoModel;
 use App\Models\UserScheduleModel;
+use Carbon\Carbon;
 use Illuminate\Http\Request;
 use App\Repositories\Base\Criteria\OrderBy;
 use App\Repositories\User\Criteria\MultiWhere;
@@ -80,9 +81,13 @@ class ScheduleController extends Controller
      */
     private function _createSave(){
         $data = (array) request('data');
+        if($data['time'] <= Carbon::now()){
+            $url[] = array('url'=>U( 'User/Schedule/index'),'title'=>'返回列表');
+            return $this->showWarning('无效的时间',$url);
+        }
         if(!$this->canOrder($data['time'],$data['store_id'])){
             $url[] = array('url'=>U( 'User/Schedule/index'),'title'=>'返回列表');
-            return $this->showWarning('改时间段预约人数已满',$url);
+            return $this->showWarning('该时间段预约人数已满',$url);
         }
         $id = $this->repository->create($data);
         if($id) {
@@ -116,6 +121,10 @@ class ScheduleController extends Controller
      */
     private function _updateSave() {
         $data = (array) request('data');
+        if($data['time'] <= Carbon::now()){
+            $url[] = array('url'=>U( 'User/Schedule/index'),'title'=>'返回列表');
+            return $this->showWarning('无效的时间',$url);
+        }
         if(!$this->canOrder($data['time'],$data['store_id'])){
             $url[] = array('url'=>U( 'User/Schedule/index'),'title'=>'返回列表');
             return $this->showWarning('改时间段预约人数已满',$url);

app/Repositories/User/Criteria/MultiWhere.php

@@ -9,12 +9,11 @@
 namespace App\Repositories\User\Criteria;
 
 
-
-
 use App\Repositories\Base\Criteria;
 use App\Repositories\Contracts\RepositoryInterface as Repository;
 
-class MultiWhere extends Criteria {
+class MultiWhere extends Criteria
+{
 
     private $search = [];
 
@@ -29,17 +28,18 @@ class MultiWhere extends Criteria {
     }
 
     /**
-    * @param $model
-    * @param RepositoryInterface $repository
-    * @return mixed
-    */
+     * @param $model
+     * @param RepositoryInterface $repository
+     * @return mixed
+     */
     public function apply($model, Repository $repository)
     {
-          if(isset($this->search['updated_at']) && $this->search['updated_at']) {
-                                    $model = $model->where('updated_at',$this->search['updated_at']);
-                                 }
+        if (isset($this->search['keyword']) && $this->search['keyword']) {
+            $model = $model->where('nickname','like', '%'.$this->search['keyword'].'%')
+                ->orwhere('mobile','like', '%'.$this->search['keyword'].'%');
+        }
 
-         return $model;
+        return $model;
     }
 
 }

resources/views/admin/business/service/index.blade.php

@@ -43,6 +43,7 @@
                             <th class="sorting" data-sort="phone"> 联系人电话</th>
                             <th class="sorting" data-sort="comment"> 拍摄要求</th>
                             <th class="sorting" data-sort="email"> 邮箱</th>
+                            <th class="sorting" data-sort="created_at"> 发起时间</th>
                             <th class="sorting" data-sort="status"> 状态：0：未回复；1：已回复</th>
                             <th width="22%">相关操作</th>
                         </tr>
@@ -58,6 +59,7 @@
                                     <td>{{ $item->phone }}</td>
                                     <td>{{ $item->comment }}</td>
                                     <td>{{ $item->email }}</td>
+                                    <td>{{ $item->created_at}}</td>
                                     <td>@if($item->status == 0)<span class="label label-danger">未回复</span>@else<span class="label label-success">已回复</span>@endif</td>
                                     <td>
                                         @if($item->status == 0)

resources/views/admin/order/info/index.blade.php

@@ -25,11 +25,6 @@
                                 </div>
                             </div>
                         </form>
-                        @if(role('Order/Info/create'))
-                            <div class="col-sm-3 pull-right">
-                                <a href="{{ U('Order/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
-                            </div>
-                        @endif
                     </div>
 
                     <table class="table table-striped table-bordered table-hover dataTables-example dataTable">

resources/views/admin/paid/info/edit.blade.php

@@ -2,94 +2,110 @@
 
 @section('content')
 
-<?php
-    if(!isset($data)) $data = array();
-    if(!$data && session("data")){
+    <?php
+    if (!isset($data)) $data = array();
+    if (!$data && session("data")) {
         $data = session("data");
     }
-    if(!$data && session('_old_input')){
+    if (!$data && session('_old_input')) {
         $data = session("_old_input");
     }
-?>
-	<div class="row">
-		<div class="col-sm-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<h5>支付列表</h5>
-					<div class="ibox-tools">
-						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-						</a>
-					</div>
-				</div>
-				<div class="ibox-content">
+    ?>
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5>支付列表</h5>
+                    <div class="ibox-tools">
+                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="ibox-content">
                     @if(role('Paid/Info/index'))
-				    <div class="row">
-    					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Paid/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
-    					</div>
-					</div>
+                        <div class="row">
+                            <div class="col-sm-3 pull-right">
+                                <a href="{{ U('Paid/Info/index')}}" class="btn btn-sm btn-primary pull-right">返回列表</a>
+                            </div>
+                        </div>
                     @endif
 
-		            <div class="row">
+                    <div class="row">
                         <div class="col-lg-10">
-                            <form name="form_product" id="form-validation" action="" class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
-
-                                    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">订单id</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_order_id" name="data[order_id]" class="form-control" value="{{ $data['order_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">订单金额</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_order_price" name="data[order_price]" class="form-control" value="{{ $data['order_price'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">付款方式</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_type" name="data[type]" class="form-control" value="{{ $data['type'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
-                                
-                </div>    
-                <div class="form-group">
-                                    
-                 <label class="control-label col-sm-3">付款金额</label>
-                                    
-                   <div class="col-sm-9">
-                     <input id="data_paid_price" name="data[paid_price]" class="form-control" value="{{ $data['paid_price'] or ''}}" required="" aria-required="true"  placeholder=""> 
-                    </div>
+                            <form name="form_product" id="form-validation" action=""
+                                  class="form-horizontal form-validation" accept-charset="UTF-8" method="post">
+
+
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">订单id</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="data_order_id" disabled class="form-control"
+                                               value="{{ $data['order_id'] or ''}}" required="" aria-required="true"
+                                               placeholder="">
+                                    </div>
+
+                                </div>
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">付款方式</label>
+
+                                    <div class="col-sm-9">
+                                        <label class="radio-inline">
+                                            <input type="radio" name="info[type]" value="0" <?php if(isset($data['type']) && $data['type'] == 0){ echo ' checked="checked"'; } ?>>全款支付
+                                        </label>
+                                        <label class="radio-inline">
+                                            <input type="radio" name="info[type]" value="1" <?php if(isset($data['type']) && $data['type'] == 1){ echo ' checked="checked"'; } ?>>定金支付
+                                        </label>
+
+                                    </div>
+
+                                </div>
                                 
-                </div>
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">订单金额</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="data_order_price" name="data[order_price]" class="form-control"
+                                               value="{{ $data['order_price'] or ''}}" required="" aria-required="true"
+                                               placeholder="">
+                                    </div>
+
+                                </div>
                                 
+                                <div class="form-group">
+
+                                    <label class="control-label col-sm-3">付款金额</label>
+
+                                    <div class="col-sm-9">
+                                        <input id="data_paid_price" name="data[paid_price]" class="form-control"
+                                               value="{{ $data['paid_price'] or ''}}" required="" aria-required="true"
+                                               placeholder="">
+                                    </div>
+
+                                </div>
+
                                 <div class="form-group">
                                     <label class="control-label col-sm-3">&nbsp;</label>
                                     <div class="col-sm-9">
-                                        <input type="hidden" name="_referer" value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
+                                        <input type="hidden" name="_referer"
+                                               value="<?php echo urlencode(request()->server('HTTP_REFERER'));?>"/>
                                         <input type="hidden" name="_token" value="<?php echo csrf_token(); ?>"/>
                                         <input type="submit" class="btn btn-success" style="margin-right:20px;">
-                                        <input type="reset" class="btn btn-default" >
+                                        <input type="reset" class="btn btn-default">
                                     </div>
                                 </div>
-        
+
                             </form>
                         </div>
                         <!-- /.col-lg-10 -->
                     </div>
                     <!-- /.row -->
-				</div>
-			</div>
-		</div>
-	</div>
+                </div>
+            </div>
+        </div>
+    </div>
 
 @endsection

resources/views/admin/product/info/edit.blade.php

@@ -88,7 +88,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">
                                         <input id="data_service_time" name="data[service_time]" class="form-control"

resources/views/admin/refund/info/edit.blade.php

@@ -40,7 +40,7 @@
                  <label class="control-label col-sm-3">退款单号</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_refund_no" name="data[refund_no]" class="form-control" value="{{ $data['refund_no'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_refund_no" disabled class="form-control" value="{{ $data['refund_no'] or ''}}" required="" aria-required="true"  placeholder="">
                     </div>
                                 
                 </div>    
@@ -49,7 +49,7 @@
                  <label class="control-label col-sm-3">对应订单号</label>
                                     
                    <div class="col-sm-9">
-                     <input id="data_order_id" name="data[order_id]" class="form-control" value="{{ $data['order_id'] or ''}}" required="" aria-required="true"  placeholder=""> 
+                     <input id="data_order_id" disabled class="form-control" value="{{ $data['order_id'] or ''}}" required="" aria-required="true"  placeholder="">
                     </div>
                                 
                 </div>    

resources/views/admin/refund/info/index.blade.php

@@ -1,103 +1,111 @@
-@extends('admin.layout') 
+@extends('admin.layout')
 
 @section('content')
-	<div class="row">
-		<div class="col-sm-12">
-			<div class="ibox float-e-margins">
-				<div class="ibox-title">
-					<h5>退款管理</h5>
-					<div class="ibox-tools">
-						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
-						</a>
-					</div>
-				</div>
-				<div class="ibox-content">
-				    <div class="row">
-				        <form method="GET" action="" accept-charset="UTF-8">
+    <div class="row">
+        <div class="col-sm-12">
+            <div class="ibox float-e-margins">
+                <div class="ibox-title">
+                    <h5>退款管理</h5>
+                    <div class="ibox-tools">
+                        <a class="collapse-link"> <i class="fa fa-chevron-up"></i>
+                        </a>
+                    </div>
+                </div>
+                <div class="ibox-content">
+                    <div class="row">
+                        <form method="GET" action="" accept-charset="UTF-8">
 
-				        <div class="col-sm-4">
-				            <div class="input-group">
-								<input type="text" value="{{Request::get('keyword')}}"	placeholder="请输入关键词" name="keyword"class="input-sm form-control"> 
-								<span class="input-group-btn">
+                            <div class="col-sm-4">
+                                <div class="input-group">
+                                    <input type="text" value="{{Request::get('keyword')}}" placeholder="请输入关键词"
+                                           name="keyword" class="input-sm form-control">
+                                    <span class="input-group-btn">
 									<button type="submit" class="btn btn-sm btn-primary">搜索</button>
 								</span>
-    						</div>
-				        </div>
-				        </form>
-						@if(role('Refund/Info/create'))
-    					<div class="col-sm-3 pull-right">
-    					   <a href="{{ U('Refund/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
-    					</div>
-						@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 class="sorting" data-sort="refund_no"> 退款单号 </th>
-            <th class="sorting" data-sort="order_id"> 对应订单号 </th>
-            <th class="sorting" data-sort="refund_price"> 退款金额 </th>
-            <th class="sorting" data-sort="created_at"> 创建时间 </th>
-            <th class="sorting" data-sort="updated_at"> 更新时间 </th>
-        						<th width="22%">相关操作</th>
-        					</tr>
-						</thead>
-						<tbody>
-						@if(isset($list))
-							@foreach($list as $key => $item)							<tr>
-								
-            <td>{{ $item->id }}</td>
-            <td>{{ $item->refund_no }}</td>
-            <td>{{ $item->order_id }}</td>
-            <td>{{ $item->refund_price }}</td>
-            <td>{{ $item->created_at }}</td>
-            <td>{{ $item->updated_at }}</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">
+                                </div>
+                            </div>
+                        </form>
+                        @if(role('Refund/Info/create'))
+                            <div class="col-sm-3 pull-right">
+                                <a href="{{ U('Refund/Info/create')}}" class="btn btn-sm btn-primary pull-right">添加</a>
+                            </div>
+                        @endif
+                    </div>
 
+                    <table class="table table-striped table-bordered table-hover dataTables-example dataTable">
+                        <thead>
+                        <tr>
 
-											@if(role('Refund/Info/update'))
-											<li><a href="{{ U('Refund/Info/update',['id'=>$item->id])}}" class="font-bold">修改</a></li>
-											@endif
+                            <th class="sorting" data-sort="id"> ID</th>
+                            <th class="sorting" data-sort="refund_no"> 退款单号</th>
+                            <th class="sorting" data-sort="order_id"> 对应订单号</th>
+                            <th class="sorting" data-sort="refund_price"> 退款金额</th>
+                            <th class="sorting" data-sort="created_at"> 创建时间</th>
+                            <th class="sorting" data-sort="updated_at"> 更新时间</th>
+                            <th width="22%">相关操作</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @if(isset($list))
+                            @foreach($list as $key => $item)
+                                <tr>
 
-											@if(role('Refund/Info/destroy'))
-											<li class="divider"></li>
-											<li><a href="{{ U('Refund/Info/destroy',['id'=>$item->id])}}" onclick="return confirm('你确定执行删除操作？');">删除</a></li>
-											@endif
+                                    <td>{{ $item->id }}</td>
+                                    <td>{{ $item->refund_no }}</td>
+                                    <td>{{ $item->order_id }}</td>
+                                    <td>{{ $item->refund_price }}</td>
+                                    <td>{{ $item->created_at }}</td>
+                                    <td>{{ $item->updated_at }}</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">
 
-										</ul>
-									</div>
-								@if(role('Refund/Info/view'))
-										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Refund/Info/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
-									@endif
-								</td>
-							</tr>
-							@endforeach
-							@endif
 
-						</tbody>
-					</table>
-					<div class="row">
-						<div class="col-sm-6">
-							<div class="dataTables_info" id="DataTables_Table_0_info"
-								role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。</div>
-						</div>
-						<div class="col-sm-6">
-						<div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
-						{!! $list->setPath('')->appends(Request::all())->render() !!}
-						</div>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
+                                                @if(role('Refund/Info/update'))
+                                                    <li><a href="{{ U('Refund/Info/update',['id'=>$item->id])}}"
+                                                           class="font-bold">修改</a></li>
+                                                @endif
+
+                                                @if(role('Refund/Info/destroy'))
+                                                    <li class="divider"></li>
+                                                    <li><a href="{{ U('Refund/Info/destroy',['id'=>$item->id])}}"
+                                                           onclick="return confirm('你确定执行删除操作？');">删除</a></li>
+                                                @endif
+
+                                            </ul>
+                                        </div>
+                                        @if(role('Refund/Info/view'))
+                                            <button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Refund/Info/view',['id'=>$item->id])}}'});"
+                                                    class="btn btn-primary ">查看
+                                            </button>
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endforeach
+                        @endif
+
+                        </tbody>
+                    </table>
+                    <div class="row">
+                        <div class="col-sm-6">
+                            <div class="dataTables_info" id="DataTables_Table_0_info"
+                                 role="alert" aria-live="polite" aria-relevant="all">每页{{ $list->count() }}
+                                条，共{{ $list->lastPage() }}页，总{{ $list->total() }}条。
+                            </div>
+                        </div>
+                        <div class="col-sm-6">
+                            <div class="dataTables_paginate paging_simple_numbers" id="DataTables_Table_0_paginate">
+                                {!! $list->setPath('')->appends(Request::all())->render() !!}
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
 @endsection

resources/views/admin/user/info/index.blade.php

@@ -26,12 +26,6 @@
                                     </div>
                                 </div>
                             </form>
-                            @if(role('User/Info/create'))
-                                <div class="col-sm-3 pull-right">
-                                    <a href="{{ U('User/Info/create')}}"
-                                       class="btn btn-sm btn-primary pull-right">添加</a>
-                                </div>
-                            @endif
                         </div>
 
                         <table class="table table-striped table-bordered table-hover dataTables-example dataTable">